move jansson files from client

client/CMakeLists.txt

@@ -283,7 +283,6 @@ set (TARGET_SOURCES
         ${PM3_ROOT}/client/src/fileutils.c
         ${PM3_ROOT}/client/src/flash.c
         ${PM3_ROOT}/client/src/graph.c
-        ${PM3_ROOT}/client/src/jansson_path.c
         ${PM3_ROOT}/client/src/preferences.c
         ${PM3_ROOT}/client/src/pm3_binlib.c
         ${PM3_ROOT}/client/src/pm3_bitlib.c

client/Makefile

@@ -272,6 +272,7 @@ PM3CFLAGS = $(CFLAGS)
 PM3CFLAGS += -I./src -I../include -I../common -I../common_fpga $(INCLUDES)
 # WIP Testing
 #PM3CFLAGS += -std=c11 -pedantic
+PM3CFLAGS += -g
 
 PREFIX ?= /usr/local
 ifneq (,$(findstring MINGW,$(platform)))
@@ -505,7 +506,6 @@ SRCS =  aidsearch.c \
 		flash.c \
 		generator.c \
 		graph.c \
-		jansson_path.c \
 		loclass/cipher.c \
 		loclass/cipherutils.c \
 		loclass/elite_crack.c \

client/deps/jansson/Makefile

@@ -13,7 +13,8 @@ MYSRCS = \
 	strbuffer.c \
 	strconv.c \
 	utf.c \
-	value.c
+	value.c \
+    jansson_path.c
 
 LIB_A = libjansson.a
 

client/deps/jansson/jansson_path.c

@@ -38,9 +38,7 @@ static void jsonp_free(void *ptr) {
 }
 
 static char *jsonp_strndup(const char *str, size_t len) {
-    char *new_str;
+    char *new_str = jsonp_malloc(len + 1);
-
-    new_str = jsonp_malloc(len + 1);
     if (!new_str)
         return NULL;