Rename buf.{c,h} to virbuffer.{c,h}

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

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/buf.c util/buf.h				\
 		util/command.c util/command.h			\
 		util/conf.c util/conf.h				\
 		util/event.c util/event.h			\
@@ -84,6 +83,7 @@ UTIL_SOURCES =							\
 		util/virauth.c util/virauth.h			\
 		util/virauthconfig.c util/virauthconfig.h	\
 		util/virbitmap.c util/virbitmap.h		\
+		util/virbuffer.c util/virbuffer.h		\
 		util/virfile.c util/virfile.h			\
 		util/virnodesuspend.c util/virnodesuspend.h	\
 		util/virobject.c util/virobject.h		\

src/conf/capabilities.c

@@ -26,7 +26,7 @@
 #include <strings.h>
 
 #include "capabilities.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "util.h"
 #include "uuid.h"

src/conf/capabilities.h

@@ -25,7 +25,7 @@
 # define __VIR_CAPABILITIES_H
 
 # include "internal.h"
-# include "buf.h"
+# include "virbuffer.h"
 # include "cpu_conf.h"
 # include "virarch.h"
 # include "virmacaddr.h"

src/conf/cpu_conf.c

@@ -26,7 +26,7 @@
 #include "virterror_internal.h"
 #include "memory.h"
 #include "util.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "cpu_conf.h"
 #include "domain_conf.h"
 

src/conf/cpu_conf.h

@@ -25,7 +25,7 @@
 # define __VIR_CPU_CONF_H__
 
 # include "util.h"
-# include "buf.h"
+# include "virbuffer.h"
 # include "xml.h"
 # include "virbitmap.h"
 # include "virarch.h"

src/conf/device_conf.c

@@ -27,7 +27,7 @@
 #include "xml.h"
 #include "uuid.h"
 #include "util.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "device_conf.h"
 
 #define VIR_FROM_THIS VIR_FROM_DEVICE

src/conf/device_conf.h

@@ -30,7 +30,7 @@
 # include "internal.h"
 # include "util.h"
 # include "threads.h"
