mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 08:08:50 -05:00
add_buffer_send: fix compiler warning
Win64's 32 bit long but 64 bit size_t caused a warning that we avoid with a typecast. A small whitespace indent fix was also applied. Reported by: Adam Light
This commit is contained in:
parent
7738b15977
commit
6d2ccfed48
16
lib/http.c
16
lib/http.c
@ -978,10 +978,13 @@ Curl_send_buffer *Curl_add_buffer_init(void)
|
|||||||
*/
|
*/
|
||||||
CURLcode Curl_add_buffer_send(Curl_send_buffer *in,
|
CURLcode Curl_add_buffer_send(Curl_send_buffer *in,
|
||||||
struct connectdata *conn,
|
struct connectdata *conn,
|
||||||
long *bytes_written, /* add the number of sent bytes
|
|
||||||
to this counter */
|
/* add the number of sent bytes to this
|
||||||
size_t included_body_bytes, /* how much of the buffer
|
counter */
|
||||||
contains body data */
|
long *bytes_written,
|
||||||
|
|
||||||
|
/* how much of the buffer contains body data */
|
||||||
|
size_t included_body_bytes,
|
||||||
int socketindex)
|
int socketindex)
|
||||||
|
|
||||||
{
|
{
|
||||||
@ -1069,7 +1072,10 @@ CURLcode Curl_add_buffer_send(Curl_send_buffer *in,
|
|||||||
accordingly */
|
accordingly */
|
||||||
http->writebytecount += bodylen;
|
http->writebytecount += bodylen;
|
||||||
|
|
||||||
*bytes_written += amount;
|
/* 'amount' can never be a very large value here so typecasting it so a
|
||||||
|
signed 31 bit value should not cause problems even if ssize_t is
|
||||||
|
64bit */
|
||||||
|
*bytes_written += (long)amount;
|
||||||
|
|
||||||
if(http) {
|
if(http) {
|
||||||
if((size_t)amount != size) {
|
if((size_t)amount != size) {
|
||||||
|
@ -61,7 +61,6 @@ CURLcode Curl_add_buffer_send(Curl_send_buffer *in,
|
|||||||
size_t included_body_bytes,
|
size_t included_body_bytes,
|
||||||
int socketindex);
|
int socketindex);
|
||||||
|
|
||||||
|
|
||||||
CURLcode Curl_add_timecondition(struct SessionHandle *data,
|
CURLcode Curl_add_timecondition(struct SessionHandle *data,
|
||||||
Curl_send_buffer *buf);
|
Curl_send_buffer *buf);
|
||||||
CURLcode Curl_add_custom_headers(struct connectdata *conn,
|
CURLcode Curl_add_custom_headers(struct connectdata *conn,
|
||||||
|
Loading…
Reference in New Issue
Block a user