From 0f3489ba6b80cfdd90230d66f58a49c9738b8fad Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 17 Dec 2013 21:28:49 +0000
Subject: [PATCH] lib: Rename cleanup-structs.c -> structs-cleanup.c and
 free-structs.c -> structs-free.c.

Just renaming generated files, no other effects.
---
 .gitignore        |  4 ++--
 generator/c.ml    |  4 ++--
 generator/main.ml |  4 ++--
 po/POTFILES       |  4 ++--
 src/Makefile.am   | 10 +++++-----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index b967dbddf..6969ba65d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -394,13 +394,11 @@ Makefile.in
 /src/actions-?.c
 /src/actions-variants.c
 /src/bindtests.c
-/src/cleanup-structs.c
 /src/errnostring.c
 /src/errnostring-gperf.c
 /src/errnostring-gperf.gperf
 /src/errnostring.h
 /src/event-string.c
-/src/free-structs.c
 /src/guestfs.3
 /src/guestfs-actions.pod
 /src/guestfs-availability.pod
@@ -415,6 +413,8 @@ Makefile.in
 /src/libguestfs.syms
 /src/.libs/libguestfs.so
 /src/stamp-guestfs.pod
+/src/structs-cleanup.c
+/src/structs-free.c
 /stamp-guestfs-release-notes.pod
 /stamp-h1
 /sysprep/.depend
diff --git a/generator/c.ml b/generator/c.ml
index cf9fe38e5..3000b0f9c 100644
--- a/generator/c.ml
+++ b/generator/c.ml
@@ -830,7 +830,7 @@ and generate_internal_frontend_cleanups_h () =
   pr "#endif /* GUESTFS_INTERNAL_FRONTEND_CLEANUPS_H_ */\n"
 
 (* Functions to free structures. *)
-and generate_client_free_structs () =
+and generate_client_structs_free () =
   generate_header CStyle LGPLv2plus;
 
   pr "\
@@ -877,7 +877,7 @@ and generate_client_free_structs () =
   ) structs
 
 (* Functions to free structures used by the CLEANUP_* macros. *)
-and generate_client_cleanup_structs () =
+and generate_client_structs_cleanup () =
   generate_header CStyle LGPLv2plus;
 
   pr "\
diff --git a/generator/main.ml b/generator/main.ml
index 830461b09..0c6ac8493 100644
--- a/generator/main.ml
+++ b/generator/main.ml
@@ -98,8 +98,8 @@ Run it from the top source directory using the command
   output_to "src/MAX_PROC_NR" generate_max_proc_nr;
   output_to "src/libguestfs.syms" generate_linker_script;
 
-  output_to "src/free-structs.c" generate_client_free_structs;
-  output_to "src/cleanup-structs.c" generate_client_cleanup_structs;
+  output_to "src/structs-free.c" generate_client_structs_free;
+  output_to "src/structs-cleanup.c" generate_client_structs_cleanup;
   output_to "src/actions-variants.c" generate_client_actions_variants;
 
   for i = 0 to nr_actions_files-1 do
diff --git a/po/POTFILES b/po/POTFILES
index 4bf805f7b..cd9ce3913 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -261,7 +261,6 @@ src/alloc.c
 src/appliance.c
 src/bindtests.c
 src/canonical-name.c
-src/cleanup-structs.c
 src/cleanup.c
 src/command.c
 src/conn-socket.c
@@ -274,7 +273,6 @@ src/event-string.c
 src/events.c
 src/file.c
 src/filearch.c
-src/free-structs.c
 src/fuse.c
 src/handle.c
 src/info.c
@@ -300,6 +298,8 @@ src/osinfo.c
 src/private-data.c
 src/proto.c
 src/stringsbuf.c
+src/structs-cleanup.c
+src/structs-free.c
 src/tmpdirs.c
 src/utils.c
 test-tool/test-tool.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 578cb0d4a..4362d6edc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,16 +33,16 @@ generator_built = \
 	actions-6.c \
 	actions-variants.c \
 	bindtests.c \
-	cleanup-structs.c \
 	errnostring-gperf.gperf \
 	errnostring.c \
 	errnostring.h \
 	event-string.c \
-	free-structs.c \
 	guestfs-actions.pod \
 	guestfs-availability.pod \
 	guestfs-structs.pod \
-	libguestfs.syms
+	libguestfs.syms \
+	structs-cleanup.c \
+	structs-free.c
 
 BUILT_SOURCES = \
 	$(generator_built) \
@@ -93,7 +93,6 @@ libguestfs_la_SOURCES = \
 	events.c \
 	file.c \
 	filearch.c \
-	free-structs.c \
 	fuse.c \
 	handle.c \
 	info.c \
@@ -119,6 +118,7 @@ libguestfs_la_SOURCES = \
 	private-data.c \
 	proto.c \
 	stringsbuf.c \
+	structs-free.c \
 	tmpdirs.c \
 	libguestfs.syms
 
@@ -217,7 +217,7 @@ endif
 # included in tools and bindings.
 libutils_la_SOURCES = \
 	cleanup.c \
-	cleanup-structs.c \
+	structs-cleanup.c \
 	utils.c
 libutils_la_CPPFLAGS = $(libguestfs_la_CPPFLAGS)
 libutils_la_CFLAGS = $(libguestfs_la_CFLAGS)