From: Steve Holme <steve_holme@hotmail.com>
Date: Sun, 2 Jun 2019 10:57:19 +0000 (+0100)
Subject: tool_parsecfg: Fix control flow issue (DEADCODE)
X-Git-Tag: curl-7_65_1~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80b42e74da56ef1cae297d91a60e2bf868751580;p=thirdparty%2Fcurl.git

tool_parsecfg: Fix control flow issue (DEADCODE)

Follow-up to 8144ba38.

Detected by Coverity CID 1445663
Closes #3976
---

diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index 683e25ac18..621369d458 100644
--- a/src/tool_parsecfg.c
+++ b/src/tool_parsecfg.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -109,12 +109,12 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
 #endif
   }
 
-  if(file != NULL)  /* WIN32: no need to fopen() again */
-    ;
-  else if(strcmp(filename, "-"))
-    file = fopen(filename, FOPEN_READTEXT);
-  else
-    file = stdin;
+  if(!file) { /* WIN32: no need to fopen() again */
+    if(strcmp(filename, "-"))
+      file = fopen(filename, FOPEN_READTEXT);
+    else
+      file = stdin;
+  }
 
   if(file) {
     char *line;