From c45360d4633850839bb9c2d77dbf8a8285e9ad49 Mon Sep 17 00:00:00 2001 From: Marian Klymov Date: Sat, 2 Jun 2018 23:52:56 +0300 Subject: cppcheck: fix warnings - Get rid of variable that was generating false positive warning (unitialized) - Fix issues in tests - Reduce scope of several variables all over etc Closes #2631 --- src/tool_getparam.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/tool_getparam.c') diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 186168252..cc3fcf3a5 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -506,8 +506,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ *usedarg = FALSE; /* default is that we don't use the arg */ - if(('-' != flag[0]) || - (('-' == flag[0]) && ('-' == flag[1]))) { + if(('-' != flag[0]) || ('-' == flag[1])) { /* this should be a long name */ const char *word = ('-' == flag[0]) ? flag + 2 : flag; size_t fnam = strlen(word); @@ -2155,7 +2154,6 @@ ParameterError parse_args(struct GlobalConfig *config, int argc, orig_opt = argv[i]; if(stillflags && ('-' == argv[i][0])) { - char *nextarg; bool passarg; char *flag = argv[i]; @@ -2164,7 +2162,7 @@ ParameterError parse_args(struct GlobalConfig *config, int argc, following (URL) argument to start with -. */ stillflags = FALSE; else { - nextarg = (i < (argc - 1)) ? argv[i + 1] : NULL; + char *nextarg = (i < (argc - 1)) ? argv[i + 1] : NULL; result = getparameter(flag, nextarg, &passarg, config, operation); if(result == PARAM_NEXT_OPERATION) { -- cgit v1.2.3