luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tool_paramhlp: make the max argument a 'double'

Browse Source 
To fix compiler warnings "Implicit conversion from 'long' to 'double'
may lose precision"

Closes #9700
This commit is contained in:
Rickard Hallerbäck 2022-10-13 18:50:57 +02:00 committed by Daniel Stenberg
parent 1de60b18de
commit 703efb3379
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tool_getparam.c
View File

@ -808,7 +808,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
break;
case 'c': /* connect-timeout */
err = str2udouble(&config->connecttimeout, nextarg,
LONG_MAX/1000);
(double)LONG_MAX/1000);
if(err)
return err;
break;
@ -1374,7 +1374,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
return err;
break;
case 'R': /* --expect100-timeout */
err = str2udouble(&config->expect100timeout, nextarg, LONG_MAX/1000);
err = str2udouble(&config->expect100timeout, nextarg,
(double)LONG_MAX/1000);
if(err)
return err;
break;
@ -2067,7 +2068,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
break;
case 'm':
/* specified max time */
err = str2udouble(&config->timeout, nextarg, LONG_MAX/1000);
err = str2udouble(&config->timeout, nextarg, (double)LONG_MAX/1000);
if(err)
return err;
break;

4
src/tool_paramhlp.c
View File

@ -218,7 +218,7 @@ ParameterError str2unummax(long *val, const char *str, long max)
* data.
*/
static ParameterError str2double(double *val, const char *str, long max)
static ParameterError str2double(double *val, const char *str, double max)
{
if(str) {
char *endptr;
@ -251,7 +251,7 @@ static ParameterError str2double(double *val, const char *str, long max)
* data.
*/
ParameterError str2udouble(double *valp, const char *str, long max)
ParameterError str2udouble(double *valp, const char *str, double max)
{
double value;
ParameterError result = str2double(&value, str, max);

2
src/tool_paramhlp.h
View File

@ -36,7 +36,7 @@ ParameterError str2num(long *val, const char *str);
ParameterError str2unum(long *val, const char *str);
ParameterError oct2nummax(long *val, const char *str, long max);
ParameterError str2unummax(long *val, const char *str, long max);
ParameterError str2udouble(double *val, const char *str, long max);
ParameterError str2udouble(double *val, const char *str, double max);
ParameterError proto2num(struct OperationConfig *config,
const char * const *val, char **obuf,