diff options
| author | Tim Janik <timj@gtk.org> | 1998-10-25 06:44:49 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-10-25 06:44:49 +0000 |
| commit | e86746f168529218742af51365155a5034c8f9c8 (patch) | |
| tree | 61db6ccf71d4c23a968e717f4ec27d406014d3b2 /gscanner.c | |
| parent | 36ab1965234ce32f170de5157398c47f1f2ac4ec (diff) | |
| download | glib-e86746f168529218742af51365155a5034c8f9c8.tar.gz | |
no more characters are available if read() returns anything less than 1,
Sun Oct 25 07:30:10 1998 Tim Janik <timj@gtk.org>
* gscanner.c:
(g_scanner_peek_next_char):
(g_scanner_get_char): no more characters are available if read() returns
anything less than 1, not only on 0 return.
* glib.h:
* gstrfuncs.c: final API cleanup of string arrays to suit sopwith's
argument order requirements.
(g_strsplit): renamed from g_str_array_split().
(g_strjoinv): renamed from g_str_array_joinv(), string array is
now passed as last parameter. removed `const' qualifier from string
array pointer (again).
(g_strjoin): new function from sopwith to concatenate strings with
an additional seperator.
(g_strfreev): renamed from g_str_array_free.
Diffstat (limited to 'gscanner.c')
| -rw-r--r-- | gscanner.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gscanner.c b/gscanner.c index 164cd9c8c..b73ca4c1b 100644 --- a/gscanner.c +++ b/gscanner.c @@ -711,7 +711,7 @@ g_scanner_peek_next_char (GScanner *scanner) } while (count == -1 && (errno == EINTR || errno == EAGAIN)); - if (!count) + if (count < 1) { scanner->input_fd = -1; @@ -750,7 +750,7 @@ g_scanner_get_char (GScanner *scanner, } while (count == -1 && (errno == EINTR || errno == EAGAIN)); - if (!count) + if (count < 1) { scanner->input_fd = -1; fchar = 0; |