Renamed example to_xml to json_to_xml.

diff --git a/.gitignore b/.gitignore
index 6b02d966aeda9c384c35cb5d0ca8baf17e815db7..cd1c80035a0a2ff578b7f16fb0bdc996b911d9ad 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -50,7 +50,7 @@ intltool-*
 Rules-quot
 *.exe
 *.csv
-examples/to_xml
+examples/json_to_xml
 examples/xml_filter
 build/
 test-driver

diff --git a/examples/Makefile.am b/examples/Makefile.am
index a73567944d0b5f4dd428f202537da422d32879e6..99f755bad236a0fa12388e8eabcec7fa1dcc43a0 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -9,5 +9,5 @@ LIBS = $(ZAKUTILSJX_LIBS) \
 LDADD = $(top_builddir)/src/libzakutilsjsonxml.la
 
 noinst_PROGRAMS = \
-                  to_xml \
+                  json_to_xml \
                   xml_filter

diff --git a/examples/json_to_xml.c b/examples/json_to_xml.c
new file mode 100644 (file)
index 0000000..f07a30d
--- /dev/null
+++ b/examples/json_to_xml.c
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2020 Andrea Zagli <azagli@libero.it>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+
+#include <glib/gprintf.h>
+
+#include "json.h"
+#include "xml.h"
+
+int
+main (int argc, char *argv[])
+{
+       GError *error;
+
+       gboolean ok;
+
+       JsonParser *parser;
+       JsonReader *reader;
+
+       xmlDoc *xdoc;
+       xmlNode *xroot;
+
+       xmlChar *buf;
+
+       guint i;
+       int c;
+       gchar *data;
+
+       parser = json_parser_new ();
+
+       ok = FALSE;
+       if (argc > 1)
+               {
+                       error = NULL;
+                       if (!json_parser_load_from_file (parser, argv[1], &error)
+                           || error != NULL)
+                               {
+                                       g_warning ("Unable to parse json file «%s»\n%s",
+                                                  argv[1],
+                                                  error != NULL && error->message != NULL ? error->message : "no details");
+                               }
+                       else
+                               {
+                                       ok = TRUE;
+                               }
+               }
+       else
+               {
+                       /* stdin */
+                       i = 0;
+                       data = g_malloc (0);
+                       while (EOF != (c = fgetc (stdin)))
+                               {
+                                       i++;
+                                       data = g_realloc (data, i);
+                                       data[i - 1] = c;
+                               }
+
+                       error = NULL;
+                       if (!json_parser_load_from_data (parser, data, i, &error)
+                           || error != NULL)
+                               {
+                                       g_warning ("Unable to parse json «%s»\n%s",
+                                                  data,
+                                                  error != NULL && error->message != NULL ? error->message : "no details");
+                               }
+                       else
+                               {
+                                       ok = TRUE;
+                               }
+               }
+
+       if (ok)
+               {
+                       reader = json_reader_new (json_parser_get_root (parser));
+                       g_warning ("is array %d is object %d",
+                                  json_reader_is_array (reader),
+                                  json_reader_is_object (reader));
+                       g_warning ("elements %d members %d",
+                                  json_reader_count_elements (reader),
+                                  json_reader_count_members (reader));
+                       g_object_unref (reader);
+
+                       reader = json_reader_new (json_parser_get_root (parser));
+
+                       xdoc = xmlNewDoc ("1.0");
+                       xroot = xmlNewNode (NULL, "objects");
+                       xmlDocSetRootElement (xdoc, xroot);
+
+                       zak_utils_json_to_xml (reader, xroot);
+
+                       xmlDocDumpMemory (xdoc, &buf, NULL);
+
+                       g_printf ("%s", buf);
+
+                       xmlFreeDoc (xdoc);
+               }
+
+       g_object_unref (parser);
+
+       return 0;
+}

diff --git a/examples/to_xml.c b/examples/to_xml.c
deleted file mode 100644 (file)
index f07a30d..0000000
--- a/examples/to_xml.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2020 Andrea Zagli <azagli@libero.it>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <stdio.h>
-
-#include <glib/gprintf.h>
-
-#include "json.h"
-#include "xml.h"
-
-int
-main (int argc, char *argv[])
-{
-       GError *error;
-
-       gboolean ok;
-
-       JsonParser *parser;
-       JsonReader *reader;
-
-       xmlDoc *xdoc;
-       xmlNode *xroot;
-
-       xmlChar *buf;
-
-       guint i;
-       int c;
-       gchar *data;
-
-       parser = json_parser_new ();
-
-       ok = FALSE;
-       if (argc > 1)
-               {
-                       error = NULL;
-                       if (!json_parser_load_from_file (parser, argv[1], &error)
-                           || error != NULL)
-                               {
-                                       g_warning ("Unable to parse json file «%s»\n%s",
-                                                  argv[1],
-                                                  error != NULL && error->message != NULL ? error->message : "no details");
-                               }
-                       else
-                               {
-                                       ok = TRUE;
-                               }
-               }
-       else
-               {
-                       /* stdin */
-                       i = 0;
-                       data = g_malloc (0);
-                       while (EOF != (c = fgetc (stdin)))
-                               {
-                                       i++;
-                                       data = g_realloc (data, i);
-                                       data[i - 1] = c;
-                               }
-
-                       error = NULL;
-                       if (!json_parser_load_from_data (parser, data, i, &error)
-                           || error != NULL)
-                               {
-                                       g_warning ("Unable to parse json «%s»\n%s",
-                                                  data,
-                                                  error != NULL && error->message != NULL ? error->message : "no details");
-                               }
-                       else
-                               {
-                                       ok = TRUE;
-                               }
-               }
-
-       if (ok)
-               {
-                       reader = json_reader_new (json_parser_get_root (parser));
-                       g_warning ("is array %d is object %d",
-                                  json_reader_is_array (reader),
-                                  json_reader_is_object (reader));
-                       g_warning ("elements %d members %d",
-                                  json_reader_count_elements (reader),
-                                  json_reader_count_members (reader));
-                       g_object_unref (reader);
-
-                       reader = json_reader_new (json_parser_get_root (parser));
-
-                       xdoc = xmlNewDoc ("1.0");
-                       xroot = xmlNewNode (NULL, "objects");
-                       xmlDocSetRootElement (xdoc, xroot);
-
-                       zak_utils_json_to_xml (reader, xroot);
-
-                       xmlDocDumpMemory (xdoc, &buf, NULL);
-
-                       g_printf ("%s", buf);
-
-                       xmlFreeDoc (xdoc);
-               }
-
-       g_object_unref (parser);
-
-       return 0;
-}