diff options
| author | Markus Armbruster <armbru@redhat.com> | 2014-05-02 13:26:32 +0200 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2014-05-09 09:11:30 -0400 |
| commit | 64dfefed169465c5d0fc20fda7b06104406e390c (patch) | |
| tree | ac24cd59ffcc1e2f63f56054ba9b1a0091bfcd59 /util/error.c | |
| parent | 7daecb30656660610980b83ef71180bc844e1dab (diff) | |
| download | focaccia-qemu-64dfefed169465c5d0fc20fda7b06104406e390c.tar.gz focaccia-qemu-64dfefed169465c5d0fc20fda7b06104406e390c.zip | |
error: Consistently name Error ** objects errp, and not err
Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'util/error.c')
| -rw-r--r-- | util/error.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/util/error.c b/util/error.c index 2bb42e1c4b..66245ccd1f 100644 --- a/util/error.c +++ b/util/error.c @@ -165,13 +165,13 @@ void error_free(Error *err) } } -void error_propagate(Error **dst_err, Error *local_err) +void error_propagate(Error **dst_errp, Error *local_err) { - if (local_err && dst_err == &error_abort) { + if (local_err && dst_errp == &error_abort) { error_report("%s", error_get_pretty(local_err)); abort(); - } else if (dst_err && !*dst_err) { - *dst_err = local_err; + } else if (dst_errp && !*dst_errp) { + *dst_errp = local_err; } else if (local_err) { error_free(local_err); } |