projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
code style
[psensor.git]
/
src
/
rsensor.c
diff --git
a/src/rsensor.c
b/src/rsensor.c
index
fadd02a
..
e6396e2
100644
(file)
--- a/
src/rsensor.c
+++ b/
src/rsensor.c
@@
-108,7
+108,7
@@
void rsensor_init()
curl = curl_easy_init();
}
curl = curl_easy_init();
}
-void rsensor_
end
()
+void rsensor_
cleanup
()
{
curl_easy_cleanup(curl);
}
{
curl_easy_cleanup(curl);
}
@@
-144,9
+144,10
@@
static json_object *get_json_object(const char *url)
struct psensor **get_remote_sensors(const char *server_url,
int values_max_length)
{
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;
char *url;
json_object *obj;
+ int i, n;
sensors = NULL;
sensors = NULL;
@@
-155,15
+156,14
@@
struct psensor **get_remote_sensors(const char *server_url,
obj = get_json_object(url);
if (obj && !is_error(obj)) {
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++) {
sensors = malloc((n + 1) * sizeof(struct psensor *));
for (i = 0; i < n; i++) {
- s
truct 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;
}
sensors[i] = s;
}