X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor_json.c;h=058a25e277ee66d528c35d5d60a9162abc7988ac;hb=472cac625c92e0d5e0e2511e272e216489936490;hp=d97a620b30670afa40dcfbb1c1053b60c50fb807;hpb=f3b05dae619a7909bd7422b3a82422c9442aa114;p=psensor.git diff --git a/src/lib/psensor_json.c b/src/lib/psensor_json.c index d97a620..058a25e 100644 --- a/src/lib/psensor_json.c +++ b/src/lib/psensor_json.c @@ -19,6 +19,8 @@ #include #include +#include + #include "psensor_json.h" #include "url.h" @@ -140,9 +142,9 @@ struct psensor *psensor_new_from_json(json_object *o, struct psensor *s; char *eid, *url; - oid = json_object_object_get(o, "id"); - oname = json_object_object_get(o, "name"); - otype = json_object_object_get(o, "type"); + json_object_object_get_ex(o, "id", &oid); + json_object_object_get_ex(o, "name", &oname); + json_object_object_get_ex(o, "type", &otype); eid = url_encode(json_object_get_string(oid)); url = malloc(strlen(sensors_url) + 1 + strlen(eid) + 1); @@ -153,7 +155,7 @@ struct psensor *psensor_new_from_json(json_object *o, NULL, json_object_get_int(otype) | SENSOR_TYPE_REMOTE, values_max_length); - s->url = url; + s->provider_data = url; free(eid);