mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fish: Move 'feature_available' function to global.

Browse Source 
This is just code motion.
This commit is contained in:
Richard W.M. Jones
2012-05-02 15:34:02 +01:00
parent 29c5e052e4
commit 79bf966cea
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fish/edit.c
View File

@@ -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;
}

19
fish/fish.c
View File

@@ -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;
}

1
fish/fish.h
View File

@@ -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);