]> www.infradead.org Git - users/dwmw2/openconnect.git/commitdiff
oncp_connect: avoid code without side-effects
authorNikos Mavrogiannopoulos <nmav@redhat.com>
Thu, 12 Nov 2020 15:06:15 +0000 (16:06 +0100)
committerNikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
Tue, 17 Nov 2020 12:57:32 +0000 (13:57 +0100)
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
oncp.c

diff --git a/oncp.c b/oncp.c
index d4254956d79397f2dd3ecfe1b9e4156a2fc8ff27..f268eaf1d9d8a64af69c37e32e1122f31b00c75c 100644 (file)
--- a/oncp.c
+++ b/oncp.c
@@ -780,12 +780,12 @@ int oncp_connect(struct openconnect_info *vpninfo)
        vpn_progress(vpninfo, PRG_DEBUG, _("oNCP negotiation request outgoing:\n"));
        dump_buf_hex(vpninfo, PRG_DEBUG, '>', (void *)reqbuf->data, reqbuf->pos);
        ret = vpninfo->ssl_write(vpninfo, reqbuf->data, reqbuf->pos);
-       if (ret == reqbuf->pos)
-               ret = 0;
-       else if (ret >= 0) {
-               vpn_progress(vpninfo, PRG_ERR,
-                            _("Short write in oNCP negotiation\n"));
-               ret = -EIO;
+       if (ret != reqbuf->pos) {
+               if (ret >= 0) {
+                       vpn_progress(vpninfo, PRG_ERR,
+                                    _("Short write in oNCP negotiation\n"));
+                       ret = -EIO;
+               }
                goto out;
        }