From bdbd9ad42fb40b307fef6856b446322b55c97946 Mon Sep 17 00:00:00 2001

From: "Richard W.M. Jones" <rjones@redhat.com>

Date: Sat, 14 Feb 2015 15:26:15 +0000

Subject: [PATCH] Change guestfs__* to guestfs_impl_*

libguestfs has used double and triple underscores in identifiers.

These aren't valid for global names in C++.

The second step is to replace all guestfs__* (2 underscores) with

guestfs_impl_*.

These functions are used where a libguestfs API call is implemented on

the library side.  The generator creates a wrapper function which

calls guestfs_impl_* to do the work.  (Libguestfs APIs which are

passed directly by the daemon work differently and don't require a

guestfs_impl_* function).

This is an entirely mechanical change done using:

  git ls-files | xargs perl -pi.bak -e 's/guestfs___/guestfs_impl_/g'

Reference: http://stackoverflow.com/a/228797

RHEL 7.2:

I did not cherry pick commit 1efd8aa8f1b5148ba8091e0df8be0b4afd6a596a.

for this.  Instead I ran the Perl command on the RHEL 7.2 tree.  Note

that the perl command in the original commit message above is wrong,

and should only contain two underscores.

---

 generator/bindtests.ml      | 10 +++---

 generator/c.ml              |  4 +--

 generator/types.ml          |  2 +-

 po-docs/ja.po               |  2 +-

 po-docs/libguestfs-docs.pot |  2 +-

 po-docs/uk.po               |  2 +-

 src/canonical-name.c        |  2 +-

 src/create.c                |  2 +-

 src/drives.c                | 18 +++++-----

 src/file.c                  | 26 +++++++-------

 src/filearch.c              |  4 +--

 src/fuse.c                  | 12 +++----

 src/guestfs.pod             |  2 +-

 src/handle.c                | 86 ++++++++++++++++++++++-----------------------

 src/info.c                  |  6 ++--

 src/inspect-apps.c          |  4 +--

 src/inspect-fs-windows.c    |  2 +-

 src/inspect-icon.c          |  2 +-

 src/inspect.c               | 42 +++++++++++-----------

 src/journal.c               |  2 +-

 src/launch.c                | 22 ++++++------

 src/libvirt-auth.c          | 24 ++++++-------

 src/libvirt-domain.c        |  4 +--

 src/listfs.c                |  2 +-

 src/tmpdirs.c               |  8 ++---

 25 files changed, 146 insertions(+), 146 deletions(-)

diff --git a/generator/bindtests.ml b/generator/bindtests.ml

index cad123e..0d2fea9 100644

--- a/generator/bindtests.ml

+++ b/generator/bindtests.ml

@@ -46,7 +46,7 @@ let rec generate_bindtests () =

 #include \"guestfs_protocol.h\"

 int

-guestfs__internal_test_set_output (guestfs_h *g, const char *filename)

+guestfs_impl_internal_test_set_output (guestfs_h *g, const char *filename)

 {

   FILE *fp;

@@ -67,7 +67,7 @@ guestfs__internal_test_set_output (guestfs_h *g, const char *filename)

 }

 int

-guestfs__internal_test_close_output (guestfs_h *g)

