wbrawner/pihelper-c
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update JSON parsing for backwards compatibility

Browse source 
The latest stable release for debian ships with libjson-c 0.12, which
doesn't contain the json_pointer.h file. This change should hopefully
work for version 0.13.x as well.
This commit is contained in:
William Brawner 2020-03-21 09:35:02 -06:00
parent 3e67cd240b
commit 4c66331cf9
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/network.c
View file

@ -21,7 +21,6 @@
#include <curl/curl.h> #include <curl/curl.h>
#include <json-c/json_object.h> #include <json-c/json_object.h>
#include <json-c/json_tokener.h> #include <json-c/json_tokener.h>
#include <json-c/json_pointer.h>
#include "config.h" #include "config.h"
#include "log.h" #include "log.h"
#include "network.h" #include "network.h"
@ -155,7 +154,7 @@ static int parse_status(char * raw_json) {
write_log(PIHELPER_LOG_DEBUG, "%s", json_object_to_json_string_ext(jobj, JSON_C_TO_STRING_PRETTY)); write_log(PIHELPER_LOG_DEBUG, "%s", json_object_to_json_string_ext(jobj, JSON_C_TO_STRING_PRETTY));
json_object *status; json_object *status;
const char * status_string; const char * status_string;
if (json_pointer_get(jobj, "/status", &status) == 0 if (json_object_object_get_ex(jobj, "/status", &status) == 0
&& (status_string = json_object_get_string(status)) != NULL) { && (status_string = json_object_get_string(status)) != NULL) {
if (strstr(status_string, "enabled") == status_string) { if (strstr(status_string, "enabled") == status_string) {
retval = PIHELPER_ENABLED; retval = PIHELPER_ENABLED;