mirror of https://github.com/xemu-project/xemu.git
dcfe480544
Replace
error_setg(&err, ...);
error_propagate(errp, err);
by
error_setg(errp, ...);
Related pattern:
if (...) {
error_setg(&err, ...);
goto out;
}
...
out:
error_propagate(errp, err);
return;
When all paths to label out are that way, replace by
if (...) {
error_setg(errp, ...);
return;
}
and delete the label along with the error_propagate().
When we have at most one other path that actually needs to propagate,
and maybe one at the end that where propagation is unnecessary, e.g.
foo(..., &err);
if (err) {
goto out;
}
...
bar(..., &err);
out:
error_propagate(errp, err);
return;
move the error_propagate() to where it's needed, like
if (...) {
foo(..., &err);
error_propagate(errp, err);
return;
}
...
bar(..., errp);
return;
and transform the error_setg() as above.
In some places, the transformation results in obviously unnecessary
error_propagate(). The next few commits will eliminate them.
Bonus: the elimination of gotos will make later patches in this series
easier to review.
Candidates for conversion tracked down with this Coccinelle script:
@@
identifier err, errp;
expression list args;
@@
- error_setg(&err, args);
+ error_setg(errp, args);
... when != err
error_propagate(errp, err);
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-34-armbru@redhat.com>
|
||
|---|---|---|
| .. | ||
| can | ||
| Makefile.objs | ||
| announce.c | ||
| checksum.c | ||
| clients.h | ||
| colo-compare.c | ||
| colo-compare.h | ||
| colo.c | ||
| colo.h | ||
| dump.c | ||
| eth.c | ||
| filter-buffer.c | ||
| filter-mirror.c | ||
| filter-replay.c | ||
| filter-rewriter.c | ||
| filter.c | ||
| hub.c | ||
| hub.h | ||
| l2tpv3.c | ||
| net.c | ||
| netmap.c | ||
| queue.c | ||
| slirp.c | ||
| socket.c | ||
| tap-bsd.c | ||
| tap-linux.c | ||
| tap-linux.h | ||
| tap-solaris.c | ||
| tap-stub.c | ||
| tap-win32.c | ||
| tap.c | ||
| tap_int.h | ||
| trace-events | ||
| util.c | ||
| util.h | ||
| vde.c | ||
| vhost-user-stub.c | ||
| vhost-user.c | ||
| vhost-vdpa.c | ||