Rename sexpr.{c,h} to virsexpr.{c,h}

diff --git a/cfg.mk b/cfg.mk
index cdd02e4c78f1f8604be6f937cbd5224762c710c5..d1b46b95a90ce4c2d1c54856c9d98b4cf50a7bf0 100644 (file)
--- 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 2dc72f6c3c752b799c8eec542e90c491b622f351..4e841a1dbebefd87b83823a986ff35565ef4d416 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/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 cbdfc45bc8c58e61c784a5a0967e60fb588a1352..f639956ce318bd525fbc7c53a98bed1d724d8e15 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/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 94%
rename from src/util/sexpr.c
rename to src/util/virsexpr.c
index ae0cc186ee88e37e8600606a47dd33d278fae191..72174c287d1529a8a4e69e91e23edc8260f81831 100644 (file)
--- a/src/util/sexpr.c
+++ b/src/util/virsexpr.c
@@ -1,12 +1,23 @@
 /*
- * sexpr.c : S-Expression routines to communicate with the Xen Daemon
+ * virsexpr.c : S-Expression routines to communicate with the Xen Daemon
  *
  * Copyright (C) 2010-2011 Red Hat, Inc.
  * Copyright (C) 2005 Anthony Liguori <aliguori@us.ibm.com>
  *
- *  This file is subject to the terms and conditions of the GNU Lesser General
- *  Public License. See the file COPYING.LIB in the main directory of this
- *  archive for more details.
+ * 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, see
+ * <http://www.gnu.org/licenses/>.
+ *
  */
 
 #include <config.h>
@@ -18,7 +29,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 66%
rename from src/util/sexpr.h
rename to src/util/virsexpr.h
index 13ec481f3ba761fdd900b2d8a150e736c0788417..72a49e4a41a7a395416800b0edb04e8be28c0548 100644 (file)
--- a/src/util/sexpr.h
+++ b/src/util/virsexpr.h
@@ -1,12 +1,23 @@
 /*
- * sexpr.h : S-Expression interfaces needed to communicate with the Xen Daemon
+ * virsexpr.h : S-Expression interfaces needed to communicate with the Xen Daemon
  *
  * Copyright (C) 2012 Red Hat, Inc.
  * Copyright (C) 2005 Anthony Liguori <aliguori@us.ibm.com>
  *
- *  This file is subject to the terms and conditions of the GNU Lesser General
- *  Public License. See the file COPYING.LIB in the main directory of this
- *  archive for more details.
+ * 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, see
+ * <http://www.gnu.org/licenses/>.
+ *
  */
 
 #ifndef _LIBVIR_SEXPR_H_

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index a4005f4e086f91a8a754e453e399d283228337cf..6e8bc2f69877b0899211e829c6f58e6b90cbe3de 100644 (file)
--- 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 4ff640c40a5da35e468ffce074fcb6f3ce2620be..d7ce46a3dd8a0f1602f7c9d699ee6be08679bbcd 100644 (file)
--- 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 8a64aad13d47dd9c7dbbe494d23ad2aa417588f4..2291c0211d56754723b16d1bebbd38dfdfc565d1 100644 (file)
--- 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"