my public repos

Commit Diff

Commit:: 90922303f0adf011bf662141eb263bf922bfcbc5
From:: the xhr <xhr@giessen.ccc.de>
Date:: Thu Sep 16 12:32:44 2021 UTC
Message:: Stop using a deprecated function
Actions:: Patch | Tree
commit - 700a297e0c704ce502f69268ec366c7d8bb50479
commit + 90922303f0adf011bf662141eb263bf922bfcbc5
blob - 7cf47e144675e585c282ee0fd081af37fc6b4e77
blob + fe7255872d92150661150bc8b04be062c8ba8776
--- oracle.c
+++ oracle.c
@@ -196,8 +196,8 @@ read_names_from_json()
 	log_debug("number of oracles: %d\n", n_oracles);
 	for (i = 0; i < n_oracles; i++) {
 		temp = json_object_array_get_idx(oracles, i);
-		table = json_object_object_get(temp, "Oracle Table");
-		name = json_object_object_get(temp, "Name");
+		json_object_object_get_ex(temp, "Oracle Table", &table);
+		json_object_object_get_ex(temp, "Name", &name);
 		log_debug("Name %s\n", json_object_get_string(name));
 
 		if ((strcmp(json_object_get_string(name), "Ironlander Names") == 0))
@@ -216,8 +216,8 @@ read_names_from_json()
 		n_entries = json_object_array_length(table);
 		for (j = 0; j < n_entries; j++) {
 			temp = json_object_array_get_idx(table, j);
-			desc = json_object_object_get(temp, "Description");
-			chance = json_object_object_get(temp, "Chance");
+			json_object_object_get_ex(temp, "Description", &desc);
+			json_object_object_get_ex(temp, "Chance", &chance);
 				add_to_array(what, json_object_get_int(chance), json_object_get_string(desc));
 		}
 	}
@@ -251,8 +251,8 @@ read_moves_from_json()
 	log_debug("number of oracles: %d\n", n_oracles);
 	for (i = 0; i < n_oracles; i++) {
 		temp = json_object_array_get_idx(oracles, i);
-		table = json_object_object_get(temp, "Oracle Table");
-		name = json_object_object_get(temp, "Name");
+		json_object_object_get_ex(temp, "Oracle Table", &table);
+		json_object_object_get_ex(temp, "Name", &name);
 		log_debug("Name %s\n", json_object_get_string(name));
 
 		if ((strcmp(json_object_get_string(name), "Pay the Price") == 0))
@@ -265,9 +265,9 @@ read_moves_from_json()
 		n_entries = json_object_array_length(table);
 		for (j = 0; j < n_entries; j++) {
 			temp = json_object_array_get_idx(table, j);
-			desc = json_object_object_get(temp, "Description");
-			chance = json_object_object_get(temp, "Chance");
-				add_to_array(what, json_object_get_int(chance), json_object_get_string(desc));
+			json_object_object_get_ex(temp, "Description", &desc);
+			json_object_object_get_ex(temp, "Chance", &chance);
+			add_to_array(what, json_object_get_int(chance), json_object_get_string(desc));
 		}
 	}
 
@@ -300,8 +300,8 @@ read_action_from_json()
 	log_debug("number of oracles: %d\n", n_oracles);
 	for (i = 0; i < n_oracles; i++) {
 		temp = json_object_array_get_idx(oracles, i);
-		table = json_object_object_get(temp, "Oracle Table");
-		name = json_object_object_get(temp, "Name");
+		json_object_object_get_ex(temp, "Oracle Table", &table);
+		json_object_object_get_ex(temp, "Name", &name);
 		log_debug("Name %s\n", json_object_get_string(name));
 
 		if ((strcmp(json_object_get_string(name), "Action") == 0))
@@ -323,9 +323,9 @@ read_action_from_json()
 		n_entries = json_object_array_length(table);
 		for (j = 0; j < n_entries; j++) {
 			temp = json_object_array_get_idx(table, j);
-			desc = json_object_object_get(temp, "Description");
-			chance = json_object_object_get(temp, "Chance");
-				add_to_array(what, json_object_get_int(chance), json_object_get_string(desc));
+			json_object_object_get_ex(temp, "Description", &desc);
+			json_object_object_get_ex(temp, "Chance", &chance);
+			add_to_array(what, json_object_get_int(chance), json_object_get_string(desc));
 		}
 	}
 
@@ -358,8 +358,8 @@ read_turning_from_json()
 	log_debug("number of oracles: %d\n", n_oracles);
 	for (i = 0; i < n_oracles; i++) {
 		temp = json_object_array_get_idx(oracles, i);
-		table = json_object_object_get(temp, "Oracle Table");
-		name = json_object_object_get(temp, "Name");
+		json_object_object_get_ex(temp, "Oracle Table", &table);
+		json_object_object_get_ex(temp, "Name", &name);
 		log_debug("Name %s\n", json_object_get_string(name));
 
 		if ((strcmp(json_object_get_string(name), "Challenge Rank") == 0))
@@ -376,9 +376,9 @@ read_turning_from_json()
 		n_entries = json_object_array_length(table);
 		for (j = 0; j < n_entries; j++) {
 			temp = json_object_array_get_idx(table, j);
-			desc = json_object_object_get(temp, "Description");
-			chance = json_object_object_get(temp, "Chance");
-				add_to_array(what, json_object_get_int(chance), json_object_get_string(desc));
+			json_object_object_get_ex(temp, "Description", &desc);
+			json_object_object_get_ex(temp, "Chance", &chance);
+			add_to_array(what, json_object_get_int(chance), json_object_get_string(desc));
 		}
 	}
 
@@ -411,8 +411,8 @@ read_places_from_json()
 	log_debug("number of oracles: %d\n", n_oracles);
 	for (i = 0; i < n_oracles; i++) {
 		temp = json_object_array_get_idx(oracles, i);
-		table = json_object_object_get(temp, "Oracle Table");
-		name = json_object_object_get(temp, "Name");
+		json_object_object_get_ex(temp, "Oracle Table", &table);
+		json_object_object_get_ex(temp, "Name", &name);
 		log_debug("Name %s\n", json_object_get_string(name));
 
 		if ((strcmp(json_object_get_string(name), "Region") == 0))
@@ -429,9 +429,9 @@ read_places_from_json()
 		n_entries = json_object_array_length(table);
 		for (j = 0; j < n_entries; j++) {
 			temp = json_object_array_get_idx(table, j);
-			desc = json_object_object_get(temp, "Description");
-			chance = json_object_object_get(temp, "Chance");
-				add_to_array(what, json_object_get_int(chance), json_object_get_string(desc));
+			json_object_object_get_ex(temp, "Description", &desc);
+			json_object_object_get_ex(temp, "Chance", &chance);
+			add_to_array(what, json_object_get_int(chance), json_object_get_string(desc));
 		}
 	}