build: Rename most C files that contain underscore with dash.

This is just code motion.

Some files cannot be renamed.  Notably rpcgen input and output files
must not contain dash characters, else rpcgen breaks.

.gitignore

@@ -61,8 +61,8 @@ Makefile.in
 /csharp/Libguestfs.cs
 /daemon/actions.h
 /daemon/errnostring.c
-/daemon/errnostring_gperf.c
-/daemon/errnostring_gperf.gperf
+/daemon/errnostring-gperf.c
+/daemon/errnostring-gperf.gperf
 /daemon/errnostring.h
 /daemon/guestfsd
 /daemon/guestfsd.exe
@@ -104,8 +104,8 @@ Makefile.in
 /examples/stamp-guestfs-testing.pod
 /examples/virt-dhcp-address
 /fish/cmds.c
-/fish/cmds_gperf.c
-/fish/cmds_gperf.gperf
+/fish/cmds-gperf.c
+/fish/cmds-gperf.gperf
 /fish/completion.c
 /fish/event-names.c
 /fish/fish-cmds.h
@@ -227,7 +227,7 @@ Makefile.in
 /ocaml/examples/guestfs-ocaml.3
 /ocaml/examples/inspect_vm
 /ocaml/examples/stamp-guestfs-ocaml.pod
-/ocaml/guestfs_c_actions.c
+/ocaml/guestfs-c-actions.c
 /ocaml/guestfs.ml
 /ocaml/guestfs.mli
 /ocamlinit-stamp
@@ -336,8 +336,8 @@ Makefile.in
 /src/actions.c
 /src/bindtests.c
 /src/errnostring.c
-/src/errnostring_gperf.c
-/src/errnostring_gperf.gperf
+/src/errnostring-gperf.c
+/src/errnostring-gperf.gperf
 /src/errnostring.h
 /src/guestfs.3
 /src/guestfs-actions.pod

daemon/Makefile.am

@@ -28,8 +28,8 @@ BUILT_SOURCES = \
 	$(generator_built) \
 	guestfs_protocol.c \
 	guestfs_protocol.h \
-	errnostring_gperf.c \
-	errnostring_gperf.gperf \
+	errnostring-gperf.c \
+	errnostring-gperf.gperf \
 	errnostring.c \
 	errnostring.h
 
@@ -57,16 +57,16 @@ $(libsrcdir)/guestfs_protocol.h: force
 # of warnings so we must compile it in a separate mini-library.
 noinst_LIBRARIES += liberrnostring.a
 liberrnostring_a_SOURCES = \
-	errnostring_gperf.c \
+	errnostring-gperf.c \
 	errnostring.h \
 	errnostring.c
 liberrnostring_a_CFLAGS =
 
-errnostring_gperf.c: errnostring_gperf.gperf
+errnostring-gperf.c: errnostring-gperf.gperf
 	rm -f $@
 	$(GPERF) -t $< > $@-t
 	mv $@-t $@
-errnostring_gperf.gperf: $(libsrcdir)/errnostring_gperf.gperf
+errnostring-gperf.gperf: $(libsrcdir)/errnostring-gperf.gperf
 	rm -f $@
 	ln $< $@
 errnostring.c: $(libsrcdir)/errnostring.c
@@ -106,7 +106,7 @@ guestfsd_SOURCES = \
 	dmesg.c \
 	dropcaches.c \
 	du.c \
-	echo_daemon.c \
+	echo-daemon.c \
 	ext2.c \
 	fallocate.c \
 	file.c \

fish/Makefile.am

@@ -28,7 +28,7 @@ bin_PROGRAMS = guestfish
 
 generator_built = \
 	cmds.c \
-	cmds_gperf.gperf \
+	cmds-gperf.gperf \
 	completion.c \
 	event-names.c \
 	fish-cmds.h \
@@ -39,7 +39,7 @@ generator_built = \
 
 BUILT_SOURCES = \
 	$(generator_built) \
-	cmds_gperf.c \
+	cmds-gperf.c \
 	rc_protocol.h \
 	rc_protocol.c
 
@@ -76,7 +76,7 @@ guestfish_SOURCES = \
 	$(generator_built) \
 	$(SHARED_SOURCE_FILES) \
 	alloc.c \
-	cmds_gperf.h \
+	cmds-gperf.h \
 	copy.c \
 	destpaths.c \
 	display.c \
