[PATCH v2 18/28] Rename sexpr.{c,h} to virsexpr.{c,h}

["Daniel P. Berrange" <berrange@xxxxxxxxxx>]

From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>

---
 cfg.mk                           | 2 +-
 po/POTFILES.in                   | 2 +-
 src/Makefile.am                  | 2 +-
 src/util/{sexpr.c => virsexpr.c} | 2 +-
 src/util/{sexpr.h => virsexpr.h} | 0
 src/xen/xend_internal.c          | 2 +-
 src/xenxs/xen_sxpr.h             | 2 +-
 src/xenxs/xen_xm.c               | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename src/util/{sexpr.c => virsexpr.c} (99%)
 rename src/util/{sexpr.h => virsexpr.h} (100%)

diff --git a/cfg.mk b/cfg.mk
index cdd02e4..d1b46b9 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -807,7 +807,7 @@ exclude_file_name_regexp--sc_prohibit_sprintf = \
 exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/util\.c$$
 
 exclude_file_name_regexp--sc_prohibit_strtol = \
-  ^src/(util/sexpr|(vbox|xen|xenxs)/.*)\.c$$
+  ^src/(util/virsexpr|(vbox|xen|xenxs)/.*)\.c$$
 
 exclude_file_name_regexp--sc_prohibit_xmlGetProp = ^src/util/xml\.c$$
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2dc72f6..4e841a1 100644
--- 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/sexpr.c
 src/util/stats_linux.c
 src/util/storage_file.c
 src/util/sysinfo.c
@@ -174,6 +173,7 @@ src/util/virpci.c
 src/util/virpidfile.c
 src/util/virprocess.c
 src/util/virrandom.c
+src/util/virsexpr.c
 src/util/virsocketaddr.c
 src/util/virterror.c
 src/util/virterror_internal.h
diff --git a/src/Makefile.am b/src/Makefile.am
index cbdfc45..f639956 100644
--- 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/sexpr.c util/sexpr.h			\
 		util/stats_linux.c util/stats_linux.h		\
 		util/storage_file.c util/storage_file.h		\
 		util/sysinfo.c util/sysinfo.h			\
@@ -87,6 +86,7 @@ UTIL_SOURCES =							\
 		util/virpci.c util/virpci.h			\
 		util/virpidfile.c util/virpidfile.h		\
 		util/virprocess.c util/virprocess.h		\
+		util/virsexpr.c util/virsexpr.h			\
 		util/virtypedparam.c util/virtypedparam.h	\
 		util/xml.c util/xml.h				\
 		util/virterror.c util/virterror_internal.h	\
diff --git a/src/util/sexpr.c b/src/util/virsexpr.c
similarity index 99%
rename from src/util/sexpr.c
rename to src/util/virsexpr.c
index ae0cc18..80c24c4 100644
--- a/src/util/sexpr.c
+++ b/src/util/virsexpr.c
@@ -18,7 +18,7 @@
 #include <errno.h>
 
 #include "virterror_internal.h"
-#include "sexpr.h"
+#include "virsexpr.h"
 #include "util.h"
 #include "viralloc.h"
 
diff --git a/src/util/sexpr.h b/src/util/virsexpr.h
similarity index 100%
rename from src/util/sexpr.h
rename to src/util/virsexpr.h
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index a4005f4..6e8bc2f 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -35,7 +35,7 @@
 #include "xend_internal.h"
 #include "driver.h"
 #include "util.h"
-#include "sexpr.h"
+#include "virsexpr.h"
 #include "xen_sxpr.h"
 #include "virbuffer.h"
 #include "uuid.h"
diff --git a/src/xenxs/xen_sxpr.h b/src/xenxs/xen_sxpr.h
index 4ff640c..d7ce46a 100644
--- a/src/xenxs/xen_sxpr.h
+++ b/src/xenxs/xen_sxpr.h
@@ -30,7 +30,7 @@
 # include "internal.h"
 # include "virconf.h"
 # include "domain_conf.h"
-# include "sexpr.h"
+# include "virsexpr.h"
 
 typedef enum {
     XEND_CONFIG_VERSION_3_0_2 = 1,
diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index 8a64aad..2291c02 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -31,7 +31,7 @@
 #include "viralloc.h"
 #include "verify.h"
 #include "uuid.h"
-#include "sexpr.h"
+#include "virsexpr.h"
 #include "count-one-bits.h"
 #include "xenxs_private.h"
 #include "xen_xm.h"
-- 
1.7.11.7

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list