commit 0fb6395c0cb5046432a80d608ddde7a3b2f8a9ae
author Markus Armbruster <armbru@redhat.com> Fri Apr 25 16:50:31 2014 +0200
committer Stefan Hajnoczi <stefanha@redhat.com> Fri Apr 25 18:05:06 2014 +0200
tree bc4d5b75394733d277652b127066461b7197c360
parent a28315ebaf3910b65ef51abefc4ef040265afc19

Use error_is_set() only when necessary (again)

error_is_set(&var) is the same as var != NULL, but it takes
whole-program analysis to figure that out.  Unnecessarily hard for
optimizers, static checkers, and human readers.  Commit 84d18f0 dumbed
it down to obvious, but a few more have crept in since, and
documentation was overlooked.  Dumb these down, too.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

block.c

diff --git a/block.c b/block.c
index bad7fe0..4745712 100644
--- a/block.c
+++ b/block.c
@@ -864,7 +864,7 @@
 
     node_name = qdict_get_try_str(options, "node-name");
     bdrv_assign_node_name(bs, node_name, &local_err);
-    if (error_is_set(&local_err)) {
+    if (local_err) {
         error_propagate(errp, local_err);
         return -EINVAL;
     }