Merge pull request #910 from pwpiwi/small_USB_response

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

diff --git a/client/jansson/load.c b/client/jansson/load.c
index 4cf3855af9b837f0455f73787094b0c26d3da46a..7ed0e377a68e0f6887d22c260dda04a2b6780be6 100644 (file)
--- a/client/jansson/load.c
+++ b/client/jansson/load.c
@@ -829,10 +829,8 @@ static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error)
             }
 
             json = jsonp_stringn_nocheck_own(value, len);
             }
 
             json = jsonp_stringn_nocheck_own(value, len);

-            if(json) {
-                lex->value.string.val = NULL;
-                lex->value.string.len = 0;
-            }
+            lex->value.string.val = NULL;
+            lex->value.string.len = 0;

             break;
         }
 
             break;
         }
 


@@ -1036,8 +1034,8 @@ json_t *json_loadf(FILE *input, size_t flags, json_error_t *error)
 
 static int fd_get_func(int *fd)
 {
 
 static int fd_get_func(int *fd)
 {

-    uint8_t c;

 #ifdef HAVE_UNISTD_H
 #ifdef HAVE_UNISTD_H

+    uint8_t c;

     if (read(*fd, &c, 1) == 1)
         return c;
 #endif
     if (read(*fd, &c, 1) == 1)
         return c;
 #endif