commit 64dfefed169465c5d0fc20fda7b06104406e390c
author Markus Armbruster <armbru@redhat.com> Fri May 02 13:26:32 2014 +0200
committer Luiz Capitulino <lcapitulino@redhat.com> Fri May 09 09:11:30 2014 -0400
tree ac24cd59ffcc1e2f63f56054ba9b1a0091bfcd59
parent 7daecb30656660610980b83ef71180bc844e1dab

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>

util/error.c

diff --git a/util/error.c b/util/error.c
index 2bb42e1..66245cc 100644
--- a/util/error.c
+++ b/util/error.c
@@ -165,13 +165,13 @@
     }
 }
 
-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);
     }