static CURL *curl;
-size_t cbk_curl(void *buffer, size_t size, size_t nmemb, void *userp)
+static size_t cbk_curl(void *buffer, size_t size, size_t nmemb, void *userp)
{
size_t realsize;
struct ucontent *mem;
return realsize;
}
-char *create_api_1_0_sensors_url(const char *base_url)
+static char *create_api_1_0_sensors_url(const char *base_url)
{
char *nurl, *ret;
int n;
return ret;
}
-struct psensor *json_object_to_psensor(json_object * o,
- const char *sensors_url,
- int values_max_length)
+static struct psensor *json_object_to_psensor(json_object * o,
+ const char *sensors_url,
+ int values_max_length)
{
json_object *oid;
json_object *oname;
curl = curl_easy_init();
}
-void rsensor_end()
+void rsensor_cleanup()
{
curl_easy_cleanup(curl);
}
-json_object *get_json_object(const char *url)
+static json_object *get_json_object(const char *url)
{
-
struct ucontent chunk;
json_object *obj;
if (curl_easy_perform(curl) == CURLE_OK)
obj = json_tokener_parse(chunk.data);
else
- fprintf(stderr, _("ERROR: Fail to connect to: %s\n"), url);
+ log_printf(LOG_ERR, _("Fail to connect to: %s"), url);
free(chunk.data);
struct psensor **get_remote_sensors(const char *server_url,
int values_max_length)
{
- struct psensor **sensors;
+ struct psensor **sensors, *s;
char *url;
json_object *obj;
+ int i, n;
sensors = NULL;
obj = get_json_object(url);
if (obj && !is_error(obj)) {
- int i;
- int n = json_object_array_length(obj);
+ n = json_object_array_length(obj);
sensors = malloc((n + 1) * sizeof(struct psensor *));
for (i = 0; i < n; i++) {
- struct psensor *s = json_object_to_psensor
- (json_object_array_get_idx(obj, i),
- url,
- values_max_length);
+ s = json_object_to_psensor
+ (json_object_array_get_idx(obj, i),
+ url,
+ values_max_length);
sensors[i] = s;
}
json_object_put(obj);
} else {
- fprintf(stderr, _("ERROR: Invalid content: %s\n"), url);
+ log_printf(LOG_ERR, _("Invalid content: %s"), url);
}
free(url);
json_object_put(obj);
} else {
- printf(_("ERROR: Invalid JSON: %s\n"), s->url);
+ log_printf(LOG_ERR, _("Invalid JSON: %s"), s->url);
}
}