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/parted.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/parted.c')
-rw-r--r-- | daemon/parted.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/daemon/parted.c b/daemon/parted.c index 2b0df441..3b656bc2 100644 --- a/daemon/parted.c +++ b/daemon/parted.c @@ -103,7 +103,7 @@ do_part_init (const char *device, const char *parttype) { parttype = check_parttype (parttype); if (!parttype) { - reply_with_error ("part-init: unknown partition type: common choices are \"gpt\" and \"msdos\""); + reply_with_error ("unknown partition type: common choices are \"gpt\" and \"msdos\""); return -1; } @@ -133,12 +133,12 @@ do_part_add (const char *device, const char *prlogex, else if (STREQ (prlogex, "e")) prlogex = "extended"; else { - reply_with_error ("part-add: unknown partition type: %s: this should be \"primary\", \"logical\" or \"extended\"", prlogex); + reply_with_error ("unknown partition type: %s: this should be \"primary\", \"logical\" or \"extended\"", prlogex); return -1; } if (startsect < 0) { - reply_with_error ("part-add: startsect cannot be negative"); + reply_with_error ("startsect cannot be negative"); return -1; } /* but endsect can be negative */ @@ -166,7 +166,7 @@ do_part_disk (const char *device, const char *parttype) parttype = check_parttype (parttype); if (!parttype) { - reply_with_error ("part-disk: unknown partition type: common choices are \"gpt\" and \"msdos\""); + reply_with_error ("unknown partition type: common choices are \"gpt\" and \"msdos\""); return -1; } @@ -249,14 +249,14 @@ print_partition_table (const char *device) return NULL; if (lines[0] == NULL || STRNEQ (lines[0], "BYT;")) { - reply_with_error ("parted print: unknown signature, expected \"BYT;\" as first line of the output: %s", + reply_with_error ("unknown signature, expected \"BYT;\" as first line of the output: %s", lines[0] ? lines[0] : "(signature was null)"); free_strings (lines); return NULL; } if (lines[1] == NULL) { - reply_with_error ("parted print: parted didn't return a line describing the device"); + reply_with_error ("parted didn't return a line describing the device"); free_strings (lines); return NULL; } @@ -284,7 +284,7 @@ do_part_get_parttype (const char *device) || strtok (NULL, ":") == NULL /* physical sector size */ || (r = strtok (NULL, ":")) == NULL /* return value */ ) { - reply_with_error ("part_get_parttype: too few fields in output from parted print command: %s", lines[1]); + reply_with_error ("too few fields in output from parted print command: %s", lines[1]); free_strings (lines); return NULL; } @@ -339,7 +339,7 @@ do_part_list (const char *device) &r->guestfs_int_partition_list_val[i].part_start, &r->guestfs_int_partition_list_val[i].part_end, &r->guestfs_int_partition_list_val[i].part_size) != 4) { - reply_with_error ("part_list: could not parse row from output of parted print command: %s", lines[row]); + reply_with_error ("could not parse row from output of parted print command: %s", lines[row]); goto error3; } } |