From: Dr. David von Oheimb <David.von.Oheimb@siemens.com>
Date: Tue, 26 May 2020 08:44:10 +0000 (+0200)
Subject: Remove meanwhile redundant error output of apps/opt_next(void) parsing numbers
X-Git-Tag: openssl-3.0.0-alpha4~119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2620c38ba8f9bd4ceffd124e12e2a630621abe27;p=thirdparty%2Fopenssl.git

Remove meanwhile redundant error output of apps/opt_next(void) parsing numbers

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11998)
---

diff --git a/apps/lib/opt.c b/apps/lib/opt.c
index 566de8ab7d2..7630d516ca7 100644
--- a/apps/lib/opt.c
+++ b/apps/lib/opt.c
@@ -740,40 +740,29 @@ int opt_next(void)
             break;
         case 'p':
         case 'n':
-            if (!opt_int(arg, &ival)
-                    || (o->valtype == 'p' && ival <= 0)) {
+            if (!opt_int(arg, &ival))
+                return -1;
+            if (o->valtype == 'p' && ival <= 0) {
                 opt_printf_stderr("%s: Non-positive number \"%s\" for -%s\n",
                                   prog, arg, o->name);
                 return -1;
             }
             break;
         case 'M':
-            if (!opt_imax(arg, &imval)) {
-                opt_printf_stderr("%s: Invalid number \"%s\" for -%s\n",
-                                  prog, arg, o->name);
+            if (!opt_imax(arg, &imval))
                 return -1;
-            }
             break;
         case 'U':
-            if (!opt_umax(arg, &umval)) {
-                opt_printf_stderr("%s: Invalid number \"%s\" for -%s\n",
-                                  prog, arg, o->name);
+            if (!opt_umax(arg, &umval))
                 return -1;
-            }
             break;
         case 'l':
-            if (!opt_long(arg, &lval)) {
-                opt_printf_stderr("%s: Invalid number \"%s\" for -%s\n",
-                                  prog, arg, o->name);
+            if (!opt_long(arg, &lval))
                 return -1;
-            }
             break;
         case 'u':
-            if (!opt_ulong(arg, &ulval)) {
-                opt_printf_stderr("%s: Invalid number \"%s\" for -%s\n",
-                                  prog, arg, o->name);
+            if (!opt_ulong(arg, &ulval))
                 return -1;
-            }
             break;
         case 'c':
         case 'E':