]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
negotiate: Use 'CURLcode result' for curl result codes
authorSteve Holme <steve_holme@hotmail.com>
Sun, 13 Mar 2016 17:09:58 +0000 (17:09 +0000)
committerSteve Holme <steve_holme@hotmail.com>
Sun, 13 Mar 2016 17:09:58 +0000 (17:09 +0000)
lib/http_negotiate_sspi.c

index 7371f97d012f73ccc0ba0fea4e579b81276ee12c..d2643bb414d2c0c50fbf0c870345264fed8ec2c6 100644 (file)
@@ -234,14 +234,14 @@ CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy)
   char *encoded = NULL;
   size_t len = 0;
   char *userp;
-  CURLcode error;
+  CURLcode result;
 
-  error = Curl_base64_encode(conn->data,
-                             (const char*)neg_ctx->output_token,
-                             neg_ctx->output_token_length,
-                             &encoded, &len);
-  if(error)
-    return error;
+  result = Curl_base64_encode(conn->data,
+                              (const char*)neg_ctx->output_token,
+                              neg_ctx->output_token_length,
+                              &encoded, &len);
+  if(result)
+    return result;
 
   if(!len)
     return CURLE_REMOTE_ACCESS_DENIED;
@@ -257,7 +257,9 @@ CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy)
     Curl_safefree(conn->allocptr.userpwd);
     conn->allocptr.userpwd = userp;
   }
+
   free(encoded);
+
   return (userp == NULL) ? CURLE_OUT_OF_MEMORY : CURLE_OK;
 }