p
/
liberty
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve read_line() 

One less useless boolean variable.
This commit is contained in:
Přemysl Eric Janouch 2017-06-07 20:22:14 +02:00
parent ec128558a4
commit 412100289e
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
liberty.c
View File

@ -3040,23 +3040,19 @@ xstrtoul (unsigned long *out, const char *s, int base)
} }
static bool static bool
read_line (FILE *fp, struct str *s) read_line (FILE *fp, struct str *line)
{ {
str_reset (line);
int c; int c;
bool at_end = true; while ((c = fgetc (fp)) != '\n')
str_reset (s);
while ((c = fgetc (fp)) != EOF)
{ {
at_end = false; if (c == EOF)
if (c == '\r') return line->len != 0;
continue; if (c != '\r')
if (c == '\n') str_append_c (line, c);
break;
str_append_c (s, c);
} }
return true;
return !at_end;
} }
static char * static char *