Added conditional json builder flag at the lib side

Change-Id: Ide9af52c48590211560f557dcb6b4ee285bd9c87
Signed-off-by: Manasij Sur Roy <manasij.r@samsung.com>

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 6de10d1..c3c0fcc 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -33,6 +33,10 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
 
+if(USE_JSON_BUILDER)
+add_definitions(-DWITH_JSON_BUILDER)
+endif()
+
 ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_SOURCE_DIR}/common/fido-stub.c ${CMAKE_SOURCE_DIR}/common/fido-stub.h
 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/common/
 COMMAND gdbus-codegen --interface-prefix org.tizen. --generate-c-code fido-stub ${CMAKE_SOURCE_DIR}/common/dbus_interfaces/fido.xml 

diff --git a/common/fido_json_handler.c b/common/fido_json_handler.c
index 40e4bb8..860ae3d 100644 (file)
--- a/common/fido_json_handler.c
+++ b/common/fido_json_handler.c
@@ -2767,16 +2767,21 @@ _uaf_parser_parse_message(const char *uaf_json, const gchar *channel_binding)
             uaf_message_temp->channel_binding = strdup(channel_binding);
     }
 
+       _INFO("Before json_parser_new");
+
     JsonParser *parser = json_parser_new();
     CATCH_IF_FAIL(parser != NULL);
 
+       _INFO("Before json_parser_load_from_data");
     GError *parse_err = NULL;
     json_parser_load_from_data(parser, uaf_json, -1, &parse_err);
     CATCH_IF_FAIL(parse_err == NULL);
 
+       _INFO("Before json_parser_get_root");
     JsonNode *root = json_parser_get_root(parser);
     CATCH_IF_FAIL(root != NULL);
 
+       _INFO("Before json_node_get_array");
     JsonArray *uaf_array = json_node_get_array(root);
     CATCH_IF_FAIL(uaf_array != NULL);