diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-07-25 00:38:27 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-07-25 00:38:27 +0000 |
| commit | a64e8af15015e277914970bde5062735b9506cad (patch) | |
| tree | 6a6725e278180ad9c377b25a0d3e171516ff92b4 /libio/iogetwline.c | |
| parent | 33101abcb858b81ca3f70709b4e7e3679add93de (diff) | |
| download | glibc-a64e8af15015e277914970bde5062735b9506cad.tar.gz glibc-a64e8af15015e277914970bde5062735b9506cad.tar.xz glibc-a64e8af15015e277914970bde5062735b9506cad.zip | |
Update.
2000-07-24 Ulrich Drepper <drepper@redhat.com> * libio/iogetwline.c (_IO_getwline_info): Use wide character string functions.
Diffstat (limited to 'libio/iogetwline.c')
| -rw-r--r-- | libio/iogetwline.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libio/iogetwline.c b/libio/iogetwline.c index 402158a4ef..b7f111586a 100644 --- a/libio/iogetwline.c +++ b/libio/iogetwline.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU IO Library. This library is free software; you can redistribute it and/or @@ -91,8 +91,7 @@ _IO_getwline_info (fp, buf, n, delim, extract_delim, eof) wchar_t *t; if ((_IO_size_t) len >= n) len = n; - t = (wchar_t *) memchr ((void *) fp->_wide_data->_IO_read_ptr, - delim, len); + t = wmemchr ((void *) fp->_wide_data->_IO_read_ptr, delim, len); if (t != NULL) { _IO_size_t old_len = ptr - buf; @@ -103,12 +102,12 @@ _IO_getwline_info (fp, buf, n, delim, extract_delim, eof) if (extract_delim > 0) ++len; } - memcpy ((void *) ptr, (void *) fp->_wide_data->_IO_read_ptr, - len); + wmemcpy ((void *) ptr, (void *) fp->_wide_data->_IO_read_ptr, + len); fp->_wide_data->_IO_read_ptr = t; return old_len + len; } - memcpy ((void *) ptr, (void *) fp->_wide_data->_IO_read_ptr, len); + wmemcpy ((void *) ptr, (void *) fp->_wide_data->_IO_read_ptr, len); fp->_wide_data->_IO_read_ptr += len; ptr += len; n -= len; |