From: Petri Lehtinen <petri@digip.org>
Date: Sat, 24 Sep 2011 18:10:23 +0000 (+0300)
Subject: Implement all other encoding functions using json_dump_callback
X-Git-Tag: v2.2.1~8
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=b6d0191e51003dfdfd2dcb36a52baafcdbf4246c;hp=2a70d62251b858c0109c00845f659f6d0a750160;p=jansson.git

Implement all other encoding functions using json_dump_callback

This way we can check for JSON_ENCODE_ANY flag in one place only.
---

diff --git a/src/dump.c b/src/dump.c
index 344670a..7bc3456 100644
--- a/src/dump.c
+++ b/src/dump.c
@@ -413,39 +413,26 @@ static int do_dump(const json_t *json, size_t flags, int depth,
     }
 }
 
-
 char *json_dumps(const json_t *json, size_t flags)
 {
     strbuffer_t strbuff;
     char *result;
 
-    if(!(flags & JSON_ENCODE_ANY)) {
-        if(!json_is_array(json) && !json_is_object(json))
-           return NULL;
-    }
-
     if(strbuffer_init(&strbuff))
         return NULL;
 
-    if(do_dump(json, flags, 0, dump_to_strbuffer, (void *)&strbuff)) {
-        strbuffer_close(&strbuff);
-        return NULL;
-    }
+    if(json_dump_callback(json, dump_to_strbuffer, (void *)&strbuff, flags))
+        result = NULL;
+    else
+        result = jsonp_strdup(strbuffer_value(&strbuff));
 
-    result = jsonp_strdup(strbuffer_value(&strbuff));
     strbuffer_close(&strbuff);
-
     return result;
 }
 
 int json_dumpf(const json_t *json, FILE *output, size_t flags)
 {
-    if(!(flags & JSON_ENCODE_ANY)) {
-        if(!json_is_array(json) && !json_is_object(json))
-           return -1;
-    }
-
-    return do_dump(json, flags, 0, dump_to_file, (void *)output);
+    return json_dump_callback(json, dump_to_file, (void *)output, flags);
 }
 
 int json_dump_file(const json_t *json, const char *path, size_t flags)