From: Markus Armbruster <armbru@redhat.com>
Date: Fri, 25 Apr 2014 14:50:33 +0000 (+0200)
Subject: nbd: Use return values instead of error_is_set(errp)
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=92de9012904cd6ada47565f48db545d53069d933;p=qemu.git

nbd: Use return values instead of error_is_set(errp)

Using error_is_set(errp) to check whether a function call failed is
fragile: it breaks when errp is null.  Check perfectly suitable return
values instead when possible.  errp can't be null there now, but this
is more robust and more obviously correct

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

diff --git a/block/nbd.c b/block/nbd.c
index 55124239df..613f2581ae 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -175,7 +175,7 @@ static void nbd_parse_filename(const char *filename, QDict *options,
         InetSocketAddress *addr = NULL;
 
         addr = inet_parse(host_spec, errp);
-        if (error_is_set(errp)) {
+        if (!addr) {
             goto out;
         }