From 226ad9815a1f02d911a15ec8d7c3f4bb1b999821 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 13 Dec 2012 15:07:43 +0000 Subject: [PATCH] Rename sexpr.{c,h} to virsexpr.{c,h} --- cfg.mk | 2 +- po/POTFILES.in | 2 +- src/Makefile.am | 2 +- src/util/{sexpr.c => virsexpr.c} | 21 ++++++++++++++++----- src/util/{sexpr.h => virsexpr.h} | 19 +++++++++++++++---- src/xen/xend_internal.c | 2 +- src/xenxs/xen_sxpr.h | 2 +- src/xenxs/xen_xm.c | 2 +- 8 files changed, 37 insertions(+), 15 deletions(-) rename src/util/{sexpr.c => virsexpr.c} (94%) rename src/util/{sexpr.h => virsexpr.h} (66%) diff --git a/cfg.mk b/cfg.mk index cdd02e4c78..d1b46b95a9 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 2dc72f6c3c..4e841a1dbe 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 cbdfc45bc8..f639956ce3 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 94% rename from src/util/sexpr.c rename to src/util/virsexpr.c index ae0cc186ee..72174c287d 100644 --- 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 * - * 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 + * . + * */ #include @@ -18,7 +29,7 @@ #include #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 13ec481f3b..72a49e4a41 100644 --- 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 * - * 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 + * . + * */ #ifndef _LIBVIR_SEXPR_H_ diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index a4005f4e08..6e8bc2f698 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 4ff640c40a..d7ce46a3dd 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 8a64aad13d..2291c0211d 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"