summaryrefslogtreecommitdiffstats
path: root/daemon/dir.c
diff options
context:
space:
mode:
authorRichard Jones <rjones@redhat.com>2010-02-12 14:06:25 +0000
committerRichard Jones <rjones@redhat.com>2010-02-12 16:49:00 +0000
commite9c37113104c1cfb234535adc9b52ad3880a41ce (patch)
treea3367b5e700b9b455340243d7c66c45a5adf6067 /daemon/dir.c
parent9b3ef85a3d1b43faa98bb5dc922f8a273a5e1dde (diff)
downloadlibguestfs-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/dir.c')
-rw-r--r--daemon/dir.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/daemon/dir.c b/daemon/dir.c
index 300bb4ce..205139b8 100644
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -39,7 +39,7 @@ do_rmdir (const char *path)
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("rmdir: %s", path);
+ reply_with_perror ("%s", path);
return -1;
}
@@ -57,7 +57,7 @@ do_rm_rf (const char *path)
char *buf, *err;
if (STREQ (path, "/")) {
- reply_with_error ("rm -rf: cannot remove root directory");
+ reply_with_error ("cannot remove root directory");
return -1;
}
@@ -72,7 +72,7 @@ do_rm_rf (const char *path)
/* rm -rf is never supposed to fail. I/O errors perhaps? */
if (r == -1) {
- reply_with_error ("rm -rf: %s: %s", path, err);
+ reply_with_error ("%s: %s", path, err);
free (err);
return -1;
}
@@ -92,7 +92,7 @@ do_mkdir (const char *path)
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("mkdir: %s", path);
+ reply_with_perror ("%s", path);
return -1;
}
@@ -109,7 +109,7 @@ do_mkdir_mode (const char *path, int mode)
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("mkdir_mode: %s", path);
+ reply_with_perror ("%s", path);
return -1;
}
@@ -174,11 +174,11 @@ do_mkdir_p (const char *path)
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("mkdir -p: %s", path);
+ reply_with_perror ("%s", path);
return -1;
}
if (r == -2) {
- reply_with_error ("mkdir -p: %s: a path element was not a directory", path);
+ reply_with_error ("%s: a path element was not a directory", path);
return -1;
}
@@ -221,7 +221,7 @@ do_mkdtemp (const char *template)
CHROOT_OUT;
if (r == NULL) {
- reply_with_perror ("mkdtemp: %s", template);
+ reply_with_perror ("%s", template);
free (writable);
}