@@ -92,11 +92,11 @@ guestfish_SOURCES = \
 	man.c \
 	more.c \
 	prep.c \
-	prep_disk.c \
-	prep_part.c \
-	prep_fs.c \
-	prep_lv.c \
-	prep_boot.c \
+	prep-disk.c \
+	prep-part.c \
+	prep-fs.c \
+	prep-lv.c \
+	prep-boot.c \
 	rc.c \
 	reopen.c \
 	setenv.c \
@@ -111,10 +111,10 @@ librc_protocol_la_CFLAGS = -Wall -Wno-unused -fno-strict-aliasing
 
 # Build the command lookup perfect hash code.  The generated code has
 # lots of warnings so we must compile it in a separate mini-library.
-libcmds_la_SOURCES = cmds_gperf.c
+libcmds_la_SOURCES = cmds-gperf.c
 libcmds_la_CFLAGS =
 
-cmds_gperf.c: cmds_gperf.gperf
+cmds-gperf.c: cmds-gperf.gperf
 	rm -f $@
 	$(GPERF) -t $< > $@-t
 	mv $@-t $@
@@ -246,7 +246,7 @@ TESTS += \
 	test-find0.sh \
 	test-glob.sh \
 	test-mount-local.sh \
-	test-read_file.sh \
+	test-read-file.sh \
 	test-remote.sh \
 	test-reopen.sh \
 	test-stringlist.sh \
@@ -264,7 +264,7 @@ EXTRA_DIST += \
 	test-find0.sh \
 	test-glob.sh \
 	test-mount-local.sh \
-	test-read_file.sh \
+	test-read-file.sh \
 	test-remote.sh \
 	test-reopen.sh \
 	test-stringlist.sh \

generator/generator_fish.ml

@@ -73,7 +73,7 @@ let generate_fish_cmds () =
   pr "#include \"fish.h\"\n";
   pr "#include \"fish-cmds.h\"\n";
   pr "#include \"options.h\"\n";
-  pr "#include \"cmds_gperf.h\"\n";
+  pr "#include \"cmds-gperf.h\"\n";
   pr "\n";
   pr "/* Valid suffixes allowed for numbers.  See Gnulib xstrtol function. */\n";
   pr "static const char *xstrtol_suffixes = \"0kKMGTPEZY\";\n";
@@ -684,7 +684,7 @@ and generate_fish_cmds_gperf () =
 #include <stdlib.h>
 #include <string.h>
 
-#include \"cmds_gperf.h\"
+#include \"cmds-gperf.h\"
 
 ";
 

generator/generator_main.ml

@@ -86,7 +86,7 @@ Run it from the top source directory using the command
   output_to "src/guestfs-structs.pod" generate_structs_pod;
   output_to "src/guestfs-actions.pod" generate_actions_pod;
   output_to "src/guestfs-availability.pod" generate_availability_pod;
-  output_to "src/errnostring_gperf.gperf" generate_errnostring_gperf;
+  output_to "src/errnostring-gperf.gperf" generate_errnostring_gperf;
   output_to "src/errnostring.c" generate_errnostring_c;
   output_to "src/errnostring.h" generate_errnostring_h;
   output_to "src/MAX_PROC_NR" generate_max_proc_nr;
@@ -97,7 +97,7 @@ Run it from the top source directory using the command
   output_to "daemon/optgroups.c" generate_daemon_optgroups_c;
   output_to "daemon/optgroups.h" generate_daemon_optgroups_h;
   output_to "tests/c-api/tests.c" generate_tests;
-  output_to "fish/cmds_gperf.gperf" generate_fish_cmds_gperf;
+  output_to "fish/cmds-gperf.gperf" generate_fish_cmds_gperf;
   output_to "fish/cmds.c" generate_fish_cmds;
   output_to "fish/completion.c" generate_fish_completion;
   output_to "fish/event-names.c" generate_fish_event_names;
@@ -108,7 +108,7 @@ Run it from the top source directory using the command
   output_to "fish/prepopts.h" generate_fish_prep_options_h;
   output_to "ocaml/guestfs.mli" generate_ocaml_mli;
   output_to "ocaml/guestfs.ml" generate_ocaml_ml;
