From: Pauli <pauli@openssl.org>
Date: Wed, 8 Dec 2021 01:16:42 +0000 (+1100)
Subject: fix Coverity 1494649: dead code
X-Git-Tag: openssl-3.2.0-alpha1~3235
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0fc3c10d0617821a476b34aba1ee77d47a2a64a;p=thirdparty%2Fopenssl.git

fix Coverity 1494649: dead code

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17230)
---

diff --git a/apps/lib/opt.c b/apps/lib/opt.c
index 3925ec96c3d..7967fa79563 100644
--- a/apps/lib/opt.c
+++ b/apps/lib/opt.c
@@ -1036,14 +1036,14 @@ int opt_check_rest_arg(const char *expected)
             return 1;
         opt_printf_stderr("%s: Missing argument: %s\n", prog, expected);
         return 0;
-    } else if (expected != NULL) {
-        return 1;
     }
+    if (expected != NULL)
+        return 1;
     if (opt_unknown() == NULL)
         opt_printf_stderr("%s: Extra option: \"%s\"\n", prog, opt);
     else
         opt_printf_stderr("%s: Extra (unknown) options: \"%s\" \"%s\"\n",
-                          prog, opt_unknown(), opt != NULL ? opt : "");
+                          prog, opt_unknown(), opt);
     return 0;
 }