From: Steve Holme <steve_holme@hotmail.com>
Date: Sat, 17 Jan 2015 11:20:35 +0000 (+0000)
Subject: http_negotiate_sspi: Use 'CURLcode result' for CURL result code
X-Git-Tag: curl-7_41_0~124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30eb6bbdc90b21833c98e238c3ee88a63239ffa4;p=thirdparty%2Fcurl.git

http_negotiate_sspi: Use 'CURLcode result' for CURL result code
---

diff --git a/lib/http_negotiate_sspi.c b/lib/http_negotiate_sspi.c
index d651ac9c8b..9aa1dfd458 100644
--- a/lib/http_negotiate_sspi.c
+++ b/lib/http_negotiate_sspi.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2015, 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
@@ -56,7 +56,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
   TimeStamp         expiry;
   int ret;
   size_t len = 0, input_token_len = 0;
-  CURLcode error;
+  CURLcode result;
 
   /* Point to the username and password */
   const char *userp;
@@ -141,8 +141,8 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
 
     if(userp && *userp) {
       /* Populate our identity structure */
-      error = Curl_create_sspi_identity(userp, passwdp, &neg_ctx->identity);
-      if(error)
+      result = Curl_create_sspi_identity(userp, passwdp, &neg_ctx->identity);
+      if(result)
         return -1;
 
       /* Allow proper cleanup of the identity structure */
@@ -163,10 +163,10 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
       return -1;
   }
   else {
-    error = Curl_base64_decode(header,
-                               (unsigned char **)&input_token,
-                               &input_token_len);
-    if(error || !input_token_len)
+    result = Curl_base64_decode(header,
+                                (unsigned char **)&input_token,
+                                &input_token_len);
+    if(result || !input_token_len)
       return -1;
   }