Use helper function empty_string() instead of manual checks

For code consistency, substitute boolean expressions:
 s && *s     -> !empty_string(s)
 s && s[0]   -> !empty_string(s)
 !s || !*s   ->  empty_string(s)
 !s || !s[0] ->  empty_string(s)

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-01-07 15:42:28 +01:00 committed by Lubomir I. Ivanov
parent e85ecdd925
commit 6a07ccbad2
8 changed files with 11 additions and 11 deletions

View file

@ -561,7 +561,7 @@ int parse_txt_file(const char *filename, const char *csv)
cur_cylinder_index++;
lineptr = strstr(memtxt.buffer, "Dive started at");
while (lineptr && *lineptr && (lineptr = strchr(lineptr, '\n')) && ++lineptr) {
while (!empty_string(lineptr) && (lineptr = strchr(lineptr, '\n')) && ++lineptr) {
key = next_mkvi_key(lineptr);
if (!key)
break;