From: Rich Salz <rsalz@openssl.org>
Date: Mon, 27 Apr 2015 01:28:38 +0000 (-0400)
Subject: Simplify parse_yesno; remove local variable
X-Git-Tag: OpenSSL_1_1_0-pre1~1269
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1bb2daead8cf3962098647efa1f74c3bce3e9009;p=oweals%2Fopenssl.git

Simplify parse_yesno; remove local variable

Reviewed-by: Tim Hudson <tjh@openssl.org>
---

diff --git a/apps/apps.c b/apps/apps.c
index 7440d392c4..462e2b650c 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1803,7 +1803,6 @@ void free_index(CA_DB *db)
 
 int parse_yesno(const char *str, int def)
 {
-    int ret = def;
     if (str) {
         switch (*str) {
         case 'f':              /* false */
@@ -1811,21 +1810,16 @@ int parse_yesno(const char *str, int def)
         case 'n':              /* no */
         case 'N':              /* NO */
         case '0':              /* 0 */
-            ret = 0;
-            break;
+            return 0;
         case 't':              /* true */
         case 'T':              /* TRUE */
         case 'y':              /* yes */
         case 'Y':              /* YES */
         case '1':              /* 1 */
-            ret = 1;
-            break;
-        default:
-            ret = def;
-            break;
+            return 1;
         }
     }
-    return ret;
+    return def;
 }
 
 /*