diff mbox

[PULL,04/14] error: Remove NULL checks on error_propagate() calls

Message ID 20180327143014.1767669-5-eblake@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Eric Blake March 27, 2018, 2:30 p.m. UTC 
From: Laurent Vivier <lvivier@redhat.com>

Re-run Coccinelle patch
scripts/coccinelle/error_propagate_null.cocci

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20180323143202.28879-4-lvivier@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
 io/channel-websock.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
diff mbox

Patch

diff --git a/io/channel-websock.c b/io/channel-websock.c
index ec48a305f02..e6608b969d7 100644
--- a/io/channel-websock.c
+++ b/io/channel-websock.c
@@ -586,9 +586,7 @@  static gboolean qio_channel_websock_handshake_io(QIOChannel *ioc,
         return TRUE;
     }

-    if (err) {
-        error_propagate(&wioc->io_err, err);
-    }
+    error_propagate(&wioc->io_err, err);

     trace_qio_channel_websock_handshake_reply(ioc);
     qio_channel_add_watch(