+guestfs_impl_internal_test_close_output (guestfs_h *g)

 {

   if (g->test_fp != NULL) {

     if (fclose (g->test_fp) == EOF) {

@@ -141,7 +141,7 @@ fill_lvm_pv (guestfs_h *g, struct guestfs_lvm_pv *pv, size_t i)

       pr " */\n";

       generate_prototype ~extern:false ~semicolon:false ~newline:true

-        ~handle:"g" ~prefix:"guestfs__" ~optarg_proto:Argv name style;

+        ~handle:"g" ~prefix:"guestfs_impl_" ~optarg_proto:Argv name style;

       pr "{\n";

       pr "  FILE *fp = get_fp (g);\n";

       pr "\n";

@@ -215,7 +215,7 @@ fill_lvm_pv (guestfs_h *g, struct guestfs_lvm_pv *pv, size_t i)

       if String.sub name (String.length name - 3) 3 <> "err" then (

         pr "/* Test normal return. */\n";

         generate_prototype ~extern:false ~semicolon:false ~newline:true

-          ~handle:"g" ~prefix:"guestfs__" name style;

+          ~handle:"g" ~prefix:"guestfs_impl_" name style;

         pr "{\n";

         (match ret with

          | RErr ->

@@ -302,7 +302,7 @@ fill_lvm_pv (guestfs_h *g, struct guestfs_lvm_pv *pv, size_t i)

       ) else (

         pr "/* Test error return. */\n";

         generate_prototype ~extern:false ~semicolon:false ~newline:true

-          ~handle:"g" ~prefix:"guestfs__" name style;

+          ~handle:"g" ~prefix:"guestfs_impl_" name style;

         pr "{\n";

         pr "  error (g, \"error\");\n";

         (match ret with

diff --git a/generator/c.ml b/generator/c.ml

index 9b3bbce..966e28a 100644

--- a/generator/c.ml

+++ b/generator/c.ml

@@ -791,7 +791,7 @@ and generate_internal_actions_h () =

   List.iter (

     fun { c_name = c_name; style = style } ->

       generate_prototype ~single_line:true ~newline:true ~handle:"g"

-        ~prefix:"guestfs__" ~optarg_proto:Argv

+        ~prefix:"guestfs_impl_" ~optarg_proto:Argv

         c_name style

   ) non_daemon_functions;

@@ -1602,7 +1602,7 @@ and generate_client_actions hash () =

     reject_unknown_optargs c_name style;

     check_args_validity c_name style;

     trace_call name c_name style;

-    pr "  r = guestfs__%s " c_name;

+    pr "  r = guestfs_impl_%s " c_name;

     generate_c_call_args ~handle:"g" ~implicit_size_ptr:"size_r" style;

     pr ";\n";

     pr "\n";

diff --git a/generator/types.ml b/generator/types.ml

index 0c189bc..3ae1d47 100644

--- a/generator/types.ml

+++ b/generator/types.ml

@@ -361,7 +361,7 @@ type action = {

                                      machinery in various bindings. *)

   wrapper : bool;                 (* For non-daemon functions, generate a

                                      wrapper which calls the underlying

-                                     guestfs__<name> function.  The wrapper

+                                     guestfs_impl_<name> function.  The wrapper

                                      checks arguments and deals with trace

                                      messages.  Set this to false for functions

                                      that have to be thread-safe. *)

diff --git a/po-docs/ja.po b/po-docs/ja.po

index c7d67a0..f8e843a 100644

--- a/po-docs/ja.po

+++ b/po-docs/ja.po

@@ -84843,7 +84843,7 @@ msgstr ""

 #. type: textblock

 #: ../src/guestfs.pod:3924

 msgid ""

-"For library actions, implement the function C<guestfs__E<lt>nameE<gt>> "

+"For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>> "

 "(note: double underscore) in the C<src/> directory."

 msgstr ""

diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot

index 1f1fb8c..50dbcff 100644

--- a/po-docs/libguestfs-docs.pot

+++ b/po-docs/libguestfs-docs.pot

@@ -75978,7 +75978,7 @@ msgstr ""

 #. type: textblock

 #: ../src/guestfs.pod:3924

 msgid ""

-"For library actions, implement the function C<guestfs__E<lt>nameE<gt>> "

+"For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>> "

 "(note: double underscore) in the C<src/> directory."

 msgstr ""

diff --git a/po-docs/uk.po b/po-docs/uk.po

index ab16832..9f725a2 100644

--- a/po-docs/uk.po

+++ b/po-docs/uk.po

@@ -84270,7 +84270,7 @@ msgstr ""

 #. type: textblock

 #: ../src/guestfs.pod:3924

 msgid ""

-"For library actions, implement the function C<guestfs__E<lt>nameE<gt>> "

+"For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>> "

 "(note: double underscore) in the C<src/> directory."

 msgstr ""

diff --git a/src/canonical-name.c b/src/canonical-name.c

index 6aa39e4..687b559 100644

--- a/src/canonical-name.c

+++ b/src/canonical-name.c

@@ -27,7 +27,7 @@

 #include "guestfs-internal-actions.h"

 char *

-guestfs__canonical_device_name (guestfs_h *g, const char *device)

+guestfs_impl_canonical_device_name (guestfs_h *g, const char *device)

 {

   char *ret;

   size_t len;

diff --git a/src/create.c b/src/create.c

index f438bdc..4e619c0 100644

--- a/src/create.c

+++ b/src/create.c

@@ -44,7 +44,7 @@ static int disk_create_qcow2 (guestfs_h *g, const char *filename, int64_t size,

 static char *qemu_escape_param (guestfs_h *g, const char *param);

 int

-guestfs__disk_create (guestfs_h *g, const char *filename,

+guestfs_impl_disk_create (guestfs_h *g, const char *filename,

                       const char *format, int64_t size,

                       const struct guestfs_disk_create_argv *optargs)

 {

diff --git a/src/drives.c b/src/drives.c

index 356293e..b2ec7e0 100644

--- a/src/drives.c

+++ b/src/drives.c

@@ -770,7 +770,7 @@ parse_servers (guestfs_h *g, char *const *strs,

 }

 int

-guestfs__add_drive_opts (guestfs_h *g, const char *filename,

+guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,

                          const struct guestfs_add_drive_opts_argv *optargs)

 {

   struct drive_create_data data;

@@ -988,7 +988,7 @@ guestfs__add_drive_opts (guestfs_h *g, const char *filename,

 }

 int

-guestfs__add_drive_ro (guestfs_h *g, const char *filename)

+guestfs_impl_add_drive_ro (guestfs_h *g, const char *filename)

 {

   const struct guestfs_add_drive_opts_argv optargs = {

     .bitmask = GUESTFS_ADD_DRIVE_OPTS_READONLY_BITMASK,

@@ -999,7 +999,7 @@ guestfs__add_drive_ro (guestfs_h *g, const char *filename)

 }

 int

-guestfs__add_drive_with_if (guestfs_h *g, const char *filename,

+guestfs_impl_add_drive_with_if (guestfs_h *g, const char *filename,

                             const char *iface)

 {

   const struct guestfs_add_drive_opts_argv optargs = {

@@ -1011,7 +1011,7 @@ guestfs__add_drive_with_if (guestfs_h *g, const char *filename,

 }

 int

-guestfs__add_drive_ro_with_if (guestfs_h *g, const char *filename,

+guestfs_impl_add_drive_ro_with_if (guestfs_h *g, const char *filename,

                                const char *iface)

 {

   const struct guestfs_add_drive_opts_argv optargs = {

@@ -1025,7 +1025,7 @@ guestfs__add_drive_ro_with_if (guestfs_h *g, const char *filename,

 }

 int

-guestfs__add_drive_scratch (guestfs_h *g, int64_t size,

+guestfs_impl_add_drive_scratch (guestfs_h *g, int64_t size,

                             const struct guestfs_add_drive_scratch_argv *optargs)

 {

   struct guestfs_add_drive_opts_argv add_drive_optargs = { .bitmask = 0 };

@@ -1064,9 +1064,9 @@ guestfs__add_drive_scratch (guestfs_h *g, int64_t size,

 }

 int

-guestfs__add_cdrom (guestfs_h *g, const char *filename)

+guestfs_impl_add_cdrom (guestfs_h *g, const char *filename)

 {

-  return guestfs__add_drive_ro (g, filename);

+  return guestfs_impl_add_drive_ro (g, filename);

 }

 /* Depending on whether we are hotplugging or not, this function

@@ -1077,7 +1077,7 @@ guestfs__add_cdrom (guestfs_h *g, const char *filename)

  * (NULL) slot in the g->drives vector.

  */

 int

-guestfs__remove_drive (guestfs_h *g, const char *label)

+guestfs_impl_remove_drive (guestfs_h *g, const char *label)

 {

   size_t i;

   struct drive *drv;

@@ -1146,7 +1146,7 @@ guestfs_int_rollback_drives (guestfs_h *g, size_t old_i)

 /* Internal command to return the list of drives. */

 char **

-guestfs__debug_drives (guestfs_h *g)

+guestfs_impl_debug_drives (guestfs_h *g)

 {

   size_t i;

   DECLARE_STRINGSBUF (ret);

diff --git a/src/file.c b/src/file.c

index 854e7cc..417c084 100644

--- a/src/file.c

+++ b/src/file.c

@@ -72,7 +72,7 @@ take_strings (guestfs_h *g, char *const *names, size_t n, char *const **lastp)

 }

 char *

-guestfs__cat (guestfs_h *g, const char *path)

+guestfs_impl_cat (guestfs_h *g, const char *path)

 {

   size_t size;

@@ -80,7 +80,7 @@ guestfs__cat (guestfs_h *g, const char *path)

 }

 char *

-guestfs__read_file (guestfs_h *g, const char *path, size_t *size_r)

+guestfs_impl_read_file (guestfs_h *g, const char *path, size_t *size_r)

 {

   int fd = -1;

   size_t size;

@@ -142,7 +142,7 @@ guestfs__read_file (guestfs_h *g, const char *path, size_t *size_r)

 }

 char **

-guestfs__read_lines (guestfs_h *g, const char *file)

+guestfs_impl_read_lines (guestfs_h *g, const char *file)

 {

   size_t i, count, size, len;

   CLEANUP_FREE char *buf = NULL;

@@ -206,7 +206,7 @@ guestfs__read_lines (guestfs_h *g, const char *file)

 }

 char **

-guestfs__find (guestfs_h *g, const char *directory)

+guestfs_impl_find (guestfs_h *g, const char *directory)

 {

   int fd = -1;

   struct stat statbuf;

@@ -364,14 +364,14 @@ write_or_append (guestfs_h *g, const char *path,

 }

 int

-guestfs__write (guestfs_h *g, const char *path,

+guestfs_impl_write (guestfs_h *g, const char *path,

                 const char *content, size_t size)

 {

   return write_or_append (g, path, content, size, 0);

 }

 int

-guestfs__write_append (guestfs_h *g, const char *path,

+guestfs_impl_write_append (guestfs_h *g, const char *path,

                        const char *content, size_t size)

 {

   return write_or_append (g, path, content, size, 1);

@@ -380,7 +380,7 @@ guestfs__write_append (guestfs_h *g, const char *path,

 #define LSTATNSLIST_MAX 1000

 struct guestfs_statns_list *

-guestfs__lstatnslist (guestfs_h *g, const char *dir, char * const*names)

+guestfs_impl_lstatnslist (guestfs_h *g, const char *dir, char * const*names)

 {

   size_t len = guestfs_int_count_strings (names);

   size_t old_len;

@@ -422,7 +422,7 @@ guestfs__lstatnslist (guestfs_h *g, const char *dir, char * const*names)

 #define LXATTRLIST_MAX 1000

 struct guestfs_xattr_list *

-guestfs__lxattrlist (guestfs_h *g, const char *dir, char *const *names)

+guestfs_impl_lxattrlist (guestfs_h *g, const char *dir, char *const *names)

 {

   size_t len = guestfs_int_count_strings (names);

   size_t i, old_len;

@@ -470,7 +470,7 @@ guestfs__lxattrlist (guestfs_h *g, const char *dir, char *const *names)

 #define READLINK_MAX 1000

 char **

-guestfs__readlinklist (guestfs_h *g, const char *dir, char *const *names)

+guestfs_impl_readlinklist (guestfs_h *g, const char *dir, char *const *names)

 {

   size_t len = guestfs_int_count_strings (names);

   size_t old_len, ret_len = 0;

@@ -508,7 +508,7 @@ guestfs__readlinklist (guestfs_h *g, const char *dir, char *const *names)

 }

 char **

-guestfs__ls (guestfs_h *g, const char *directory)

+guestfs_impl_ls (guestfs_h *g, const char *directory)

 {

   int fd = -1;

   struct stat statbuf;

@@ -622,7 +622,7 @@ statns_to_old_stat (struct guestfs_statns *a, struct guestfs_stat *r)

 }

 struct guestfs_stat *

-guestfs__stat (guestfs_h *g, const char *path)

+guestfs_impl_stat (guestfs_h *g, const char *path)

 {

   CLEANUP_FREE_STATNS struct guestfs_statns *r;

   struct guestfs_stat *ret;

@@ -637,7 +637,7 @@ guestfs__stat (guestfs_h *g, const char *path)

 }

 struct guestfs_stat *

-guestfs__lstat (guestfs_h *g, const char *path)

+guestfs_impl_lstat (guestfs_h *g, const char *path)

 {

   CLEANUP_FREE_STATNS struct guestfs_statns *r;

   struct guestfs_stat *ret;

@@ -652,7 +652,7 @@ guestfs__lstat (guestfs_h *g, const char *path)

 }

 struct guestfs_stat_list *

-guestfs__lstatlist (guestfs_h *g, const char *dir, char * const*names)

+guestfs_impl_lstatlist (guestfs_h *g, const char *dir, char * const*names)

 {

   CLEANUP_FREE_STATNS_LIST struct guestfs_statns_list *r;

   struct guestfs_stat_list *ret;

diff --git a/src/filearch.c b/src/filearch.c

index 7591ff8..fdc818d 100644

--- a/src/filearch.c

+++ b/src/filearch.c

@@ -339,7 +339,7 @@ compressed_file_arch (guestfs_h *g, const char *path, const char *method)

 }

 char *

-guestfs__file_architecture (guestfs_h *g, const char *path)

+guestfs_impl_file_architecture (guestfs_h *g, const char *path)

 {

   CLEANUP_FREE char *file = NULL;

   CLEANUP_FREE char *elf_arch = NULL;

@@ -379,7 +379,7 @@ guestfs__file_architecture (guestfs_h *g, const char *path)

   return r

 char *

-guestfs__file_architecture (guestfs_h *g, const char *path)

+guestfs_impl_file_architecture (guestfs_h *g, const char *path)

 {

   NOT_IMPL(NULL);

 }

diff --git a/src/fuse.c b/src/fuse.c

index f8d148b..4ff7315 100644

--- a/src/fuse.c

+++ b/src/fuse.c

@@ -952,7 +952,7 @@ static struct fuse_operations mount_local_operations = {

 };

 int

-guestfs__mount_local (guestfs_h *g, const char *localmountpoint,

+guestfs_impl_mount_local (guestfs_h *g, const char *localmountpoint,

                       const struct guestfs_mount_local_argv *optargs)

 {

   const char *t;

@@ -1045,7 +1045,7 @@ guestfs__mount_local (guestfs_h *g, const char *localmountpoint,

 }

 int

-guestfs__mount_local_run (guestfs_h *g)

+guestfs_impl_mount_local_run (guestfs_h *g)

 {

   int r, mounted;

@@ -1100,7 +1100,7 @@ guestfs_int_free_fuse (guestfs_h *g)

 }

 int

-guestfs__umount_local (guestfs_h *g,

+guestfs_impl_umount_local (guestfs_h *g,

                        const struct guestfs_umount_local_argv *optargs)

 {

   const char *retry;

@@ -1503,20 +1503,20 @@ dir_cache_invalidate (guestfs_h *g, const char *path)

                           "when libguestfs was compiled"))

 int

-guestfs__mount_local (guestfs_h *g, const char *localmountpoint,

+guestfs_impl_mount_local (guestfs_h *g, const char *localmountpoint,

                       const struct guestfs_mount_local_argv *optargs)

 {

   FUSE_NOT_SUPPORTED ();

 }

 int

-guestfs__mount_local_run (guestfs_h *g)

+guestfs_impl_mount_local_run (guestfs_h *g)

 {

   FUSE_NOT_SUPPORTED ();

 }

 int

-guestfs__umount_local (guestfs_h *g,

+guestfs_impl_umount_local (guestfs_h *g,

                        const struct guestfs_umount_local_argv *optargs)

 {

   FUSE_NOT_SUPPORTED ();

diff --git a/src/guestfs.pod b/src/guestfs.pod

index 81347f3..7b7a7c0 100644

--- a/src/guestfs.pod

+++ b/src/guestfs.pod

@@ -3811,7 +3811,7 @@ Implement the action (in C):

 For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the

 C<daemon/> directory.

-For library actions, implement the function C<guestfs__E<lt>nameE<gt>>

+For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>>

 (note: double underscore) in the C<src/> directory.

 In either case, use another function as an example of what to do.

diff --git a/src/handle.c b/src/handle.c

index b712e21..5dc0992 100644

--- a/src/handle.c

+++ b/src/handle.c

@@ -284,7 +284,7 @@ call_getenv (const void *data, const char *name)

 }

 int

-guestfs__parse_environment (guestfs_h *g)

+guestfs_impl_parse_environment (guestfs_h *g)

 {

   return parse_environment (g, call_getenv, NULL);

 }

@@ -303,7 +303,7 @@ getenv_from_strings (const void *stringsv, const char *name)

 }

 int

-guestfs__parse_environment_list (guestfs_h *g, char * const *strings)

+guestfs_impl_parse_environment_list (guestfs_h *g, char * const *strings)

 {

   return parse_environment (g, getenv_from_strings, strings);

 }

@@ -393,7 +393,7 @@ guestfs_close (guestfs_h *g)

 }

 int

-guestfs__shutdown (guestfs_h *g)

+guestfs_impl_shutdown (guestfs_h *g)

 {

   return shutdown_backend (g, 1);

 }

@@ -459,33 +459,33 @@ close_handles (void)

 }

 int

-guestfs__set_verbose (guestfs_h *g, int v)

+guestfs_impl_set_verbose (guestfs_h *g, int v)

 {

   g->verbose = !!v;

   return 0;

 }

 int

-guestfs__get_verbose (guestfs_h *g)

+guestfs_impl_get_verbose (guestfs_h *g)

 {

   return g->verbose;

 }

 int

-guestfs__set_autosync (guestfs_h *g, int a)

+guestfs_impl_set_autosync (guestfs_h *g, int a)

 {

   g->autosync = !!a;

   return 0;

 }

 int

-guestfs__get_autosync (guestfs_h *g)

+guestfs_impl_get_autosync (guestfs_h *g)

 {

   return g->autosync;

 }

 int

-guestfs__set_path (guestfs_h *g, const char *path)

+guestfs_impl_set_path (guestfs_h *g, const char *path)

 {

   free (g->path);

   g->path = NULL;

@@ -497,13 +497,13 @@ guestfs__set_path (guestfs_h *g, const char *path)

 }

 const char *

-guestfs__get_path (guestfs_h *g)

+guestfs_impl_get_path (guestfs_h *g)

 {

   return g->path;

 }

 int

-guestfs__set_qemu (guestfs_h *g, const char *qemu)

+guestfs_impl_set_qemu (guestfs_h *g, const char *qemu)

 {

   char *new_hv;

@@ -529,13 +529,13 @@ guestfs__set_qemu (guestfs_h *g, const char *qemu)

 }

 const char *

-guestfs__get_qemu (guestfs_h *g)

+guestfs_impl_get_qemu (guestfs_h *g)

 {

   return g->hv;

 }

 int

-guestfs__set_hv (guestfs_h *g, const char *hv)

+guestfs_impl_set_hv (guestfs_h *g, const char *hv)

 {

   free (g->hv);

   g->hv = safe_strdup (g, hv);

@@ -543,13 +543,13 @@ guestfs__set_hv (guestfs_h *g, const char *hv)

 }

 char *

-guestfs__get_hv (guestfs_h *g)

+guestfs_impl_get_hv (guestfs_h *g)

 {

   return safe_strdup (g, g->hv);

 }

 int

-guestfs__set_append (guestfs_h *g, const char *append)

+guestfs_impl_set_append (guestfs_h *g, const char *append)

 {

   free (g->append);

   g->append = NULL;

@@ -559,13 +559,13 @@ guestfs__set_append (guestfs_h *g, const char *append)

 }

 const char *

-guestfs__get_append (guestfs_h *g)

+guestfs_impl_get_append (guestfs_h *g)

 {

   return g->append;

 }

 int

-guestfs__set_memsize (guestfs_h *g, int memsize)

+guestfs_impl_set_memsize (guestfs_h *g, int memsize)

 {

   if (memsize < MIN_MEMSIZE) {

     error (g, _("too small value for memsize (must be at least %d)"), MIN_MEMSIZE);

@@ -576,26 +576,26 @@ guestfs__set_memsize (guestfs_h *g, int memsize)

 }

 int

-guestfs__get_memsize (guestfs_h *g)

+guestfs_impl_get_memsize (guestfs_h *g)

 {

   return g->memsize;

 }

 int

-guestfs__set_selinux (guestfs_h *g, int selinux)

+guestfs_impl_set_selinux (guestfs_h *g, int selinux)

 {

   g->selinux = selinux;

   return 0;

 }

 int

-guestfs__get_selinux (guestfs_h *g)

+guestfs_impl_get_selinux (guestfs_h *g)

 {

   return g->selinux;

 }

 struct guestfs_version *

-guestfs__version (guestfs_h *g)

+guestfs_impl_version (guestfs_h *g)

 {

   struct guestfs_version *r;

@@ -608,59 +608,59 @@ guestfs__version (guestfs_h *g)

 }

 int

-guestfs__set_trace (guestfs_h *g, int t)

+guestfs_impl_set_trace (guestfs_h *g, int t)

 {

   g->trace = !!t;

   return 0;

 }

 int

-guestfs__get_trace (guestfs_h *g)

+guestfs_impl_get_trace (guestfs_h *g)

 {

   return g->trace;

 }

 int

-guestfs__set_direct (guestfs_h *g, int d)

+guestfs_impl_set_direct (guestfs_h *g, int d)

 {

   g->direct_mode = !!d;

   return 0;

 }

 int

-guestfs__get_direct (guestfs_h *g)

+guestfs_impl_get_direct (guestfs_h *g)

 {

   return g->direct_mode;

 }

 int

-guestfs__set_recovery_proc (guestfs_h *g, int f)

+guestfs_impl_set_recovery_proc (guestfs_h *g, int f)

 {

   g->recovery_proc = !!f;

   return 0;

 }

 int

-guestfs__get_recovery_proc (guestfs_h *g)

+guestfs_impl_get_recovery_proc (guestfs_h *g)

 {

   return g->recovery_proc;

 }

 int

-guestfs__set_network (guestfs_h *g, int v)

+guestfs_impl_set_network (guestfs_h *g, int v)

 {

   g->enable_network = !!v;

   return 0;

 }

 int

-guestfs__get_network (guestfs_h *g)

+guestfs_impl_get_network (guestfs_h *g)

 {