Commit 6d2ccfed authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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
parent 7738b159

lib/http.c

+14 −8
Original line number Diff line number Diff line
@@ -978,10 +978,13 @@ Curl_send_buffer *Curl_add_buffer_init(void) 
 */

CURLcode Curl_add_buffer_send(Curl_send_buffer *in,

                              struct connectdata *conn,

                         long *bytes_written, /* add the number of sent bytes

                                                 to this counter */

                         size_t included_body_bytes, /* how much of the buffer

                                                        contains body data */



                               /* add the number of sent bytes to this

                                  counter */

                              long *bytes_written,



                               /* how much of the buffer contains body data */

                              size_t included_body_bytes,

                              int socketindex)



{
@@ -1069,7 +1072,10 @@ CURLcode Curl_add_buffer_send(Curl_send_buffer *in, 
         accordingly */

      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((size_t)amount != size) {

lib/http.h

+4 −5
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ CURLcode Curl_add_buffer_send(Curl_send_buffer *in, 
                              size_t included_body_bytes,

                              int socketindex);





CURLcode Curl_add_timecondition(struct SessionHandle *data,

                                Curl_send_buffer *buf);

CURLcode Curl_add_custom_headers(struct connectdata *conn,