projects
/
psensor-pkg-ubuntu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'upstream/1.1.1'
[psensor-pkg-ubuntu.git]
/
src
/
rsensor.c
diff --git
a/src/rsensor.c
b/src/rsensor.c
index
32c182c
..
8a5aa66
100644
(file)
--- a/
src/rsensor.c
+++ b/
src/rsensor.c
@@
-163,14
+163,14
@@
void remote_psensor_update(struct psensor *s)
if (obj && !is_error(obj)) {
json_object *om;
if (obj && !is_error(obj)) {
json_object *om;
-
om = json_object_object_get(obj, "last_measure"
);
+
json_object_object_get_ex(obj, "last_measure", &om
);
if (!is_error(obj)) {
json_object *ov, *ot;
struct timeval tv;
if (!is_error(obj)) {
json_object *ov, *ot;
struct timeval tv;
-
ov = json_object_object_get(om, "value"
);
-
ot = json_object_object_get(om, "time"
);
+
json_object_object_get_ex(om, "value", &ov
);
+
json_object_object_get_ex(om, "time", &ot
);
tv.tv_sec = json_object_get_int(ot);
tv.tv_usec = 0;
tv.tv_sec = json_object_get_int(ot);
tv.tv_usec = 0;