Commit 9dbd6659 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

more typecasts to please picky compilers

parent 5ddad4cd

lib/ftp.c

+1 −1
Original line number Diff line number Diff line
@@ -1690,7 +1690,7 @@ CURLcode Curl_ftp_nextconnect(struct connectdata *conn) 
          if(readthisamountnow > BUFSIZE)

            readthisamountnow = BUFSIZE;



          actuallyread =

          actuallyread = (curl_off_t)

            conn->fread(data->state.buffer, 1, (size_t)readthisamountnow,

                        conn->fread_in);

lib/progress.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ int Curl_pgrsUpdate(struct connectdata *conn) 
        /* the 'amount' value is bigger than would fit in 32 bits if

           multiplied with 1000, so we use the double math for this */

        data->progress.current_speed = (curl_off_t)

          ((double)amount/(span_ms/1000.0));

          ((double)amount/((double)span_ms/1000.0));

      else

        /* the 'amount' value is small enough to fit within 32 bits even

           when multiplied with 1000 */

lib/transfer.c

+4 −2
Original line number Diff line number Diff line
@@ -137,7 +137,9 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp) 
    conn->upload_fromhere += 10; /* 32bit hex + CRLF */

  }



  nread = conn->fread(conn->upload_fromhere, 1,

  /* this function returns a size_t, so we typecast to int to prevent warnings

     with picky compilers */

  nread = (int)conn->fread(conn->upload_fromhere, 1,

                           buffersize, conn->fread_in);



  if(nread == CURL_READFUNC_ABORT) {

src/main.c

+6 −2
Original line number Diff line number Diff line
@@ -2279,7 +2279,9 @@ static int my_fwrite(void *buffer, size_t sz, size_t nmemb, void *stream) 
  int rc;

  struct OutStruct *out=(struct OutStruct *)stream;

  struct Configurable *config = out->config;

  curl_off_t size = sz * nmemb;

  curl_off_t size = (curl_off_t)(sz * nmemb); /* typecast to prevent

                                                 warnings when converting from

                                                 unsigned to signed */

  if(out && !out->stream) {

    /* open file for writing */

    out->stream=fopen(out->filename, "wb");
@@ -2354,7 +2356,9 @@ static int my_fread(void *buffer, size_t sz, size_t nmemb, void *userp) 
{

  struct InStruct *in=(struct InStruct *)userp;

  struct Configurable *config = in->config;

  curl_off_t size = sz * nmemb;

  curl_off_t size = (curl_off_t)(sz * nmemb);  /* typecast to prevent warnings

                                                  when converting from

                                                  unsigned to signed */



  if(config->sendpersecond) {

    /*