ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: rename two variables, and always pass a valid result back 

What is the point of parsing a number when you're not interested in
the result?  All callers of parse_num() pass a container for it.
master
Benno Schulenberg 2017-01-11 19:15:45 +01:00
parent 16a7fd4bfc
commit ea40765904
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/utils.c
View File

@ -85,25 +85,22 @@ int digits(ssize_t n)
}
#endif
/* Read a ssize_t from str, and store it in *val (if val is not NULL).
* On error, we return FALSE and don't change *val. Otherwise, we
* return TRUE. */
bool parse_num(const char *str, ssize_t *val)
/* Read an integer from str. If it parses okay, store it in *result
* and return TRUE; otherwise, return FALSE. */
bool parse_num(const char *str, ssize_t *result)
{
char *first_error;
ssize_t j;
ssize_t value;
/* The manual page for strtol() says this is required, and
* it looks like it is! */
/* The manual page for strtol() says this is required. */
errno = 0;
j = (ssize_t)strtol(str, &first_error, 10);
value = (ssize_t)strtol(str, &first_error, 10);
if (errno == ERANGE || *str == '\0' || *first_error != '\0')
return FALSE;
if (val != NULL)
*val = j;
*result = value;
return TRUE;
}