diff options
Diffstat (limited to 'libio/iogetline.c')
| -rw-r--r-- | libio/iogetline.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libio/iogetline.c b/libio/iogetline.c index 119b7862af..8deeacee08 100644 --- a/libio/iogetline.c +++ b/libio/iogetline.c @@ -27,8 +27,8 @@ #include "libioP.h" #include <string.h> -_IO_size_t -_IO_getline (_IO_FILE *fp, char *buf, _IO_size_t n, int delim, +size_t +_IO_getline (FILE *fp, char *buf, size_t n, int delim, int extract_delim) { return _IO_getline_info (fp, buf, n, delim, extract_delim, (int *) 0); @@ -43,8 +43,8 @@ libc_hidden_def (_IO_getline) If extract_delim < 0, leave delimiter unread. If extract_delim > 0, insert delim in output. */ -_IO_size_t -_IO_getline_info (_IO_FILE *fp, char *buf, _IO_size_t n, int delim, +size_t +_IO_getline_info (FILE *fp, char *buf, size_t n, int delim, int extract_delim, int *eof) { char *ptr = buf; @@ -54,7 +54,7 @@ _IO_getline_info (_IO_FILE *fp, char *buf, _IO_size_t n, int delim, _IO_fwide (fp, -1); while (n != 0) { - _IO_ssize_t len = fp->_IO_read_end - fp->_IO_read_ptr; + ssize_t len = fp->_IO_read_end - fp->_IO_read_ptr; if (len <= 0) { int c = __uflow (fp); @@ -80,12 +80,12 @@ _IO_getline_info (_IO_FILE *fp, char *buf, _IO_size_t n, int delim, else { char *t; - if ((_IO_size_t) len >= n) + if ((size_t) len >= n) len = n; t = (char *) memchr ((void *) fp->_IO_read_ptr, delim, len); if (t != NULL) { - _IO_size_t old_len = ptr-buf; + size_t old_len = ptr-buf; len = t - fp->_IO_read_ptr; if (extract_delim >= 0) { |