Commit a7999da3 authored by Steve Holme's avatar Steve Holme
Browse files

tool_getparam.c: Fixed compilation warnings 

There is an implicit conversion from "unsigned long" to "long"
parent 415c982a

lib/warnless.c

+19 −0
Original line number Diff line number Diff line
@@ -174,6 +174,25 @@ int curlx_ultosi(unsigned long ulnum) 
#endif

}



/*

** unsigned size_t to signed curl_off_t

*/



curl_off_t curlx_uztoso(size_t uznum)

{

#ifdef __INTEL_COMPILER

#  pragma warning(push)

#  pragma warning(disable:810) /* conversion may lose significant bits */

#endif



  DEBUGASSERT(uznum <= (size_t) CURL_MASK_SCOFFT);

  return (curl_off_t)(uznum & (size_t) CURL_MASK_SCOFFT);



#ifdef __INTEL_COMPILER

#  pragma warning(pop)

#endif

}



/*

** unsigned size_t to signed int

*/

lib/warnless.h

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ int curlx_ultosi(unsigned long ulnum); 


int curlx_uztosi(size_t uznum);



curl_off_t curlx_uztoso(size_t uznum);



unsigned long curlx_uztoul(size_t uznum);



unsigned int curlx_uztoui(size_t uznum);

src/tool_getparam.c

+2 −2
Original line number Diff line number Diff line
@@ -1239,7 +1239,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ 
           &-letter */

        char *oldpost = config->postfields;

        curl_off_t oldlen = config->postfieldsize;

        curl_off_t newlen = oldlen + size + 2;

        curl_off_t newlen = oldlen + curlx_uztoso(size) + 2;

        config->postfields = malloc((size_t)newlen);

        if(!config->postfields) {

          Curl_safefree(oldpost);
@@ -1257,7 +1257,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ 
      }

      else {

        config->postfields = postdata;

        config->postfieldsize = size;

        config->postfieldsize = curlx_uztoso(size);

      }

    }

    /*