diff options
author | Steve Holme <steve_holme@hotmail.com> | 2014-10-26 16:34:44 +0000 |
---|---|---|
committer | Steve Holme <steve_holme@hotmail.com> | 2014-10-26 16:38:21 +0000 |
commit | 07ac29a05816a75fd5f1f3c00f4aeaaac06c38a4 (patch) | |
tree | 58648f7930a4baa78dc25de2c8c4fa87f8249b07 /lib | |
parent | 64814739d5b0f1391c02972c98aa7fceb2132500 (diff) |
http_negotiate: We prefer 'CURLcode result'
Continuing commit 0eb3d15ccb more return code variable name changes.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/http_negotiate.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c index 0d0cc550f..8d9ccd28d 100644 --- a/lib/http_negotiate.c +++ b/lib/http_negotiate.c @@ -115,7 +115,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy, int ret; size_t len; size_t rawlen = 0; - CURLcode error; + CURLcode result; if(neg_ctx->context && neg_ctx->status == GSS_S_COMPLETE) { /* We finished successfully our part of authentication, but server @@ -135,9 +135,9 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy, len = strlen(header); if(len > 0) { - error = Curl_base64_decode(header, - (unsigned char **)&input_token.value, &rawlen); - if(error || rawlen == 0) + result = Curl_base64_decode(header, (unsigned char **)&input_token.value, + &rawlen); + if(result || rawlen == 0) return -1; input_token.length = rawlen; @@ -181,18 +181,18 @@ CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy) char *encoded = NULL; size_t len = 0; char *userp; - CURLcode error; + CURLcode result; OM_uint32 discard_st; - error = Curl_base64_encode(conn->data, - neg_ctx->output_token.value, - neg_ctx->output_token.length, - &encoded, &len); - if(error) { + result = Curl_base64_encode(conn->data, + neg_ctx->output_token.value, + neg_ctx->output_token.length, + &encoded, &len); + if(result) { gss_release_buffer(&discard_st, &neg_ctx->output_token); neg_ctx->output_token.value = NULL; neg_ctx->output_token.length = 0; - return error; + return result; } if(!encoded || !len) { |