Changeset ee170a1 for lib

Timestamp:

2015-02-22T17:01:53Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

56b57b1a

Parents:

989f431

Message:

Added json_object_get_tuple() which helps with implementing a JSON Object
foreach.

Location:

lib

Files:

• parson.c (modified) (1 diff)
• parson.h (modified) (3 diffs)

lib/parson.c

@@ -873 +873 @@
         return NULL;
     return object->names[index];
+}
+
+int json_object_get_tuple(const JSON_Object *object, size_t index,
+                          const char **key, const JSON_Value **value) {
+    if (index >= json_object_get_count(object))
+        return 0;
+    *key = object->names[index];
+    *value = object->values[index];
+    return 1;
 }
 

lib/parson.h

@@ -53 +53 @@
 };
 typedef int JSON_Status;
-
+   
 /* Parses first JSON value in a file, returns NULL in case of error */
 JSON_Value * json_parse_file(const char *filename);
@@ -60 +60 @@
    returns NULL in case of error */
 JSON_Value * json_parse_file_with_comments(const char *filename);
-
+   
 /*  Like json_parse_string, but *end is set to wherever it stopped parsing. */
 JSON_Value * json_parse_first(const char *string, const char **end);
-
+ 
 /*  Parses first JSON value in a string, returns NULL in case of error */
 JSON_Value * json_parse_string(const char *string);
@@ -117 +117 @@
 size_t        json_object_get_count(const JSON_Object *object);
 const char  * json_object_get_name (const JSON_Object *object, size_t index);
-    
+int           json_object_get_tuple(const JSON_Object *object, size_t index,
+                                    const char **key, const JSON_Value **value); /* 0 == fail */
+
 /* Creates new name-value pair or frees and replaces old value with new one. */
 JSON_Status json_object_set_value(JSON_Object *object, const char *name, JSON_Value *value);