avoid to use a specific provider field

[psensor.git] / src / rsensor.c

diff --git a/src/rsensor.c b/src/rsensor.c
index 8a5aa66..96b3346 100644 (file)
--- a/src/rsensor.c
+++ b/src/rsensor.c
@@ -26,10 +26,10 @@
 
 #include <curl/curl.h>
 
-#include "psensor_json.h"
-#include "rsensor.h"
-#include "server/server.h"
-#include "url.h"
+#include <psensor_json.h>
+#include <rsensor.h>
+#include <server/server.h>
+#include <url.h>
 
 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;
@@ -72,12 +77,12 @@ static char *create_api_1_1_sensors_url(const char *base_url)
        return ret;
 }
 
-void rsensor_init()
+void rsensor_init(void)
 {
        curl = curl_easy_init();
 }
 
-void rsensor_cleanup()
+void rsensor_cleanup(void)
 {
        curl_easy_cleanup(curl);
 }
@@ -154,11 +159,11 @@ struct psensor **get_remote_sensors(const char *server_url,
        return sensors;
 }
 
-void remote_psensor_update(struct psensor *s)
+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 @@ 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));
        }
 
 }