Rename json.{c,h} to virjson.{c,h}

po/POTFILES.in

@@ -139,7 +139,6 @@ src/test/test_driver.c
 src/uml/uml_conf.c
 src/uml/uml_driver.c
 src/util/iohelper.c
-src/util/json.c
 src/util/pci.c
 src/util/processinfo.c
 src/util/sexpr.c
@@ -161,6 +160,7 @@ src/util/virhash.c
 src/util/virhook.c
 src/util/virinitctl.c
 src/util/viriptables.c
+src/util/virjson.c
 src/util/virkeyfile.c
 src/util/virlockspace.c
 src/util/virnetdev.c

src/Makefile.am

@@ -53,7 +53,6 @@ augeastest_DATA =
 # These files are not related to driver APIs. Simply generic
 # helper APIs for various purposes
 UTIL_SOURCES =							\
-		util/json.c util/json.h				\
 		util/logging.c util/logging.h			\
 		util/memory.c util/memory.h			\
 		util/pci.c util/pci.h				\
@@ -85,6 +84,7 @@ UTIL_SOURCES =							\
 		util/virhook.c util/virhook.h			\
 		util/virnodesuspend.c util/virnodesuspend.h	\
 		util/viriptables.c util/viriptables.h		\
+		util/virjson.c util/virjson.h			\
 		util/virobject.c util/virobject.h		\
 		util/virpidfile.c util/virpidfile.h		\
 		util/virprocess.c util/virprocess.h		\

src/parallels/parallels_utils.c

@@ -27,7 +27,7 @@
 #include "vircommand.h"
 #include "virterror_internal.h"
 #include "memory.h"
-#include "json.h"
+#include "virjson.h"
 
 #include "parallels_utils.h"
 

src/parallels/parallels_utils.h

@@ -29,7 +29,7 @@
 # include "conf/storage_conf.h"
 # include "conf/domain_event.h"
 # include "conf/network_conf.h"
-# include "json.h"
+# include "virjson.h"
 
 # define parallelsParseError()                                                 \
     virReportErrorHelper(VIR_FROM_TEST, VIR_ERR_OPERATION_FAILED, __FILE__,    \

src/qemu/qemu_agent.c

@@ -37,7 +37,7 @@
 #include "memory.h"
 #include "logging.h"
 #include "virterror_internal.h"
-#include "json.h"
+#include "virjson.h"
 #include "virfile.h"
 #include "virprocess.h"
 #include "virtime.h"

src/qemu/qemu_monitor.h

@@ -30,7 +30,7 @@
 # include "domain_conf.h"
 # include "virbitmap.h"
 # include "virhash.h"
-# include "json.h"
+# include "virjson.h"
 # include "device_conf.h"
 
 typedef struct _qemuMonitor qemuMonitor;

src/qemu/qemu_monitor_json.c

@@ -40,7 +40,7 @@
 #include "driver.h"
 #include "datatypes.h"
 #include "virterror_internal.h"
-#include "json.h"
+#include "virjson.h"
 
 #ifdef WITH_DTRACE_PROBES
 # include "libvirt_qemu_probes.h"

src/rpc/virnetserver.h

@@ -31,7 +31,7 @@
 # include "virnetserverclient.h"
 # include "virnetserverservice.h"
 # include "virobject.h"
-# include "json.h"
+# include "virjson.h"
 
 virNetServerPtr virNetServerNew(size_t min_workers,
                                 size_t max_workers,

src/rpc/virnetserverclient.h

@@ -27,7 +27,7 @@
 # include "virnetsocket.h"
 # include "virnetmessage.h"
 # include "virobject.h"
-# include "json.h"
+# include "virjson.h"
 
 typedef struct _virNetServerClient virNetServerClient;
 typedef virNetServerClient *virNetServerClientPtr;

src/rpc/virnetsocket.h

@@ -31,7 +31,7 @@
 # ifdef HAVE_SASL
 #  include "virnetsaslcontext.h"
 # endif
-# include "json.h"
+# include "virjson.h"
 
 typedef struct _virNetSocket virNetSocket;
 typedef virNetSocket *virNetSocketPtr;

src/util/json.c → src/util/virjson.c

 /*
- * json.c: JSON object parsing/formatting
+ * virjson.c: JSON object parsing/formatting
  *
  * Copyright (C) 2009-2010, 2012 Red Hat, Inc.
  * Copyright (C) 2009 Daniel P. Berrange
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include "json.h"
+#include "virjson.h"
 #include "memory.h"
 #include "virterror_internal.h"
 #include "logging.h"

src/util/json.h → src/util/virjson.h

 /*
- * json.h: JSON object parsing/formatting
+ * virjson.h: JSON object parsing/formatting
  *
  * Copyright (C) 2009, 2012 Red Hat, Inc.
  * Copyright (C) 2009 Daniel P. Berrange

src/util/virlockspace.h

@@ -23,7 +23,7 @@
 # define __VIR_LOCK_SPACE_H__
 
 # include "internal.h"
-# include "json.h"
+# include "virjson.h"
 
 typedef struct _virLockSpace virLockSpace;
 typedef virLockSpace *virLockSpacePtr;

tests/jsontest.c

@@ -6,7 +6,7 @@
 #include <time.h>
 
 #include "internal.h"
-#include "json.h"
+#include "virjson.h"
 #include "testutils.h"
 
 struct testInfo {

tools/virsh-host.c

@@ -38,7 +38,7 @@
 #include "virsh-domain.h"
 #include "xml.h"
 #include "virtypedparam.h"
-#include "json.h"
+#include "virjson.h"
 
 /*
  * "capabilities" command