Use of zakutilsjson functions to parse data.

diff --git a/tests/getsqlfromjson.c b/tests/getsqlfromjson.c
index ee8fa3236d4e019b8c80f4a78c617fd4950a0752..c719874b69263d82ca7ff57f0a825d0022165b54 100644 (file)
--- a/tests/getsqlfromjson.c
+++ b/tests/getsqlfromjson.c
@@ -44,7 +44,6 @@ main (int argc, char **argv)
        gchar *keys;
        gchar *fields;
 
-       JsonParser *parser;
        JsonNode *jnode_keys;
        JsonNode *jnode_fields;
 
@@ -66,14 +65,7 @@ main (int argc, char **argv)
                           "\"address\": \"rue morgue, 44\","
                           "\"incoming\": \"1342.81\"}");
 
-       parser = json_parser_new ();
-
-       if (!json_parser_load_from_data (parser, fields, -1, NULL))
-               {
-                       return 0;
-               }
-
-       jnode_fields = json_parser_get_root (parser);
+       jnode_fields = zak_utils_json_parse_data (fields);
 
        ht_fields = zak_utils_json_to_hashtable_gvalue (jnode_fields);
 
@@ -87,14 +79,7 @@ main (int argc, char **argv)
 
        keys = g_strdup ("{\"id\": \"44\"}");
 
-       parser = json_parser_new ();
-
-       if (!json_parser_load_from_data (parser, keys, -1, NULL))
-               {
-                       return 0;
-               }
-
-       jnode_keys = json_parser_get_root (parser);
+       jnode_keys = zak_utils_json_parse_data (keys);
 
        ht_keys = zak_utils_json_to_hashtable_gvalue (jnode_keys);
 
@@ -108,14 +93,7 @@ main (int argc, char **argv)
        fields = g_strdup ("{\"name\": \"my new name\","
                           "\"surname\": \"and this is the new sur'name with '\"}");
 
-       parser = json_parser_new ();
-
-       if (!json_parser_load_from_data (parser, fields, -1, NULL))
-               {
-                       return 0;
-               }
-
-       jnode_fields = json_parser_get_root (parser);
+       jnode_fields = zak_utils_json_parse_data (fields);
 
        ht_fields = zak_utils_json_to_hashtable_gvalue (jnode_fields);