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

tweaks: rearrange a function in my style, and rename a variable

master
Benno Schulenberg 2016-07-04 20:51:11 +02:00
parent 7e3a9c3aa6
commit ccfb1eb0f1
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/utils.c
View File

@ -81,28 +81,24 @@ bool parse_num(const char *str, ssize_t *val)
* *line and *column. Return FALSE on error, and TRUE otherwise. */
bool parse_line_column(const char *str, ssize_t *line, ssize_t *column)
{
bool retval = TRUE;
const char *comma;
bool retval;
char *firstpart;
const char *comma = strchr(str, ',');
assert(str != NULL);
if (comma == NULL)
return parse_num(str, line);
comma = strchr(str, ',');
if (!parse_num(comma + 1, column))
return FALSE;
if (comma != NULL) {
if (!parse_num(comma + 1, column))
return FALSE;
}
if (comma == str)
return TRUE;
if (comma != NULL) {
char *str_line = mallocstrncpy(NULL, str, comma - str + 1);
str_line[comma - str] = '\0';
firstpart = strdup(str);
firstpart[comma - str] = '\0';
if (str_line[0] != '\0' && !parse_num(str_line, line))
retval = FALSE;
free(str_line);
} else
return parse_num(str, line);
retval = parse_num(firstpart, line);
free(firstpart);
return retval;
}