commit - 700a297e0c704ce502f69268ec366c7d8bb50479
commit + 90922303f0adf011bf662141eb263bf922bfcbc5
blob - 7cf47e144675e585c282ee0fd081af37fc6b4e77
blob + fe7255872d92150661150bc8b04be062c8ba8776
--- oracle.c
+++ oracle.c
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))
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));
}
}
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))
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));
}
}
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))
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));
}
}
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))
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));
}
}
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))
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));
}
}