-  output_to "ocaml/guestfs_c_actions.c" generate_ocaml_c;
+  output_to "ocaml/guestfs-c-actions.c" generate_ocaml_c;
   output_to "ocaml/bindtests.ml" generate_ocaml_bindtests;
   output_to "perl/Guestfs.xs" generate_perl_xs;
   output_to "perl/lib/Sys/Guestfs.pm" generate_perl_pm;

generator/generator_ocaml.ml

@@ -314,7 +314,7 @@ and generate_ocaml_c () =
 
 #include \"guestfs.h\"
 
-#include \"guestfs_c.h\"
+#include \"guestfs-c.h\"
 
 /* Copy a hashtable of string pairs into an assoc-list.  We return
  * the list in reverse order, but hashtables aren't supposed to be

ocaml/Makefile.am

@@ -26,13 +26,13 @@ include $(top_srcdir)/subdir-rules.mk
 generator_built = \
 	guestfs.mli \
 	guestfs.ml \
-	guestfs_c_actions.c \
+	guestfs-c-actions.c \
 	bindtests.ml
 
 EXTRA_DIST = \
 	$(generator_built) \
 	.depend \
-	guestfs_c.c guestfs_c.h \
+	guestfs-c.c guestfs-c.h \
 	html/.gitignore \
 	META.in \
 	run-bindtests \
@@ -68,7 +68,7 @@ libguestfsocaml_a_CFLAGS = \
 	-I$(top_srcdir)/src -I$(top_builddir)/src \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
 	-fPIC
-libguestfsocaml_a_SOURCES = guestfs_c.c guestfs_c_actions.c
+libguestfsocaml_a_SOURCES = guestfs-c.c guestfs-c-actions.c
 
 if HAVE_OCAMLDOC
 

ocaml/guestfs-c.c

@@ -33,7 +33,7 @@
 #include <caml/printexc.h>
 #include <caml/signals.h>
 
-#include "guestfs_c.h"
+#include "guestfs-c.h"
 
 static value **get_all_event_callbacks (guestfs_h *g, size_t *len_rtn);
 static void event_callback_wrapper (guestfs_h *g, void *data, uint64_t event, int event_handle, int flags, const char *buf, size_t buf_len, const uint64_t *array, size_t array_len);

po/POTFILES

@@ -24,9 +24,9 @@ daemon/dir.c
 daemon/dmesg.c
 daemon/dropcaches.c
 daemon/du.c
-daemon/echo_daemon.c
+daemon/echo-daemon.c
+daemon/errnostring-gperf.c
 daemon/errnostring.c
-daemon/errnostring_gperf.c
 daemon/ext2.c
 daemon/fallocate.c
 daemon/file.c
@@ -95,8 +95,8 @@ edit/virt-edit.c
 erlang/erl-guestfs-proto.c
 erlang/erl-guestfs.c
 fish/alloc.c
+fish/cmds-gperf.c
 fish/cmds.c
-fish/cmds_gperf.c
 fish/completion.c
 fish/config.c
 fish/copy.c
@@ -117,12 +117,12 @@ fish/lcd.c
 fish/man.c
 fish/more.c
 fish/options.c
+fish/prep-boot.c
+fish/prep-disk.c
+fish/prep-fs.c
+fish/prep-lv.c
+fish/prep-part.c
 fish/prep.c
-fish/prep_boot.c
-fish/prep_disk.c
-fish/prep_fs.c
-fish/prep_lv.c
-fish/prep_part.c
 fish/prepopts.c
 fish/progress.c
 fish/rc.c
@@ -178,8 +178,8 @@ gobject/src/struct-xfsinfo.c
 gobject/src/tristate.c
 inspector/virt-inspector.c
 java/com_redhat_et_libguestfs_GuestFS.c
-ocaml/guestfs_c.c
-ocaml/guestfs_c_actions.c
+ocaml/guestfs-c-actions.c
+ocaml/guestfs-c.c
 perl/Guestfs.c
 perl/bindtests.pl
 perl/lib/Sys/Guestfs.pm
@@ -188,26 +188,26 @@ php/extension/guestfs_php.c
 python/guestfs-py-byhand.c
 python/guestfs-py.c
 rescue/virt-rescue.c
-resize/progress_c.c
+resize/progress-c.c
 ruby/ext/guestfs/_guestfs.c
-sparsify/progress_c.c
+sparsify/progress-c.c
 src/actions.c
 src/appliance.c
 src/bindtests.c
 src/dbdump.c
+src/errnostring-gperf.c
 src/errnostring.c
-src/errnostring_gperf.c
 src/events.c
 src/filearch.c
 src/fuse.c
 src/guestfs.c
+src/inspect-apps.c
+src/inspect-fs-cd.c
+src/inspect-fs-unix.c
+src/inspect-fs-windows.c
+src/inspect-fs.c
+src/inspect-icon.c
 src/inspect.c
-src/inspect_apps.c
-src/inspect_fs.c
-src/inspect_fs_cd.c
-src/inspect_fs_unix.c
-src/inspect_fs_windows.c
-src/inspect_icon.c
 src/launch.c
 src/libvirtdomain.c
 src/listfs.c

resize/Makefile.am

@@ -32,7 +32,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img
 
 # Alphabetical order.
 SOURCES = \
-	progress_c.c \
+	progress-c.c \
 	progress.mli \
 	progress.ml \
 	resize.ml \
@@ -45,7 +45,7 @@ if HAVE_OCAML
 # Note this list must be in dependency order.
 OBJECTS = \
 	$(top_builddir)/fish/guestfish-progress.o \
-	progress_c.o \
+	progress-c.o \
 	resize_gettext.cmx \
 	utils.cmx \
 	progress.cmx \

sparsify/Makefile.am

@@ -32,7 +32,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img
 
 # Alphabetical order.
 SOURCES = \
-	progress_c.c \
+	progress-c.c \
 	progress.mli \
 	progress.ml \
 	sparsify.ml \
@@ -44,7 +44,7 @@ if HAVE_OCAML
 # Note this list must be in dependency order.
 OBJECTS = \
 	$(top_builddir)/fish/guestfish-progress.o \
-	progress_c.o \
+	progress-c.o \
 	sparsify_gettext.cmx \
 	utils.cmx \
 	progress.cmx \

src/Makefile.am

@@ -25,7 +25,7 @@ generator_built = \
 	guestfs-internal-actions.h \
 	actions.c \
 	bindtests.c \
-	errnostring_gperf.gperf \
+	errnostring-gperf.gperf \
 	errnostring.c \
 	errnostring.h \
 	guestfs-actions.pod \
@@ -37,7 +37,7 @@ BUILT_SOURCES = \
 	$(generator_built) \
 	guestfs_protocol.c \
 	guestfs_protocol.h \
-	errnostring_gperf.c
+	errnostring-gperf.c
 
 EXTRA_DIST = \
 	$(BUILT_SOURCES) \
@@ -62,12 +62,12 @@ libprotocol_la_CFLAGS = \
 # Build the errnostring perfect hash code.  The generated code has lots
 # of warnings so we must compile it in a separate mini-library.
 liberrnostring_la_SOURCES = \
-	errnostring_gperf.c \
+	errnostring-gperf.c \
 	errnostring.h \
 	errnostring.c
 liberrnostring_la_CFLAGS = $(GCC_VISIBILITY_HIDDEN)
 
-errnostring_gperf.c: errnostring_gperf.gperf
+errnostring-gperf.c: errnostring-gperf.gperf
 	rm -f $@
 	$(GPERF) -t $< > $@-t
 	mv $@-t $@
@@ -130,12 +130,12 @@ libguestfs_la_SOURCES = \
 	filearch.c \
 	fuse.c \
 	inspect.c \
-	inspect_apps.c \
-	inspect_fs.c \
-	inspect_fs_cd.c \
-	inspect_fs_unix.c \
-	inspect_fs_windows.c \
-	inspect_icon.c \
+	inspect-apps.c \
+	inspect-fs.c \
+	inspect-fs-cd.c \
+	inspect-fs-unix.c \
+	inspect-fs-windows.c \
+	inspect-icon.c \
 	launch.c \
 	libvirtdomain.c \
 	listfs.c \

tests/xml/Makefile.am

@@ -26,7 +26,7 @@ if HAVE_LIBVIRT
 # returned by libvirt.
 check_LTLIBRARIES = libfakevirtxml.la
 
-libfakevirtxml_la_SOURCES = fake_libvirt_xml.c
+libfakevirtxml_la_SOURCES = fake-libvirt-xml.c
 libfakevirtxml_la_CFLAGS = $(LIBVIRT_CFLAGS)
 # -version-info and -rpath force libtool to build a shared library.
 libfakevirtxml_la_LDFLAGS = -version-info 0:0:0 -rpath /nowhere