diff options
author | Ulrich Drepper <drepper@redhat.com> | 2000-05-28 18:32:20 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2000-05-28 18:32:20 +0000 |
commit | 7163e69e10f3bbbe71a416d15e66eac16c852d27 (patch) | |
tree | f9f24400eca60cf5f6b49e92fb8e6b62a8b3195b /libio/iosetbuffer.c | |
parent | 1ef9f0b673cc36f307161d653d4305dee8da00f9 (diff) | |
download | glibc-7163e69e10f3bbbe71a416d15e66eac16c852d27.zip glibc-7163e69e10f3bbbe71a416d15e66eac16c852d27.tar.gz glibc-7163e69e10f3bbbe71a416d15e66eac16c852d27.tar.bz2 |
Update.
2000-05-21 Jakub Jelinek <jakub@redhat.com>
* libio/libioP.h (_IO_CHECK_WIDE): Define.
* libio/iosetbuffer.c (_IO_setbuffer): Use it.
Call _IO_WSETBUF even for _mode 1.
* libio/iosetvbuf.c (_IO_setvbuf): Likewise.
* libio/fileops.c (_IO_new_file_fopen): Return NULL if
_IO_CHECK_WIDE fails.
Diffstat (limited to 'libio/iosetbuffer.c')
-rw-r--r-- | libio/iosetbuffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libio/iosetbuffer.c b/libio/iosetbuffer.c index 852a2dd..99738a7 100644 --- a/libio/iosetbuffer.c +++ b/libio/iosetbuffer.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 95, 96, 97, 98, 99 Free Software Foundation, Inc. +/* Copyright (C) 1993, 95, 96, 97, 98, 99, 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 @@ -32,13 +32,13 @@ _IO_setbuffer (fp, buf, size) _IO_size_t size; { CHECK_FILE (fp, ); - _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); + _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, fp); _IO_flockfile (fp); fp->_flags &= ~_IO_LINE_BUF; if (!buf) size = 0; (void) _IO_SETBUF (fp, buf, size); - if (fp->_vtable_offset == 0 && fp->_mode == 0) + if (fp->_vtable_offset == 0 && fp->_mode == 0 && _IO_CHECK_WIDE (fp)) /* We also have to set the buffer using the wide char function. */ (void) _IO_WSETBUF (fp, buf, size); _IO_funlockfile (fp); |