Rename guestfs-{actions,bindtests}.c to {actions,bindtests}.c

Rename these two generated files, in preparation for splitting
up the main src/guestfs.c file.

diff --git a/.gitignore b/.gitignore
index 5583737..094acb3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -211,9 +211,9 @@ ruby/ext/guestfs/_guestfs.c
 ruby/ext/guestfs/_guestfs.so
 ruby/ext/guestfs/mkmf.log
 ruby/Rakefile
 ruby/ext/guestfs/_guestfs.so
 ruby/ext/guestfs/mkmf.log
 ruby/Rakefile

-src/guestfs-actions.c
+src/actions.c
+src/bindtests.c

 src/guestfs-actions.h
 src/guestfs-actions.h

-src/guestfs-bindtests.c

 src/guestfs-internal-actions.h
 src/guestfs_protocol.c
 src/guestfs_protocol.h
 src/guestfs-internal-actions.h
 src/guestfs_protocol.c
 src/guestfs_protocol.h

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4a27d87..519d7c3 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -99,8 +99,8 @@ regressions/rhbz501893.c
 regressions/test-lvm-mapping.pl
 regressions/test-noexec-stack.pl
 ruby/ext/guestfs/_guestfs.c
 regressions/test-lvm-mapping.pl
 regressions/test-noexec-stack.pl
 ruby/ext/guestfs/_guestfs.c

-src/guestfs-actions.c
-src/guestfs-bindtests.c
+src/actions.c
+src/bindtests.c

 src/guestfs.c
 test-tool/helper.c
 test-tool/test-tool.c
 src/guestfs.c
 test-tool/helper.c
 test-tool/test-tool.c

diff --git a/src/Makefile.am b/src/Makefile.am
index ad3b478..0776c65 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,8 +22,8 @@ generator_built = \
        guestfs-structs.h \
        guestfs-actions.h \
        guestfs-internal-actions.h \
        guestfs-structs.h \
        guestfs-actions.h \
        guestfs-internal-actions.h \

-       guestfs-actions.c \
-       guestfs-bindtests.c \
+       actions.c \
+       bindtests.c \

        guestfs-actions.pod \
        guestfs-availability.pod \
        guestfs-structs.pod \
        guestfs-actions.pod \
        guestfs-availability.pod \
        guestfs-structs.pod \


@@ -121,11 +121,11 @@ libguestfs_la_SOURCES = \
        guestfs.c \
        guestfs.h \
        guestfs-actions.h \
        guestfs.c \
        guestfs.h \
        guestfs-actions.h \

-       guestfs-actions.c \
-       guestfs-bindtests.c \

        guestfs-internal.h \
        guestfs_protocol.h \
        gettext.h \
        guestfs-internal.h \
        guestfs_protocol.h \
        gettext.h \

+       actions.c \
+       bindtests.c \

        libguestfs.syms
 
 libguestfs_la_LIBADD = $(LTLIBTHREAD) ../gnulib/lib/libgnu.la
        libguestfs.syms
 
 libguestfs_la_LIBADD = $(LTLIBTHREAD) ../gnulib/lib/libgnu.la

diff --git a/src/generator.ml b/src/generator.ml
index ccbc13d..d537945 100755 (executable)
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -12353,8 +12353,8 @@ Run it from the top source directory using the command
   output_to "src/guestfs-structs.h" generate_structs_h;
   output_to "src/guestfs-actions.h" generate_actions_h;
   output_to "src/guestfs-internal-actions.h" generate_internal_actions_h;
   output_to "src/guestfs-structs.h" generate_structs_h;
   output_to "src/guestfs-actions.h" generate_actions_h;
   output_to "src/guestfs-internal-actions.h" generate_internal_actions_h;

-  output_to "src/guestfs-actions.c" generate_client_actions;
-  output_to "src/guestfs-bindtests.c" generate_bindtests;
+  output_to "src/actions.c" generate_client_actions;
+  output_to "src/bindtests.c" generate_bindtests;

   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/guestfs-structs.pod" generate_structs_pod;
   output_to "src/guestfs-actions.pod" generate_actions_pod;
   output_to "src/guestfs-availability.pod" generate_availability_pod;

diff --git a/src/guestfs.c b/src/guestfs.c
index 764f729..778eebc 100644 (file)
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -1943,7 +1943,7 @@ guestfs_set_close_callback (guestfs_h *g,
 
 /* This is the code used to send and receive RPC messages and (for
  * certain types of message) to perform file transfers.  This code is
 
 /* This is the code used to send and receive RPC messages and (for
  * certain types of message) to perform file transfers.  This code is

- * driven from the generated actions (src/guestfs-actions.c).  There
+ * driven from the generated actions (src/actions.c).  There

  * are five different cases to consider:
  *
  * (1) A non-daemon function.  There is no RPC involved at all, it's
  * are five different cases to consider:
  *
  * (1) A non-daemon function.  There is no RPC involved at all, it's