Add additional helper functions to simplify working with JSON arrays

libclamav/json_api.c

@@ -204,6 +204,70 @@ int cli_jsondouble(json_object *obj, const char* key, double d)
     return CL_SUCCESS;
 }
 
+json_object *cli_jsonarray(json_object *obj, const char *key)
+{
+    json_object *newobj;
+
+    if (!(key))
+        return NULL;
+
+    if (obj) {
+        /* First check to see if this key exists */
+        newobj = json_object_object_get(obj, key);
+        if (newobj)
+            return json_object_get_array(newobj) ? newobj : NULL;
+    }
+
+    newobj = json_object_new_array();
+    if (!(newobj))
+        return NULL;
+
+    if (obj) {
+        json_object_object_add(obj, key, newobj);
+        newobj = json_object_object_get(obj, key);
+    }
+
+    return newobj;
+}
+
+int cli_jsonint_array(json_object *obj, int32_t val)
+{
+    json_object *newobj;
+
+    if (!(obj))
+        return CL_ENULLARG;
+
+    if (json_object_get_array(newobj) == NULL)
+        return CL_ENULLARG;
+
+    newobj = json_object_new_int(val);
+    if (!(newobj))
+        return CL_EMEM;
+
+    json_object_array_add(obj, newobj);
+    return CL_SUCCESS;
+}
+
+json_object *cli_jsonobj(json_object *obj, const char *key)
+{
+    json_object *newobj;
+
+    if (obj && key) {
+        newobj = json_object_object_get(obj, key);
+        if (newobj)
+            return newobj;
+    }
+
+    newobj = json_object_new_object();
+    if (!(newobj))
+        return NULL;
+
+    if (obj && key)
+        json_object_object_add(obj, key, newobj);
+
+    return newobj;
+}
+
 #else
 
 int cli_json_nojson()
@@ -260,4 +324,15 @@ int cli_jsondouble_nojson(const char* key, double d)
     return CL_SUCCESS;
 }
 
+void *cli_jsonarray_nojson(const char *key)
+{
+    nojson_func("nojson: %s\n", key);
+    return NULL;
+}
+
+int cli_jsonint_array_nojson(int32_t val)
+{
+    nojson_func("nojson: %d\n", val);
+}
+
 #endif

libclamav/json_api.h

@@ -41,6 +41,9 @@ int cli_jsonint(json_object *obj, const char* key, int32_t i);
 int cli_jsonint64(json_object *obj, const char* key, int64_t i);
 int cli_jsonbool(json_object *obj, const char* key, int i);
 int cli_jsondouble(json_object *obj, const char* key, double d);
+json_object *cli_jsonarray(json_object *obj, const char *key);
+int cli_jsonint_array(json_object *obj, int32_t val);
+json_object *cli_jsonobj(json_object *obj, const char *key);
 
 #define JSON_KEY_FILETYPE   "FileType"
 #define JSON_KEY_FILESIZE   "FileSize"
@@ -63,14 +66,18 @@ int cli_jsonint_nojson(const char* key, int32_t i);
 int cli_jsonint64_nojson(const char* key, int64_t i);
 int cli_jsonbool_nojson(const char* key, int i);
 int cli_jsondouble_nojson(const char* key, double d);
+void *cli_jsonarray_nojson(const char *key);
+int cli_jsonint_array_nojson(int32_t val);
 
 #define cli_jsonnull(o,n)          cli_jsonnull_nojson(n)
 #define cli_jsonstr(o,n,s)         cli_jsonstr_nojson(n,s)
-#define cli_jsonstrlen(o,n,s,len); cli_jsonstrlen_nojson(n,s,len)
+#define cli_jsonstrlen(o,n,s,len)  cli_jsonstrlen_nojson(n,s,len)
 #define cli_jsonint(o,n,i)         cli_jsonint_nojson(n,i)
 #define cli_jsonint64(o,n,i)       cli_jsonint64_nojson(n,i)
 #define cli_jsonbool(o,n,b)        cli_jsonbool_nojson(n,b)
 #define cli_jsondouble(o,n,d)      cli_jsondouble_nojson(n,d)
+#define cli_jsonarray(o,k)         cli_jsonarray_nojson(k)
+#define cli_jsonint_array(o,v)     cli_jsonint_array_nojson(v)
 #endif
 
 #endif /*__JSON_C_H__*/