From 30eb6bbdc90b21833c98e238c3ee88a63239ffa4 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sat, 17 Jan 2015 11:20:35 +0000 Subject: http_negotiate_sspi: Use 'CURLcode result' for CURL result code --- lib/http_negotiate_sspi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/http_negotiate_sspi.c b/lib/http_negotiate_sspi.c index d651ac9c8..9aa1dfd45 100644 --- a/lib/http_negotiate_sspi.c +++ b/lib/http_negotiate_sspi.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2015, Daniel Stenberg, , 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; } -- cgit v1.2.3