X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Frsensor.c;h=96b334616238e5a37199b91a1701b699ba6e3b03;hb=472cac625c92e0d5e0e2511e272e216489936490;hp=2ba964bacf93351b2dbe306f64e89c29274e3083;hpb=d6141b1d4fea0db9b115b06c668be6195ac4e5c6;p=psensor.git diff --git a/src/rsensor.c b/src/rsensor.c index 2ba964b..96b3346 100644 --- a/src/rsensor.c +++ b/src/rsensor.c @@ -26,10 +26,10 @@ #include -#include "psensor_json.h" -#include "rsensor.h" -#include "server/server.h" -#include "url.h" +#include +#include +#include +#include struct ucontent { char *data; @@ -38,6 +38,11 @@ struct ucontent { static CURL *curl; +static const char *get_url(struct psensor *s) +{ + return (char *)s->provider_data; +} + static size_t cbk_curl(void *buffer, size_t size, size_t nmemb, void *userp) { size_t realsize; @@ -158,7 +163,7 @@ static void remote_psensor_update(struct psensor *s) { json_object *obj; - obj = get_json_object(s->url); + obj = get_json_object(get_url(s)); if (obj && !is_error(obj)) { json_object *om; @@ -181,7 +186,7 @@ static void remote_psensor_update(struct psensor *s) json_object_put(obj); } else { - log_printf(LOG_ERR, _("Invalid JSON: %s"), s->url); + log_printf(LOG_ERR, _("Invalid JSON: %s"), get_url(s)); } }