romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-23 17:27:22 +03:00
Code Issues Projects Releases Packages Wiki Activity

atoi: remove atoi usage

Browse source
This commit is contained in:
Yang Tse 2010-11-28 23:11:14 +01:00
parent cbe67a1b71
commit 5db0a412ff
12 changed files with 36 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/main.c
View file

@ -1509,12 +1509,15 @@ static void cleanarg(char *str)
static int str2num(long *val, const char *str)
{
int retcode = 0;
if(str && ISDIGIT(*str))
*val = atoi(str);
else
retcode = 1; /* badness */
return retcode;
if(str && ISDIGIT(*str)) {
char *endptr;
long num = strtol(str, &endptr, 10);
if((endptr != str) && (endptr == str + strlen(str))) {
*val = num;
return 0; /* Ok */
}
}
return 1; /* badness */
}
/*
@ -3711,7 +3714,12 @@ void progressbarinit(struct ProgressData *bar,
* we're using our own way to determine screen width */
colp = curlx_getenv("COLUMNS");
if(colp != NULL) {
bar->width = atoi(colp);
char *endptr;
long num = strtol(colp, &endptr, 10);
if((endptr != colp) && (endptr == colp + strlen(colp)) && (num > 0))
bar->width = (int)num;
else
bar->width = 79;
curl_free(colp);
}
else
@ -4513,7 +4521,10 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
}
env = curlx_getenv("CURL_MEMLIMIT");
if(env) {
curl_memlimit(atoi(env));
char *endptr;
long num = strtol(env, &endptr, 10);
if((endptr != env) && (endptr == env + strlen(env)) && (num > 0))
curl_memlimit(num);
curl_free(env);
}
#endif