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

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7d16d444e8ba35c54926d4ab3987f9fb2fb08720..e39a4ef820ddcc52408d8a9dd640d66998589d85 100644 (file)
--- a/po/POTFILES.in
+++ b/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

diff --git a/src/Makefile.am b/src/Makefile.am
index d8f20f0042ac975c0749f256024fa1ca0c2d9fe0..d0c391ec2eb9409aba47b5a2bccb00e4f9859d49 100644 (file)
--- a/src/Makefile.am
+++ b/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             \

diff --git a/src/parallels/parallels_utils.c b/src/parallels/parallels_utils.c
index e47ff76fc36bce8af3415bb344ef6990769b7f8d..b032882ea75e91dcdb8979397929b77710a0cfae 100644 (file)
--- a/src/parallels/parallels_utils.c
+++ b/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"
 

diff --git a/src/parallels/parallels_utils.h b/src/parallels/parallels_utils.h
index 0010f85643f9d108cc0141d218826c227994c3ff..7c317077cf1173ad7409173342be45e8e47c97f6 100644 (file)
--- a/src/parallels/parallels_utils.h
+++ b/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__,    \

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 893f7f23baeb0ce44200dd21ec1ee46da907a52f..6727294979ea3eb7eb2196433cfee4de5debedc1 100644 (file)
--- a/src/qemu/qemu_agent.c
+++ b/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"

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 8c42b12e4890dc9e6c2be44e73f859cb39679b9a..d7faa9027a9db0880ea4b41b23f5a62572d872e6 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/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;

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 0cd66b694e8df870e8d7b1763518c8d033a30792..618166883a035d30369c534b6a6ccdaa0c29dc55 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/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"

diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h
index 38cccfe77bff984d0226f769ef3dfa8d47791868..da7dc9e9b62eb832021384fe64b5ce431f29f249 100644 (file)
--- a/src/rpc/virnetserver.h
+++ b/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,

diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h
index 041ffde5152868f4d0e0e3fe82446049ee2d389b..65084e21f4549178ea78ab3a9cdd0b0cad65eb45 100644 (file)
--- a/src/rpc/virnetserverclient.h
+++ b/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;

diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
index fcd54dd606fc999f63cb9c175b39a21225fccc68..7016c09e30a05b4472b63b8904f340e65cba3b5a 100644 (file)
--- a/src/rpc/virnetsocket.h
+++ b/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;

diff --git a/src/util/json.c b/src/util/virjson.c
similarity index 99%
rename from src/util/json.c
rename to src/util/virjson.c
index 41e03113c7ced75dbb553a1c9dd772d1aa627e11..a719989c7e1ba84d78bb1ac5c2e9b14743205d01 100644 (file)
--- a/src/util/json.c
+++ b/src/util/virjson.c
@@ -1,5 +1,5 @@
 /*
- * 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"

diff --git a/src/util/json.h b/src/util/virjson.h
similarity index 99%
rename from src/util/json.h
rename to src/util/virjson.h
index 0a76b3ab17711936458da09f015a7463d0ec1a88..67f4398f436a2a6be60217ff7663d4aff3ac6e33 100644 (file)
--- a/src/util/json.h
+++ b/src/util/virjson.h
@@ -1,5 +1,5 @@
 /*
- * 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

diff --git a/src/util/virlockspace.h b/src/util/virlockspace.h
index 9c5128bdc39267fbba7aa75cc4336507b2d012b5..041cf203968ae0c8f331e15cf4a1789399138afe 100644 (file)
--- a/src/util/virlockspace.h
+++ b/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;

diff --git a/tests/jsontest.c b/tests/jsontest.c
index 412f475889f7ab6ea0da17d26c7e155b59fef2ff..98a60690f8d9bb79de359f1a7707d12fb3887701 100644 (file)
--- a/tests/jsontest.c
+++ b/tests/jsontest.c
@@ -6,7 +6,7 @@
 #include <time.h>
 
 #include "internal.h"
-#include "json.h"
+#include "virjson.h"
 #include "testutils.h"
 
 struct testInfo {

diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index f687780911014873b7e4c606ebba823060cb8cf8..6f129d1f11231f5e9b886581913240aaed8cea5e 100644 (file)
--- a/tools/virsh-host.c
+++ b/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