X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Futils-json.h;h=de98e10cb166d5a8dcc7c512a2bdb0bb5ea03e3b;hb=a08368b93b263aa52df3eeb4c90669ae6da7cd6e;hp=97783475fba11db03648f17663bea7eea2054a40;hpb=bb15844347ed0d53a795d24dce7035ab27df4e53;p=src%2Fapp-framework-main.git

diff --git a/src/utils-json.h b/src/utils-json.h
index 9778347..de98e10 100644
--- a/src/utils-json.h
+++ b/src/utils-json.h
@@ -1,5 +1,5 @@
 /*
- Copyright 2015 IoT.bzh
+ Copyright 2015, 2016, 2017 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -16,17 +16,79 @@
  limitations under the License.
 */
 
-int j_object(struct json_object *obj, const char *key, struct json_object **value);
-int j_string(struct json_object *obj, const char *key, const char **value);
-int j_boolean(struct json_object *obj, const char *key, int *value);
-int j_integer(struct json_object *obj, const char *key, int *value);
+/*
+ * predicates on types
+ */
+#define j_is_string(o)		(json_object_get_type(o) == json_type_string)
+#define j_is_boolean(o)		(json_object_get_type(o) == json_type_boolean)
+#define j_is_integer(o)		(json_object_get_type(o) == json_type_int)
+
+/*
+ * Read the value if object is of the good type and return true.
+ * Returns false if the type is not correct.
+ */
+extern int j_read_string(struct json_object *obj, const char **value);
+extern int j_read_boolean(struct json_object *obj, int *value);
+extern int j_read_integer(struct json_object *obj, int *value);
+
+/*
+ * Get the value of the type or the default value if the type does not match.
+ */
+extern const char *j_string(struct json_object *obj, const char *defval);
+extern int j_boolean(struct json_object *obj, int defval);
+extern int j_integer(struct json_object *obj, int defval);
+
+/*
+ * Read the value of the entry of key in object if exist and of the good type and return true.
+ * Returns false if the key does not exist or if the type is not correct.
+ */
+extern int j_has(struct json_object *obj, const char *key);
+extern int j_read_object_at(struct json_object *obj, const char *key, struct json_object **value);
+extern int j_read_string_at(struct json_object *obj, const char *key, const char **value);
+extern int j_read_boolean_at(struct json_object *obj, const char *key, int *value);
+extern int j_read_integer_at(struct json_object *obj, const char *key, int *value);
 
-extern const char *j_get_string(struct json_object *obj, const char *key, const char *defval);
-extern int j_get_boolean(struct json_object *obj, const char *key, int defval);
-extern int j_get_integer(struct json_object *obj, const char *key, int defval);
+/*
+ * Get the value of the key of type or the default value if the key or type does not match.
+ */
+extern const char *j_string_at(struct json_object *obj, const char *key, const char *defval);
+extern int j_boolean_at(struct json_object *obj, const char *key, int defval);
+extern int j_integer_at(struct json_object *obj, const char *key, int defval);
 
+/*
+ * Adds a keyed value (of type) and returns true if done or false in case of error
+ * when key==NULL object is an array and values are appended
+ */
 extern int j_add(struct json_object *obj, const char *key, struct json_object *val);
 extern int j_add_string(struct json_object *obj, const char *key, const char *val);
 extern int j_add_boolean(struct json_object *obj, const char *key, int val);
 extern int j_add_integer(struct json_object *obj, const char *key, int val);
+extern struct json_object *j_add_new_array(struct json_object *obj, const char *key);
+extern struct json_object *j_add_new_object(struct json_object *obj, const char *key);
+
+/*
+ * functions below interpret the key 'mkey' as a dot separated
+ * path specification.
+ */
+extern int j_enter_m(struct json_object **obj, const char **mkey, int create);
+
+extern int j_has_m(struct json_object *obj, const char *mkey);
+
+extern int j_read_object_at_m(struct json_object *obj, const char *mkey, struct json_object **value);
+extern int j_read_string_at_m(struct json_object *obj, const char *mkey, const char **value);
+extern int j_read_boolean_at_m(struct json_object *obj, const char *mkey, int *value);
+extern int j_read_integer_at_m(struct json_object *obj, const char *mkey, int *value);
+
+extern const char *j_string_at_m(struct json_object *obj, const char *mkey, const char *defval);
+extern int j_boolean_at_m(struct json_object *obj, const char *mkey, int defval);
+extern int j_integer_at_m(struct json_object *obj, const char *mkey, int defval);
+
+extern int j_add_m(struct json_object *obj, const char *mkey, struct json_object *val);
+extern int j_add_string_m(struct json_object *obj, const char *mkey, const char *val);
+extern int j_add_many_strings_m(struct json_object *obj, ...);
+extern int j_add_boolean_m(struct json_object *obj, const char *mkey, int val);
+extern int j_add_integer_m(struct json_object *obj, const char *mkey, int val);
+extern struct json_object *j_add_new_array_m(struct json_object *obj, const char *mkey);
+extern struct json_object *j_add_new_object_m(struct json_object *obj, const char *mkey);
+