diff options
| author | Richard Jones <rjones@redhat.com> | 2010-05-08 09:25:32 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2010-05-08 09:25:32 +0100 |
| commit | bece54704bb081339a87233bbc5401f2892467be (patch) | |
| tree | 20f2adb4e3b26e8b24d4ccb4c824e20538d293c9 /fish/fish.c | |
| parent | a96d70113ffcd01f55262c3d0fbe711bee759fec (diff) | |
| download | libguestfs-bece54704bb081339a87233bbc5401f2892467be.tar.gz libguestfs-bece54704bb081339a87233bbc5401f2892467be.tar.xz libguestfs-bece54704bb081339a87233bbc5401f2892467be.zip | |
fish: Make 'launch' function static.
This commit makes the launch function static and private to
'fish.c', and changes the generator so the function is no longer
called for the 'run/launch' command.
Diffstat (limited to 'fish/fish.c')
| -rw-r--r-- | fish/fish.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/fish/fish.c b/fish/fish.c index 2e8c7516..461f55b8 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -58,6 +58,7 @@ struct mp { static void add_drives (struct drv *drv); static void prepare_drives (struct drv *drv); static void mount_mps (struct mp *mp); +static int launch (void); static void interactive (void); static void shell_script (void); static void script (int prompt); @@ -77,18 +78,6 @@ int remote_control = 0; int exit_on_error = 1; int command_num = 0; -int -launch (guestfs_h *_g) -{ - assert (_g == g); - - if (guestfs_is_config (g)) { - if (guestfs_launch (g) == -1) - return -1; - } - return 0; -} - static void __attribute__((noreturn)) usage (int status) { @@ -436,7 +425,7 @@ main (int argc, char *argv[]) * guest and mount them. */ if (next_prepared_drive > 1 || mps != NULL) { - if (launch (g) == -1) exit (EXIT_FAILURE); + if (launch () == -1) exit (EXIT_FAILURE); prepare_drives (drvs); mount_mps (mps); } @@ -554,6 +543,16 @@ prepare_drives (struct drv *drv) } } +static int +launch (void) +{ + if (guestfs_is_config (g)) { + if (guestfs_launch (g) == -1) + return -1; + } + return 0; +} + static void interactive (void) { |