Changeset 989f431 for lib

Timestamp:

2015-02-22T16:15:28Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ee170a1

Parents:

782a6ee

Message:

json_parse_first() which lets me find out where it stopped parsing, needed
for safe and proper stream parsing.

Location:

lib

Files:

• parson.c (modified) (2 diffs)
• parson.h (modified) (2 diffs)

lib/parson.c

@@ -769 +769 @@
 }
 
-JSON_Value * json_parse_string(const char *string) {
+JSON_Value * json_parse_first(const char *string, const char **end) {
+    const char *pos;
+    JSON_Value *ret;
+
     if (!string)
         return NULL;
@@ -775 +778 @@
     if (*string != '{' && *string != '[')
         return NULL;
-    return parse_value((const char**)&string, 0);
+
+    pos = string;
+    ret = parse_value(&pos, 0);
+    if (end)
+        *end = pos;
+
+    return ret;
+}
+
+JSON_Value * json_parse_string(const char *string) {
+    return json_parse_first(string, NULL);
 }
 

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);