diff options
author | Richard Jones <rjones@redhat.com> | 2010-02-12 14:06:25 +0000 |
---|---|---|
committer | Richard Jones <rjones@redhat.com> | 2010-02-12 16:49:00 +0000 |
commit | e9c37113104c1cfb234535adc9b52ad3880a41ce (patch) | |
tree | a3367b5e700b9b455340243d7c66c45a5adf6067 /daemon/mount.c | |
parent | 9b3ef85a3d1b43faa98bb5dc922f8a273a5e1dde (diff) | |
download | libguestfs-e9c37113104c1cfb234535adc9b52ad3880a41ce.tar.gz libguestfs-e9c37113104c1cfb234535adc9b52ad3880a41ce.tar.xz libguestfs-e9c37113104c1cfb234535adc9b52ad3880a41ce.zip |
daemon: Don't need to prefix error messages with the command name.
The RPC stubs already prefix the command name to error messages.
The daemon doesn't have to do this. As a (small) benefit this also
makes the daemon slightly smaller.
Code in the daemon such as:
if (argv[0] == NULL) {
reply_with_error ("passed an empty list");
return NULL;
}
now results in error messages like this:
><fs> command ""
libguestfs: error: command: passed an empty list
(whereas previously you would have seen ..command: command:..)
Diffstat (limited to 'daemon/mount.c')
-rw-r--r-- | daemon/mount.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/daemon/mount.c b/daemon/mount.c index 49a0eab0..838bef86 100644 --- a/daemon/mount.c +++ b/daemon/mount.c @@ -53,7 +53,7 @@ do_mount_vfs (const char *options, const char *vfstype, is_root = STREQ (mountpoint, "/"); if (!root_mounted && !is_root) { - reply_with_error ("mount: you must mount something on / first"); + reply_with_error ("you must mount something on / first"); return -1; } @@ -71,7 +71,7 @@ do_mount_vfs (const char *options, const char *vfstype, "mount", "-o", options, device, mp, NULL); free (mp); if (r == -1) { - reply_with_error ("mount: %s on %s: %s", device, mountpoint, error); + reply_with_error ("%s on %s: %s", device, mountpoint, error); free (error); return -1; } @@ -127,7 +127,7 @@ do_umount (const char *pathordevice) free (buf); if (r == -1) { - reply_with_error ("umount: %s: %s", pathordevice, err); + reply_with_error ("%s: %s", pathordevice, err); free (err); return -1; } @@ -338,7 +338,7 @@ do_mount_loop (const char *file, const char *mountpoint) free (mp); free (buf); if (r == -1) { - reply_with_error ("mount: %s on %s: %s", file, mountpoint, error); + reply_with_error ("%s on %s: %s", file, mountpoint, error); free (error); return -1; } @@ -363,7 +363,7 @@ do_mkmountpoint (const char *path) CHROOT_OUT; if (r == -1) { - reply_with_perror ("mkmountpoint: %s", path); + reply_with_perror ("%s", path); return -1; } @@ -388,7 +388,7 @@ do_rmmountpoint (const char *path) CHROOT_OUT; if (r == -1) { - reply_with_perror ("rmmountpoint: %s", path); + reply_with_perror ("%s", path); return -1; } |