From: Steve Holme <steve_holme@hotmail.com>
Date: Sat, 22 Mar 2014 16:31:13 +0000 (+0000)
Subject: tool_getparam: Removed "dead assignment" code introduced in commit 1a9b58fc
X-Git-Tag: curl-7_36_0~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e097583f7d5c633c939da26e7cc009d4b259b45;p=thirdparty%2Fcurl.git

tool_getparam: Removed "dead assignment" code introduced in commit 1a9b58fc
---

diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index 26ec8a7a2e..a0be434ca4 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -1828,6 +1828,10 @@ ParameterError parse_args(struct GlobalConfig *config, int argc,
 
         result = getparameter(flag, nextarg, &passarg, config, operation);
         if(result == PARAM_NEXT_OPERATION) {
+          /* Reset result as PARAM_NEXT_OPERATION is only used here and not
+             returned from this function */
+          result = PARAM_OK;
+
           if(operation->url_list && operation->url_list->url) {
             /* Allocate the next config */
             operation->next = malloc(sizeof(struct OperationConfig));
@@ -1851,9 +1855,6 @@ ParameterError parse_args(struct GlobalConfig *config, int argc,
             else
               result = PARAM_NO_MEM;
           }
-
-          /* Reset result to continue */
-          result = PARAM_OK;
         }
         else if(!result && passarg)
           i++; /* we're supposed to skip this */