Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update copyright date
[src/app-framework-binder.git]
/
src
/
main-afb-client-demo.c
diff --git
a/src/main-afb-client-demo.c
b/src/main-afb-client-demo.c
index
47171c2
..
f454d6d
100644
(file)
--- a/
src/main-afb-client-demo.c
+++ b/
src/main-afb-client-demo.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2015-201
8
"IoT.bzh"
+ * Copyright (C) 2015-201
9
"IoT.bzh"
* Author "Fulup Ar Foll"
* Author José Bollo <jose.bollo@iot.bzh>
*
* Author "Fulup Ar Foll"
* Author José Bollo <jose.bollo@iot.bzh>
*
@@
-538,6
+538,7
@@
static void pws_call(const char *verb, const char *object)
char *key;
int rc;
struct json_object *o;
char *key;
int rc;
struct json_object *o;
+ enum json_tokener_error jerr;
/* allocates an id for the request */
rc = asprintf(&key, "%d:%s", ++num, verb);
/* allocates an id for the request */
rc = asprintf(&key, "%d:%s", ++num, verb);
@@
-548,11
+549,11
@@
static void pws_call(const char *verb, const char *object)
/* send the request */
callcount++;
/* send the request */
callcount++;
- if (object == NULL || object[0] == 0
|| !strcmp(object, "null")
)
+ if (object == NULL || object[0] == 0)
o = NULL;
else {
o = NULL;
else {
- o = json_tokener_parse
(object
);
- if (
!o
)
+ o = json_tokener_parse
_verbose(object, &jerr
);
+ if (
jerr != json_tokener_success
)
o = json_object_new_string(object);
}
rc = afb_proto_ws_client_call(pws, verb, o, sessionid, key, NULL);
o = json_object_new_string(object);
}
rc = afb_proto_ws_client_call(pws, verb, o, sessionid, key, NULL);