diff options
| author | Sylvestre Ledru <sylvestre@debian.org> | 2017-03-10 14:28:37 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-03-13 23:11:45 +0100 |
| commit | 66de563482c0fd4324e1eae19809d2499e3c4fa8 (patch) | |
| tree | bf3178878ebe2461388e8fec01e321173ffe30f8 /src/tool_getparam.c | |
| parent | db87bcfcf21f8c3b8188d0c5ab82faf804ffd5ea (diff) | |
Improve code readbility
... by removing the else branch after a return, break or continue.
Closes #1310
Diffstat (limited to 'src/tool_getparam.c')
| -rw-r--r-- | src/tool_getparam.c | 47 |
1 files changed, 22 insertions, 25 deletions
diff --git a/src/tool_getparam.c b/src/tool_getparam.c index e7ac35476..c8c53fad1 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -783,11 +783,10 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ if(!url) return PARAM_NO_MEM; - else { - /* fill in the URL */ - GetStr(&url->url, nextarg); - url->flags |= GETOUT_URL; - } + + /* fill in the URL */ + GetStr(&url->url, nextarg); + url->flags |= GETOUT_URL; } } break; @@ -878,7 +877,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ &config->localportrange); if(!rc) return PARAM_BAD_USE; - else if(rc == 1) + if(rc == 1) config->localportrange = 1; /* default number of ports to try */ else { config->localportrange -= config->localport; @@ -1728,21 +1727,20 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ if(!url) return PARAM_NO_MEM; + + /* fill in the outfile */ + if('o' == letter) { + GetStr(&url->outfile, nextarg); + url->flags &= ~GETOUT_USEREMOTE; /* switch off */ + } else { - /* fill in the outfile */ - if('o' == letter) { - GetStr(&url->outfile, nextarg); + url->outfile = NULL; /* leave it */ + if(toggle) + url->flags |= GETOUT_USEREMOTE; /* switch on */ + else url->flags &= ~GETOUT_USEREMOTE; /* switch off */ - } - else { - url->outfile = NULL; /* leave it */ - if(toggle) - url->flags |= GETOUT_USEREMOTE; /* switch on */ - else - url->flags &= ~GETOUT_USEREMOTE; /* switch off */ - } - url->flags |= GETOUT_OUTFILE; } + url->flags |= GETOUT_OUTFILE; } break; case 'P': @@ -1867,14 +1865,13 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ if(!url) return PARAM_NO_MEM; + + url->flags |= GETOUT_UPLOAD; /* mark -T used */ + if(!*nextarg) + url->flags |= GETOUT_NOUPLOAD; else { - url->flags |= GETOUT_UPLOAD; /* mark -T used */ - if(!*nextarg) - url->flags |= GETOUT_NOUPLOAD; - else { - /* "-" equals stdin, but keep the string around for now */ - GetStr(&url->infile, nextarg); - } + /* "-" equals stdin, but keep the string around for now */ + GetStr(&url->infile, nextarg); } } break; |