projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed coredump when there are no sensors
[psensor.git]
/
src
/
lib
/
psensor_json.c
diff --git
a/src/lib/psensor_json.c
b/src/lib/psensor_json.c
index
058a25e
..
ca12fc2
100644
(file)
--- a/
src/lib/psensor_json.c
+++ b/
src/lib/psensor_json.c
@@
-80,9
+80,11
@@
static json_object *sensor_to_json(struct psensor *s)
json_object_object_add(obj,
ATT_SENSOR_TYPE, json_object_new_int(s->type));
json_object_object_add(obj,
json_object_object_add(obj,
ATT_SENSOR_TYPE, json_object_new_int(s->type));
json_object_object_add(obj,
- ATT_SENSOR_MIN, json_object_new_double(s->min));
+ ATT_SENSOR_MIN,
+ json_object_new_double(s->sess_lowest));
json_object_object_add(obj,
json_object_object_add(obj,
- ATT_SENSOR_MAX, json_object_new_double(s->max));
+ ATT_SENSOR_MAX,
+ json_object_new_double(s->sess_highest));
json_object_object_add(obj,
ATT_SENSOR_MEASURES,
measures_to_json_object(s));
json_object_object_add(obj,
ATT_SENSOR_MEASURES,
measures_to_json_object(s));
@@
-117,14
+119,16
@@
char *sensors_to_json_string(struct psensor **sensors)
char *str;
json_object *obj = json_object_new_array();
char *str;
json_object *obj = json_object_new_array();
- sensors_cur = sensors;
+ if (sensors) {
+ sensors_cur = sensors;
- while (*sensors_cur) {
- struct psensor *s = *sensors_cur;
+
while (*sensors_cur) {
+
struct psensor *s = *sensors_cur;
- json_object_array_add(obj, sensor_to_json(s));
+
json_object_array_add(obj, sensor_to_json(s));
- sensors_cur++;
+ sensors_cur++;
+ }
}
str = strdup(json_object_to_json_string(obj));
}
str = strdup(json_object_to_json_string(obj));