aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2019-06-02 11:57:19 +0100
committerSteve Holme <steve_holme@hotmail.com>2019-06-02 22:37:05 +0100
commit80b42e74da56ef1cae297d91a60e2bf868751580 (patch)
treebe5caaecb670cc2d31a8e997b68e599ecd2fbce1
parentf9b60fb6f85b83bf450eb4c424642860ed884a85 (diff)
tool_parsecfg: Fix control flow issue (DEADCODE)
Follow-up to 8144ba38. Detected by Coverity CID 1445663 Closes #3976
-rw-r--r--src/tool_parsecfg.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index 683e25ac1..621369d45 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;