diff options
author | Markus Armbruster <armbru@redhat.com> | 2015-12-18 16:35:14 +0100 |
---|---|---|
committer | Timothy Pearson <tpearson@raptorengineering.com> | 2019-11-29 19:28:24 -0600 |
commit | 759cff308e788cf51d9b83c59660a9a7b7300f33 (patch) | |
tree | c9b78afaa8b98d78b85128eb9782ad0a53fe3486 /qemu-nbd.c | |
parent | dd35bd3dfb56adbea511121be25882df59fa9507 (diff) | |
download | hqemu-759cff308e788cf51d9b83c59660a9a7b7300f33.zip hqemu-759cff308e788cf51d9b83c59660a9a7b7300f33.tar.gz |
error: Use error_reportf_err() where it makes obvious sense
Done with this Coccinelle semantic patch
@@
expression FMT, E, S;
expression list ARGS;
@@
- error_report(FMT, ARGS, error_get_pretty(E));
+ error_reportf_err(E, FMT/*@@@*/, ARGS);
(
- error_free(E);
|
exit(S);
|
abort();
)
followed by a replace of '%s"/*@@@*/' by '"' and some line rewrapping,
because I can't figure out how to make Coccinelle transform strings.
We now use the error whole instead of just its message obtained with
error_get_pretty(). This avoids suppressing its hint (see commit
50b7b00), but I can't see how the errors touched in this commit could
come with hints.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1450452927-8346-12-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'qemu-nbd.c')
-rw-r--r-- | qemu-nbd.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -495,8 +495,8 @@ int main(int argc, char **argv) BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF, &local_err); if (local_err) { - error_report("Failed to parse detect_zeroes mode: %s", - error_get_pretty(local_err)); + error_reportf_err(local_err, + "Failed to parse detect_zeroes mode: "); exit(EXIT_FAILURE); } if (detect_zeroes == BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP && @@ -703,8 +703,8 @@ int main(int argc, char **argv) srcpath = argv[optind]; blk = blk_new_open("hda", srcpath, NULL, options, flags, &local_err); if (!blk) { - error_report("Failed to blk_new_open '%s': %s", argv[optind], - error_get_pretty(local_err)); + error_reportf_err(local_err, "Failed to blk_new_open '%s': ", + argv[optind]); exit(EXIT_FAILURE); } bs = blk_bs(blk); @@ -719,8 +719,7 @@ int main(int argc, char **argv) &local_err); } if (ret < 0) { - error_report("Failed to load snapshot: %s", - error_get_pretty(local_err)); + error_reportf_err(local_err, "Failed to load snapshot: "); exit(EXIT_FAILURE); } |