moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00
Code Issues Releases Wiki Activity

http_negotiate_sspi.c: fix compiler warning

Browse Source
This commit is contained in:
Yang Tse 2012-01-13 13:34:43 +01:00
parent d016f5f5f5
commit 8e82ef9c32
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/http_negotiate_sspi.c
View File

@ -29,6 +29,7 @@
#include "urldata.h" #include "urldata.h"
#include "sendf.h" #include "sendf.h"
#include "rawstr.h" #include "rawstr.h"
#include "warnless.h"
#include "curl_base64.h" #include "curl_base64.h"
#include "http_negotiate.h" #include "http_negotiate.h"
#include "curl_memory.h" #include "curl_memory.h"
@ -189,7 +190,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
out_buff_desc.cBuffers = 1; out_buff_desc.cBuffers = 1;
out_buff_desc.pBuffers = &out_sec_buff; out_buff_desc.pBuffers = &out_sec_buff;
out_sec_buff.cbBuffer = neg_ctx->max_token_length; out_sec_buff.cbBuffer = curlx_uztoul(neg_ctx->max_token_length);
out_sec_buff.BufferType = SECBUFFER_TOKEN; out_sec_buff.BufferType = SECBUFFER_TOKEN;
out_sec_buff.pvBuffer = neg_ctx->output_token; out_sec_buff.pvBuffer = neg_ctx->output_token;
@ -199,7 +200,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
in_buff_desc.cBuffers = 1; in_buff_desc.cBuffers = 1;
in_buff_desc.pBuffers = &in_sec_buff; in_buff_desc.pBuffers = &in_sec_buff;
in_sec_buff.cbBuffer = input_token_len; in_sec_buff.cbBuffer = curlx_uztoul(input_token_len);
in_sec_buff.BufferType = SECBUFFER_TOKEN; in_sec_buff.BufferType = SECBUFFER_TOKEN;
in_sec_buff.pvBuffer = input_token; in_sec_buff.pvBuffer = input_token;
} }

20
lib/warnless.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -174,6 +174,24 @@ int curlx_uztosi(size_t uznum)
#endif #endif
} }
/*
** unsigned size_t to unsigned long
*/
unsigned long curlx_uztoul(size_t uznum)
{
#ifdef __INTEL_COMPILER
# pragma warning(push)
# pragma warning(disable:810) /* conversion may lose significant bits */
#endif
return (unsigned long)(uznum & (size_t) CURL_MASK_ULONG);
#ifdef __INTEL_COMPILER
# pragma warning(pop)
#endif
}
/* /*
** signed long to signed int ** signed long to signed int
*/ */

4
lib/warnless.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -28,6 +28,8 @@ unsigned char curlx_ultouc(unsigned long ulnum);
int curlx_uztosi(size_t uznum); int curlx_uztosi(size_t uznum);
unsigned long curlx_uztoul(size_t uznum);
int curlx_sltosi(long slnum); int curlx_sltosi(long slnum);
unsigned int curlx_sltoui(long slnum); unsigned int curlx_sltoui(long slnum);