-# include "buf.h"
+# include "virbuffer.h"
 
 enum virDeviceAddressPciMulti {
     VIR_DEVICE_ADDRESS_PCI_MULTI_DEFAULT = 0,

src/conf/domain_conf.c

@@ -39,7 +39,7 @@
 #include "xml.h"
 #include "uuid.h"
 #include "util.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "logging.h"
 #include "nwfilter_conf.h"
 #include "storage_file.h"

src/conf/interface_conf.c

@@ -31,7 +31,7 @@
 #include "xml.h"
 #include "uuid.h"
 #include "util.h"
-#include "buf.h"
+#include "virbuffer.h"
 
 #define VIR_FROM_THIS VIR_FROM_INTERFACE
 

src/conf/netdev_bandwidth_conf.h

@@ -25,7 +25,7 @@
 
 # include "internal.h"
 # include "virnetdevbandwidth.h"
-# include "buf.h"
+# include "virbuffer.h"
 # include "xml.h"
 
 virNetDevBandwidthPtr virNetDevBandwidthParse(xmlNodePtr node,

src/conf/netdev_vlan_conf.h

@@ -24,7 +24,7 @@
 
 # include "internal.h"
 # include "virnetdevvlan.h"
-# include "buf.h"
+# include "virbuffer.h"
 # include "xml.h"
 
 int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr def);

src/conf/netdev_vport_profile_conf.h

@@ -25,7 +25,7 @@
 
 # include "internal.h"
 # include "virnetdevvportprofile.h"
-# include "buf.h"
+# include "virbuffer.h"
 # include "xml.h"
 
 typedef enum {

src/conf/network_conf.c

@@ -41,7 +41,7 @@
 #include "xml.h"
 #include "uuid.h"
 #include "util.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "c-ctype.h"
 #include "virfile.h"
 

src/conf/node_device_conf.c

@@ -34,7 +34,7 @@
 #include "memory.h"
 #include "xml.h"
 #include "util.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "uuid.h"
 #include "pci.h"
 #include "virrandom.h"

src/conf/nwfilter_conf.h

@@ -31,7 +31,7 @@
 # include "util.h"
 # include "virhash.h"
 # include "xml.h"
-# include "buf.h"
+# include "virbuffer.h"
 # include "virsocketaddr.h"
 # include "virmacaddr.h"
 

src/conf/nwfilter_params.h

@@ -24,7 +24,7 @@
 # define NWFILTER_PARAMS_H
 
 # include "virhash.h"
-# include "buf.h"
+# include "virbuffer.h"
 # include "virmacaddr.h"
 
 enum virNWFilterVarValueType {

src/conf/secret_conf.c

@@ -23,7 +23,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "datatypes.h"
 #include "logging.h"
 #include "memory.h"

src/conf/snapshot_conf.c

@@ -30,7 +30,7 @@
 
 #include "internal.h"
 #include "virbitmap.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "count-one-bits.h"
 #include "datatypes.h"
 #include "domain_conf.h"

src/conf/storage_conf.c

@@ -40,7 +40,7 @@
 
 #include "xml.h"
 #include "uuid.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "util.h"
 #include "memory.h"
 #include "virfile.h"

src/conf/storage_encryption_conf.c

@@ -27,7 +27,7 @@
 
 #include "internal.h"
 
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "storage_conf.h"
 #include "storage_encryption_conf.h"

src/conf/storage_encryption_conf.h

@@ -24,7 +24,7 @@
 # define __VIR_STORAGE_ENCRYPTION_H__
 
 # include "internal.h"
-# include "buf.h"
+# include "virbuffer.h"
 # include "util.h"
 
 # include <libxml/tree.h>

src/cpu/cpu_powerpc.c

@@ -32,7 +32,7 @@
 #include "cpu.h"
 
 #include "cpu_map.h"
-#include "buf.h"
+#include "virbuffer.h"
 
 #define VIR_FROM_THIS VIR_FROM_CPU
 

src/cpu/cpu_x86.c

@@ -31,7 +31,7 @@
 #include "cpu.h"
 #include "cpu_map.h"
 #include "cpu_x86.h"
-#include "buf.h"
+#include "virbuffer.h"
 
 
 #define VIR_FROM_THIS VIR_FROM_CPU

src/esx/esx_vi.c

@@ -26,7 +26,7 @@
 #include <libxml/parser.h>
 #include <libxml/xpathInternals.h>
 
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "logging.h"
 #include "util.h"

src/esx/esx_vi_methods.c

@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "logging.h"
 #include "uuid.h"

src/esx/esx_vi_types.c

@@ -27,7 +27,7 @@
 #include <libxml/parser.h>
 #include <libxml/xpathInternals.h>
 
-#include "buf.h"
+#include "virbuffer.h"
 #include "datatypes.h"
 #include "memory.h"
 #include "logging.h"

src/esx/esx_vi_types.h

@@ -23,7 +23,7 @@
 #ifndef __ESX_VI_TYPES_H__
 # define __ESX_VI_TYPES_H__
 
-# include "buf.h"
+# include "virbuffer.h"
 
 typedef enum _esxVI_Type esxVI_Type;
 typedef struct _esxVI_Object esxVI_Object;

src/hyperv/hyperv_wmi.c

@@ -31,7 +31,7 @@
 #include "memory.h"
 #include "util.h"
 #include "uuid.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "hyperv_private.h"
 #include "hyperv_wmi.h"
 

src/hyperv/hyperv_wmi.h

@@ -25,7 +25,7 @@
 #ifndef __HYPERV_WMI_H__
 # define __HYPERV_WMI_H__
 
-# include "buf.h"
+# include "virbuffer.h"
 # include "hyperv_private.h"
 # include "hyperv_wmi_classes.h"
 # include "openwsman.h"

src/lxc/lxc_fuse.c

@@ -34,7 +34,7 @@
 #include "virterror_internal.h"
 #include "logging.h"
 #include "virfile.h"
-#include "buf.h"
+#include "virbuffer.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 

src/network/bridge_driver.c

@@ -50,7 +50,7 @@
 #include "network_conf.h"
 #include "device_conf.h"
 #include "driver.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "virpidfile.h"
 #include "util.h"
 #include "command.h"

src/node_device/node_device_udev.c

@@ -36,7 +36,7 @@
 #include "memory.h"
 #include "uuid.h"
 #include "util.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "pci.h"
 
 #define VIR_FROM_THIS VIR_FROM_NODEDEV

src/nwfilter/nwfilter_ebiptables_driver.c

@@ -30,7 +30,7 @@
 
 #include "internal.h"
 
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "logging.h"
 #include "virterror_internal.h"

src/nwfilter/nwfilter_learnipaddr.c

@@ -41,7 +41,7 @@
 #include "internal.h"
 
 #include "intprops.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "logging.h"
 #include "datatypes.h"

src/openvz/openvz_conf.c

@@ -46,7 +46,7 @@
 #include "openvz_conf.h"
 #include "openvz_util.h"
 #include "uuid.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "util.h"
 #include "nodeinfo.h"

src/openvz/openvz_driver.c

@@ -48,7 +48,7 @@
 #include "datatypes.h"
 #include "openvz_driver.h"
 #include "openvz_util.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "util.h"
 #include "openvz_conf.h"
 #include "nodeinfo.h"

src/phyp/phyp_driver.c

@@ -46,7 +46,7 @@
 #include "virauth.h"
 #include "util.h"
 #include "datatypes.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "logging.h"
 #include "driver.h"

src/qemu/qemu_conf.c

@@ -40,7 +40,7 @@
 #include "qemu_capabilities.h"
 #include "qemu_bridge_filter.h"
 #include "uuid.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "conf.h"
 #include "util.h"
 #include "memory.h"

src/qemu/qemu_driver.c

@@ -61,7 +61,7 @@
 #include "virterror_internal.h"
 #include "logging.h"
 #include "datatypes.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "util.h"
 #include "nodeinfo.h"
 #include "stats_linux.h"

src/qemu/qemu_monitor_text.c

@@ -39,7 +39,7 @@
 #include "driver.h"
 #include "datatypes.h"
 #include "virterror_internal.h"
-#include "buf.h"
+#include "virbuffer.h"
 
 #ifdef WITH_DTRACE_PROBES
 # include "libvirt_qemu_probes.h"

src/remote/remote_driver.c

@@ -34,7 +34,7 @@
 #include "datatypes.h"
 #include "domain_event.h"
 #include "driver.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "remote_driver.h"
 #include "remote_protocol.h"
 #include "qemu_protocol.h"

src/rpc/virnetsshsession.c

@@ -26,7 +26,7 @@
 #include "virnetsshsession.h"
 
 #include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "logging.h"
 #include "configmake.h"

src/security/virt-aa-helper.c

@@ -40,7 +40,7 @@
 #include <locale.h>
 
 #include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "util.h"
 #include "memory.h"
 #include "command.h"

src/test/test_driver.c

@@ -35,7 +35,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "test_driver.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "util.h"
 #include "uuid.h"
 #include "capabilities.h"

src/uml/uml_conf.c

@@ -36,7 +36,7 @@
 
 #include "uml_conf.h"
 #include "uuid.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "conf.h"
 #include "util.h"
 #include "memory.h"

src/uml/uml_driver.c

@@ -46,7 +46,7 @@
 
 #include "uml_driver.h"
 #include "uml_conf.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "util.h"
 #include "nodeinfo.h"
 #include "stats_linux.h"

src/util/command.c

@@ -41,7 +41,7 @@
 #include "virfile.h"
 #include "virpidfile.h"
 #include "virprocess.h"
-#include "buf.h"
+#include "virbuffer.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/util/command.h

@@ -24,7 +24,7 @@
 
 # include "internal.h"
 # include "util.h"
-# include "buf.h"
+# include "virbuffer.h"
 
 typedef struct _virCommand virCommand;
 typedef virCommand *virCommandPtr;

src/util/conf.c

@@ -31,7 +31,7 @@
 #include <fcntl.h>
 
 #include "virterror_internal.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "conf.h"
 #include "util.h"
 #include "c-ctype.h"

src/util/logging.c

@@ -44,7 +44,7 @@
 #include "logging.h"
 #include "memory.h"
 #include "util.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "threads.h"
 #include "virfile.h"
 #include "virtime.h"

src/util/logging.h

@@ -23,7 +23,7 @@
 # define __VIRTLOG_H_
 
 # include "internal.h"
-# include "buf.h"
+# include "virbuffer.h"
 
 /*
  * To be made public

src/util/sexpr.h

@@ -13,7 +13,7 @@
 # define _LIBVIR_SEXPR_H_
 
 # include "internal.h"
-# include "buf.h"
+# include "virbuffer.h"
 
 enum sexpr_type {
     SEXPR_NIL,

src/util/sysinfo.h

@@ -26,7 +26,7 @@
 
 # include "internal.h"
 # include "util.h"
-# include "buf.h"
+# include "virbuffer.h"
 
 enum virSysinfoType {
     VIR_SYSINFO_SMBIOS,

src/util/util.c

@@ -77,7 +77,7 @@
 #include "dirname.h"
 #include "virterror_internal.h"
 #include "logging.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "util.h"
 #include "storage_file.h"
 #include "memory.h"

src/util/virbitmap.c

@@ -32,7 +32,7 @@
 
 #include "virbitmap.h"
 #include "memory.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "util.h"
 #include "c-ctype.h"
 #include "count-one-bits.h"

src/util/virbuffer.c

@@ -1,5 +1,5 @@
 /*
- * buf.c: buffers for libvirt
+ * virbuffer.c: buffers for libvirt
  *
  * Copyright (C) 2005-2008, 2010-2012 Red Hat, Inc.
  *
@@ -30,7 +30,7 @@
 
 #define __VIR_BUFFER_C__
 
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 
 

src/util/virbuffer.h

@@ -1,5 +1,5 @@
 /*
- * buf.h: buffers for libvirt
+ * virbuffer.h: buffers for libvirt
  *
  * Copyright (C) 2005-2008, 2011, 2012 Red Hat, Inc.
  *

src/util/virstring.c

@@ -23,7 +23,7 @@
 
 #include "virstring.h"
 #include "memory.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "virterror_internal.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

src/util/viruri.c

@@ -25,7 +25,7 @@
 #include "memory.h"
 #include "util.h"
 #include "virterror_internal.h"
-#include "buf.h"
+#include "virbuffer.h"
 
 #define VIR_FROM_THIS VIR_FROM_URI
 

src/util/xml.c

@@ -32,7 +32,7 @@
 
 #include "virterror_internal.h"
 #include "xml.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "util.h"
 #include "memory.h"
 #include "virfile.h"

src/xen/xen_hypervisor.c

@@ -73,7 +73,7 @@
 #include "stats_linux.h"
 #include "block_stats.h"
 #include "xend_internal.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "capabilities.h"
 #include "memory.h"
 #include "threads.h"

src/xen/xend_internal.c

@@ -37,7 +37,7 @@
 #include "util.h"
 #include "sexpr.h"
 #include "xen_sxpr.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "uuid.h"
 #include "xen_driver.h"
 #include "xen_hypervisor.h"

src/xen/xend_internal.h

@@ -23,7 +23,7 @@
 # include "capabilities.h"
 # include "domain_conf.h"
 # include "driver.h"
-# include "buf.h"
+# include "virbuffer.h"
 # include "viruri.h"
 
 int

src/xen/xm_internal.c

@@ -43,7 +43,7 @@
 #include "xen_sxpr.h"
 #include "xen_xm.h"
 #include "virhash.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "uuid.h"
 #include "util.h"
 #include "memory.h"

src/xenapi/xenapi_driver.c

@@ -34,7 +34,7 @@
 #include "util.h"
 #include "uuid.h"
 #include "memory.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "viruri.h"
 #include "xenapi_driver.h"
 #include "xenapi_driver_private.h"

src/xenapi/xenapi_utils.c

@@ -32,7 +32,7 @@
 #include "util.h"
 #include "uuid.h"
 #include "memory.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "logging.h"
 #include "viruri.h"
 #include "xenapi_driver_private.h"

tests/cputest.c

@@ -33,7 +33,7 @@
 #include "internal.h"
 #include "xml.h"
 #include "memory.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "testutils.h"
 #include "cpu_conf.h"
 #include "cpu/cpu.h"

tests/sysinfotest.c

@@ -30,7 +30,7 @@
 
 #include "internal.h"
 
-#include "buf.h"
+#include "virbuffer.h"
 #include "sysinfo.h"
 #include "testutils.h"
 #include "util.h"

tests/testutils.c

@@ -43,7 +43,7 @@
 #include "util.h"
 #include "threads.h"
 #include "virterror_internal.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "logging.h"
 #include "command.h"
 #include "virrandom.h"

tests/virbuftest.c

@@ -7,7 +7,7 @@
 #include "internal.h"
 #include "util.h"
 #include "testutils.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 
 #define TEST_ERROR(...)                             \

tools/virsh-domain.c

@@ -38,7 +38,7 @@
 
 #include "internal.h"
 #include "virbitmap.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "c-ctype.h"
 #include "conf/domain_conf.h"
 #include "console.h"

tools/virsh-host.c

@@ -32,7 +32,7 @@
 #include <libxml/xmlsave.h>
 
 #include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "util.h"
 #include "virsh-domain.h"

tools/virsh-interface.c

@@ -32,7 +32,7 @@
 #include <libxml/xmlsave.h>
 
 #include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "util.h"
 #include "xml.h"

tools/virsh-network.c

@@ -32,7 +32,7 @@
 #include <libxml/xmlsave.h>
 
 #include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "util.h"
 #include "xml.h"

tools/virsh-nodedev.c

@@ -32,7 +32,7 @@
 #include <libxml/xmlsave.h>
 
 #include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "util.h"
 #include "xml.h"

tools/virsh-nwfilter.c

@@ -32,7 +32,7 @@
 #include <libxml/xmlsave.h>
 
 #include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "util.h"
 #include "xml.h"

tools/virsh-pool.c

@@ -32,7 +32,7 @@
 #include <libxml/xmlsave.h>
 
 #include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "util.h"
 #include "xml.h"

tools/virsh-secret.c

@@ -33,7 +33,7 @@
 
 #include "internal.h"
 #include "base64.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "util.h"
 #include "xml.h"

tools/virsh-snapshot.c

@@ -34,7 +34,7 @@
 #include <libxml/xmlsave.h>
 
 #include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "util.h"
 #include "virsh-domain.h"

tools/virsh-volume.c

@@ -34,7 +34,7 @@
 #include <libxml/xmlsave.h>
 
 #include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "memory.h"
 #include "util.h"
 #include "virfile.h"

tools/virsh.c

@@ -56,7 +56,7 @@
 #include "internal.h"
 #include "virterror_internal.h"
 #include "base64.h"
-#include "buf.h"
+#include "virbuffer.h"
 #include "console.h"
 #include "util.h"
 #include "memory.h"