[Libguestfs] [PATCH 2/4] fish: Move 'feature_available' function to global.
From: "Richard W.M. Jones" <rjones(a)redhat.com>
This is just code motion.
---
fish/edit.c | 20 --------------------
fish/fish.c | 19 +++++++++++++++++++
fish/fish.h | 1 +
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/fish/edit.c b/fish/edit.c
index a411180..b26a2dd 100644
--- a/fish/edit.c
+++ b/fish/edit.c
@@ -33,7 +33,6 @@
static char *generate_random_name (const char *filename);
static int copy_attributes (const char *src, const char *dest);
-static int feature_available (guestfs_h *g, const char *feature);
/* guestfish edit command, suggested by Ján Ondrej, implemented by RWMJ */
@@ -242,22 +241,3 @@ copy_attributes (const char *src, const char *dest)
return 0;
}
-
-static int
-feature_available (guestfs_h *g, const char *feature)
-{
- /* If there's an error we should ignore it, so to do that we have to
- * temporarily replace the error handler with a null one.
- */
- guestfs_error_handler_cb old_error_cb;
- void *old_error_data;
- old_error_cb = guestfs_get_error_handler (g, &old_error_data);
- guestfs_set_error_handler (g, NULL, NULL);
-
- const char *groups[] = { feature, NULL };
- int r = guestfs_available (g, (char * const *) groups);
-
- guestfs_set_error_handler (g, old_error_cb, old_error_data);
-
- return r == 0 ? 1 : 0;
-}
diff --git a/fish/fish.c b/fish/fish.c
index 63fb30f..80b3364 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -1790,3 +1790,22 @@ progress_callback (guestfs_h *g, void *data,
progress_bar_set (bar, position, total);
}
+
+int
+feature_available (guestfs_h *g, const char *feature)
+{
+ /* If there's an error we should ignore it, so to do that we have to
+ * temporarily replace the error handler with a null one.
+ */
+ guestfs_error_handler_cb old_error_cb;
+ void *old_error_data;
+ old_error_cb = guestfs_get_error_handler (g, &old_error_data);
+ guestfs_set_error_handler (g, NULL, NULL);
+
+ const char *groups[] = { feature, NULL };
+ int r = guestfs_available (g, (char * const *) groups);
+
+ guestfs_set_error_handler (g, old_error_cb, old_error_data);
+
+ return r == 0 ? 1 : 0;
+}
diff --git a/fish/fish.h b/fish/fish.h
index 69a7640..cc4065a 100644
--- a/fish/fish.h
+++ b/fish/fish.h
@@ -76,6 +76,7 @@ extern void free_file_in (char *s);
extern char *file_out (const char *arg);
extern void extended_help_message (void);
extern void progress_callback (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);
+extern int feature_available (guestfs_h *g, const char *feature);
/* in cmds.c (auto-generated) */
extern void list_commands (void);
--
1.7.10