diff options
| author | Richard Jones <rjones@redhat.com> | 2010-08-23 12:54:27 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2010-08-23 12:56:54 +0100 |
| commit | 4b753c62089be663ac722e4a875bb061d259e87d (patch) | |
| tree | 572e5b4882f6ee27f83d23b5fa3ee2c5e1b81ee4 | |
| parent | a2d4a8bf073c3551d174bd6c406e0cf3d27fb560 (diff) | |
| download | libguestfs-4b753c62089be663ac722e4a875bb061d259e87d.tar.gz libguestfs-4b753c62089be663ac722e4a875bb061d259e87d.tar.xz libguestfs-4b753c62089be663ac722e4a875bb061d259e87d.zip | |
Make print_timestamped_message into a cross-module function.
This is just code movement.
| -rw-r--r-- | src/guestfs-internal.h | 1 | ||||
| -rw-r--r-- | src/launch.c | 11 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index c8db8291..73a14ab7 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -197,6 +197,7 @@ extern void *guestfs_safe_realloc (guestfs_h *g, void *ptr, int nbytes); extern char *guestfs_safe_strdup (guestfs_h *g, const char *str); extern char *guestfs_safe_strndup (guestfs_h *g, const char *str, size_t n); extern void *guestfs_safe_memdup (guestfs_h *g, void *ptr, size_t size); +extern void guestfs___print_timestamped_message (guestfs_h *g, const char *fs, ...); extern const char *guestfs___tmpdir (void); extern void guestfs___free_inspect_info (guestfs_h *g); extern int guestfs___set_busy (guestfs_h *g); diff --git a/src/launch.c b/src/launch.c index 4a479bc0..9deb0cfa 100644 --- a/src/launch.c +++ b/src/launch.c @@ -255,7 +255,6 @@ dir_contains_files (const char *dir, ...) return 1; } -static void print_timestamped_message (guestfs_h *g, const char *fs, ...); static int build_supermin_appliance (guestfs_h *g, const char *path, char **kernel, char **initrd); static int is_openable (guestfs_h *g, const char *path, int flags); static void print_cmdline (guestfs_h *g); @@ -400,7 +399,7 @@ guestfs__launch (guestfs_h *g) } if (g->verbose) - print_timestamped_message (g, "begin testing qemu features"); + guestfs___print_timestamped_message (g, "begin testing qemu features"); /* Get qemu help text and version. */ if (qemu_supports (g, NULL) == -1) @@ -463,7 +462,7 @@ guestfs__launch (guestfs_h *g) } if (g->verbose) - print_timestamped_message (g, "finished testing qemu features"); + guestfs___print_timestamped_message (g, "finished testing qemu features"); r = fork (); if (r == -1) { @@ -830,7 +829,7 @@ guestfs__launch (guestfs_h *g) } if (g->verbose) - print_timestamped_message (g, "appliance is up"); + guestfs___print_timestamped_message (g, "appliance is up"); /* This is possible in some really strange situations, such as * guestfsd starts up OK but then qemu immediately exits. Check for @@ -982,8 +981,8 @@ timeval_diff (const struct timeval *x, const struct timeval *y) return msec; } -static void -print_timestamped_message (guestfs_h *g, const char *fs, ...) +void +guestfs___print_timestamped_message (guestfs_h *g, const char *fs, ...) { va_list args; char *msg; |