diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2015-08-11 13:05:46 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2015-08-11 13:05:46 +0000 |
| commit | af52480aabcb700c9bf68989a5e6c648d22f9945 (patch) | |
| tree | 17ee2ecab281cfb16d0a622d7adf6ae4ce385cfa /Str.c | |
| parent | Update ChangeLog (diff) | |
| parent | Check for presence of prevl before using (diff) | |
| download | w3m-af52480aabcb700c9bf68989a5e6c648d22f9945.tar.gz w3m-af52480aabcb700c9bf68989a5e6c648d22f9945.zip | |
Merge branch 'bug/sw3m'
Diffstat (limited to 'Str.c')
| -rw-r--r-- | Str.c | 14 |
1 files changed, 4 insertions, 10 deletions
@@ -530,11 +530,8 @@ Str Strfgets(FILE * f) { Str s = Strnew(); - char c; - while (1) { - c = fgetc(f); - if (feof(f) || ferror(f)) - break; + int c; + while ((c = fgetc(f)) != EOF) { Strcat_char(s, c); if (c == '\n') break; @@ -546,11 +543,8 @@ Str Strfgetall(FILE * f) { Str s = Strnew(); - char c; - while (1) { - c = fgetc(f); - if (feof(f) || ferror(f)) - break; + int c; + while ((c = fgetc(f)) != EOF) { Strcat_char(s, c); } return s; |