summaryrefslogtreecommitdiffstats
path: root/daemon/file.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/file.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/file.c')
-rw-r--r--daemon/file.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/daemon/file.c b/daemon/file.c
index 839713f6..dbdbbaae 100644
--- a/daemon/file.c
+++ b/daemon/file.c
@@ -87,7 +87,7 @@ do_cat (const char *path)
if (size >= alloc) {
alloc += 8192;
if (alloc > max) {
- reply_with_error ("cat: %s: file is too large for message buffer",
+ reply_with_error ("%s: file is too large for message buffer",
path);
free (buf);
close (fd);
@@ -186,7 +186,7 @@ do_rm (const char *path)
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("unlink: %s", path);
+ reply_with_perror ("%s", path);
return -1;
}
@@ -203,7 +203,7 @@ do_chmod (int mode, const char *path)
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("chmod: %s: 0%o", path, mode);
+ reply_with_perror ("%s: 0%o", path, mode);
return -1;
}
@@ -220,7 +220,7 @@ do_chown (int owner, int group, const char *path)
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("chown: %s: %d.%d", path, owner, group);
+ reply_with_perror ("%s: %d.%d", path, owner, group);
return -1;
}
@@ -237,7 +237,7 @@ do_lchown (int owner, int group, const char *path)
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("lchown: %s: %d.%d", path, owner, group);
+ reply_with_perror ("%s: %d.%d", path, owner, group);
return -1;
}
@@ -338,7 +338,7 @@ do_read_file (const char *path, size_t *size_r)
* be caught later when we try to serialize the message.
*/
if (*size_r >= GUESTFS_MESSAGE_MAX) {
- reply_with_error ("read_file: %s: file is too large for the protocol, use guestfs_download instead", path);
+ reply_with_error ("%s: file is too large for the protocol, use guestfs_download instead", path);
close (fd);
return NULL;
}
@@ -378,7 +378,7 @@ do_pread (const char *path, int count, int64_t offset, size_t *size_r)
* will be caught later when we try to serialize the message.
*/
if (count >= GUESTFS_MESSAGE_MAX) {
- reply_with_error ("pread: %s: count is too large for the protocol, use smaller reads", path);
+ reply_with_error ("%s: count is too large for the protocol, use smaller reads", path);
return NULL;
}
@@ -453,7 +453,7 @@ do_file (const char *path)
if (r == -1) {
free (out);
- reply_with_error ("file: %s: %s", path, err);
+ reply_with_error ("%s: %s", path, err);
free (err);
return NULL;
}
@@ -482,7 +482,7 @@ do_zfile (const char *method, const char *path)
else if (STREQ (method, "bzip2"))
zcat = "bzcat";
else {
- reply_with_error ("zfile: unknown method");
+ reply_with_error ("unknown method");
return NULL;
}
@@ -504,13 +504,13 @@ do_zfile (const char *method, const char *path)
free (cmd);
if (fgets (line, sizeof line, fp) == NULL) {
- reply_with_perror ("zfile: fgets");
+ reply_with_perror ("fgets");
fclose (fp);
return NULL;
}
if (fclose (fp) == -1) {
- reply_with_perror ("zfile: fclose");
+ reply_with_perror ("fclose");
return NULL;
}
@@ -532,7 +532,7 @@ do_filesize (const char *path)
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("filesize: %s", path);
+ reply_with_perror ("%s", path);
return -1;
}