From 8e22e08935655e5b39873bc8e1aa41d2ef2f8487 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 19 Jul 2011 12:32:58 -0600 Subject: [PATCH] build: rename files.h to virfile.h In preparation for a future patch adding new virFile APIs. * src/util/files.h, src/util/files.c: Move... * src/util/virfile.h, src/util/virfile.c: ...here, and rename functions to virFile prefix. Macro names are intentionally left alone. * *.c: All '#include "files.h"' uses changed. * src/Makefile.am (UTIL_SOURCES): Reflect rename. * cfg.mk (exclude_file_name_regexp--sc_prohibit_close): Likewise. * src/libvirt_private.syms: Likewise. * docs/hacking.html.in: Likewise. * HACKING: Regenerate. --- HACKING | 2 +- cfg.mk | 2 +- daemon/libvirtd.c | 2 +- docs/hacking.html.in | 2 +- src/Makefile.am | 2 +- src/conf/domain_conf.c | 2 +- src/conf/network_conf.c | 2 +- src/conf/nwfilter_conf.c | 2 +- src/conf/storage_conf.c | 2 +- src/conf/storage_encryption_conf.c | 2 +- src/fdstream.c | 2 +- src/libvirt_private.syms | 12 ++++++------ src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/locking/lock_driver_sanlock.c | 2 +- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/node_device/node_device_linux_sysfs.c | 2 +- src/nodeinfo.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 2 +- src/openvz/openvz_conf.c | 2 +- src/openvz/openvz_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_process.c | 2 +- src/remote/remote_driver.c | 2 +- src/rpc/virnetclient.c | 2 +- src/rpc/virnetserver.c | 2 +- src/rpc/virnetsocket.c | 2 +- src/secret/secret_driver.c | 2 +- src/security/security_apparmor.c | 2 +- src/security/security_selinux.c | 2 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend.c | 2 +- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_logical.c | 2 +- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_scsi.c | 2 +- src/storage/storage_driver.c | 2 +- src/test/test_driver.c | 2 +- src/uml/uml_conf.c | 2 +- src/uml/uml_driver.c | 2 +- src/util/bridge.c | 2 +- src/util/cgroup.c | 2 +- src/util/command.c | 2 +- src/util/conf.c | 2 +- src/util/dnsmasq.c | 2 +- src/util/event_poll.c | 2 +- src/util/hooks.c | 2 +- src/util/interface.c | 2 +- src/util/iohelper.c | 2 +- src/util/logging.c | 2 +- src/util/macvtap.c | 2 +- src/util/pci.c | 2 +- src/util/stats_linux.c | 2 +- src/util/storage_file.c | 2 +- src/util/util.c | 2 +- src/util/uuid.c | 2 +- src/util/viraudit.c | 2 +- src/util/{files.c => virfile.c} | 10 +++++----- src/util/{files.h => virfile.h} | 18 +++++++++--------- src/vbox/vbox_tmpl.c | 2 +- src/vmware/vmware_conf.c | 2 +- src/vmware/vmware_driver.c | 2 +- src/xen/block_stats.c | 2 +- src/xen/xen_driver.c | 2 +- src/xen/xen_hypervisor.c | 2 +- src/xen/xen_inotify.c | 2 +- src/xen/xend_internal.c | 2 +- tests/commandhelper.c | 2 +- tests/commandtest.c | 2 +- tests/nodeinfotest.c | 2 +- tests/testutils.c | 2 +- tests/virnetsockettest.c | 2 +- tests/xencapstest.c | 2 +- tools/console.c | 2 +- tools/virsh.c | 2 +- 86 files changed, 103 insertions(+), 103 deletions(-) rename src/util/{files.c => virfile.c} (88%) rename src/util/{files.h => virfile.h} (70%) diff --git a/HACKING b/HACKING index 8ebbec774e..2df560a294 100644 --- a/HACKING +++ b/HACKING @@ -417,7 +417,7 @@ File handling Usage of the "fdopen()", "close()", "fclose()" APIs is deprecated in libvirt code base to help avoiding double-closing of files or file descriptors, which is particulary dangerous in a multi-threaded applications. Instead of these -APIs, use the macros from files.h +APIs, use the macros from virfile.h - Open a file from a file descriptor: diff --git a/cfg.mk b/cfg.mk index d24386264f..0a624f1592 100644 --- a/cfg.mk +++ b/cfg.mk @@ -689,7 +689,7 @@ exclude_file_name_regexp--sc_prohibit_asprintf = \ ^(bootstrap.conf$$|src/util/util\.c$$|examples/domain-events/events-c/event-test\.c$$) exclude_file_name_regexp--sc_prohibit_close = \ - (\.p[yl]$$|^docs/|^(src/util/files\.c|src/libvirt\.c)$$) + (\.p[yl]$$|^docs/|^(src/util/virfile\.c|src/libvirt\.c)$$) exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \ (^tests/qemuhelpdata/|\.(gif|ico|png)$$) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 259fcc4ed3..38876d84d9 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -34,7 +34,7 @@ #include "libvirt_internal.h" #include "virterror_internal.h" -#include "files.h" +#include "virfile.h" #define VIR_FROM_THIS VIR_FROM_QEMU diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 68886878e5..1a32d07438 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -506,7 +506,7 @@ Usage of the fdopen(), close(), fclose() APIs is deprecated in libvirt code base to help avoiding double-closing of files or file descriptors, which is particulary dangerous in a multi-threaded - applications. Instead of these APIs, use the macros from files.h + applications. Instead of these APIs, use the macros from virfile.h