jansson update. 2.11 to 2.12 (#724)

[proxmark3-svn] / client / jansson / dump.c

diff --git a/client/jansson/dump.c b/client/jansson/dump.c
index 8e725c934ff202f3e2d53d92106c639f90be898b..89802c65dc65a35bf8cdf7b571f12710a8b4213a 100644 (file)
--- a/client/jansson/dump.c
+++ b/client/jansson/dump.c
@@ -61,8 +61,8 @@ static int dump_to_file(const char *buffer, size_t size, void *data)
 
 static int dump_to_fd(const char *buffer, size_t size, void *data)
 {
 
 static int dump_to_fd(const char *buffer, size_t size, void *data)
 {

-    int *dest = (int *)data;

 #ifdef HAVE_UNISTD_H
 #ifdef HAVE_UNISTD_H

+    int *dest = (int *)data;

     if(write(*dest, buffer, size) == (ssize_t)size)
         return 0;
 #endif
     if(write(*dest, buffer, size) == (ssize_t)size)
         return 0;
 #endif


@@ -101,7 +101,7 @@ static int dump_indent(size_t flags, int depth, int space, json_dump_callback_t
 static int dump_string(const char *str, size_t len, json_dump_callback_t dump, void *data, size_t flags)
 {
     const char *pos, *end, *lim;
 static int dump_string(const char *str, size_t len, json_dump_callback_t dump, void *data, size_t flags)
 {
     const char *pos, *end, *lim;

-    int32_t codepoint;
+    int32_t codepoint = 0;

 
     if(dump("\"", 1, data))
         return -1;
 
     if(dump("\"", 1, data))
         return -1;


@@ -306,7 +306,7 @@ static int do_dump(const json_t *json, size_t flags, int depth,
             const char *separator;
             int separator_length;
             /* Space for "0x", double the sizeof a pointer for the hex and a terminator. */
             const char *separator;
             int separator_length;
             /* Space for "0x", double the sizeof a pointer for the hex and a terminator. */

-            char key[2 + (sizeof(json) * 2) + 1];
+            char loop_key[2 + (sizeof(json) * 2) + 1];

 
             if(flags & JSON_COMPACT) {
                 separator = ":";
 
             if(flags & JSON_COMPACT) {
                 separator = ":";


@@ -318,7 +318,7 @@ static int do_dump(const json_t *json, size_t flags, int depth,
             }
 
             /* detect circular references */
             }
 
             /* detect circular references */

-            if (loop_check(parents, json, key, sizeof(key)))
+            if (loop_check(parents, json, loop_key, sizeof(loop_key)))

                 return -1;
 
             iter = json_object_iter((json_t *)json);
                 return -1;
 
             iter = json_object_iter((json_t *)json);


@@ -326,7 +326,7 @@ static int do_dump(const json_t *json, size_t flags, int depth,
             if(!embed && dump("{", 1, data))
                 return -1;
             if(!iter) {
             if(!embed && dump("{", 1, data))
                 return -1;
             if(!iter) {

-                hashtable_del(parents, key);
+                hashtable_del(parents, loop_key);

                 return embed ? 0 : dump("}", 1, data);
             }
             if(dump_indent(flags, depth + 1, 0, dump, data))
                 return embed ? 0 : dump("}", 1, data);
             }
             if(dump_indent(flags, depth + 1, 0, dump, data))


@@ -422,7 +422,7 @@ static int do_dump(const json_t *json, size_t flags, int depth,
                 }
             }
 
                 }
             }
 

-            hashtable_del(parents, key);
+            hashtable_del(parents, loop_key);

             return embed ? 0 : dump("}", 1, data);
         }
 
             return embed ? 0 : dump("}", 1, data);
         }