From a68b0d31a37a86785b3dbeeee3fad96ee71fadcd Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 2 Oct 1996 01:40:17 +0000 Subject: update from main archive 961001 --- libio/clearerr_u.c | 4 +--- libio/fgetc.c | 2 +- libio/fputc.c | 2 +- libio/fputc_u.c | 4 +--- libio/freopen.c | 2 +- libio/fseek.c | 2 +- libio/genops.c | 4 ++-- libio/getc.c | 2 +- libio/getc_u.c | 4 +--- libio/getchar.c | 3 ++- libio/getchar_u.c | 4 +--- libio/iofclose.c | 4 ++-- libio/iofflush.c | 4 +++- libio/iofflush_u.c | 6 ++---- libio/iofgetpos.c | 2 +- libio/iofgets.c | 5 +++-- libio/iofputs.c | 2 +- libio/iofread.c | 2 +- libio/iofsetpos.c | 2 +- libio/ioftell.c | 2 +- libio/iofwrite.c | 2 +- libio/iogetdelim.c | 2 +- libio/iogetline.c | 4 ++-- libio/iogets.c | 3 ++- libio/ioputs.c | 3 ++- libio/iosetbuffer.c | 2 +- libio/iosetvbuf.c | 2 +- libio/ioungetc.c | 2 +- libio/putc.c | 2 +- libio/putchar.c | 3 ++- libio/rewind.c | 4 ++-- libio/strops.c | 12 ++++++------ 32 files changed, 50 insertions(+), 53 deletions(-) (limited to 'libio') diff --git a/libio/clearerr_u.c b/libio/clearerr_u.c index 4c8b6c29bd..189f38d515 100644 --- a/libio/clearerr_u.c +++ b/libio/clearerr_u.c @@ -20,11 +20,9 @@ Boston, MA 02111-1307, USA. */ #include "stdio.h" void -__clearerr_unlocked (fp) +clearerr_unlocked (fp) FILE *fp; { CHECK_FILE (fp, /*nothing*/); _IO_clearerr (fp); } - -weak_alias (__clearerr_unlocked, clearerr_unlocked) diff --git a/libio/fgetc.c b/libio/fgetc.c index 07fd89a516..a754c4b78b 100644 --- a/libio/fgetc.c +++ b/libio/fgetc.c @@ -31,7 +31,7 @@ fgetc (fp) { int result; CHECK_FILE (fp, EOF); - __libc_cleanup_region_start (_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); result = _IO_getc_unlocked (fp); __libc_cleanup_region_end (1); diff --git a/libio/fputc.c b/libio/fputc.c index bd871ab047..865ac8cde0 100644 --- a/libio/fputc.c +++ b/libio/fputc.c @@ -32,7 +32,7 @@ fputc (c, fp) { int result; CHECK_FILE (fp, EOF); - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); result = _IO_putc_unlocked (c, fp); __libc_cleanup_region_end (1); diff --git a/libio/fputc_u.c b/libio/fputc_u.c index 97e4d94eb3..bc2cc2efb6 100644 --- a/libio/fputc_u.c +++ b/libio/fputc_u.c @@ -28,12 +28,10 @@ the executable file might be covered by the GNU General Public License. */ #undef fputc_unlocked int -__fputc_unlocked (c, fp) +fputc_unlocked (c, fp) int c; _IO_FILE *fp; { CHECK_FILE (fp, EOF); return _IO_putc_unlocked (c, fp); } - -weak_alias (__fputc_unlocked, fputc_unlocked) diff --git a/libio/freopen.c b/libio/freopen.c index 5821e84c6f..0b782dd770 100644 --- a/libio/freopen.c +++ b/libio/freopen.c @@ -35,7 +35,7 @@ freopen (filename, mode, fp) CHECK_FILE (fp, NULL); if (!(fp->_flags & _IO_IS_FILEBUF)) return NULL; - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); result = _IO_freopen (filename, mode, fp); __libc_cleanup_region_end (1); diff --git a/libio/fseek.c b/libio/fseek.c index c33927a95f..61f2e9205e 100644 --- a/libio/fseek.c +++ b/libio/fseek.c @@ -33,7 +33,7 @@ fseek (fp, offset, whence) { int result; CHECK_FILE (fp, -1); - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); result = _IO_fseek (fp, offset, whence); __libc_cleanup_region_end (1); diff --git a/libio/genops.c b/libio/genops.c index 7c2dcba7b4..bd741ec66e 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -329,7 +329,7 @@ DEFUN(_IO_default_xsputn, (f, data, n), _IO_ssize_t count = f->_IO_write_end - f->_IO_write_ptr; /* Space available. */ if (count > 0) { - if (count > more) + if ((_IO_size_t) count > more) count = more; if (count > 20) { @@ -374,7 +374,7 @@ DEFUN(_IO_default_xsgetn, (fp, data, n), _IO_ssize_t count = fp->_IO_read_end - fp->_IO_read_ptr; /* Data available. */ if (count > 0) { - if (count > more) + if ((_IO_size_t) count > more) count = more; if (count > 20) { diff --git a/libio/getc.c b/libio/getc.c index 82e5756ad3..c345e44ca6 100644 --- a/libio/getc.c +++ b/libio/getc.c @@ -33,7 +33,7 @@ getc (fp) { int result; CHECK_FILE (fp, EOF); - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); result = _IO_getc_unlocked (fp); __libc_cleanup_region_end (1); diff --git a/libio/getc_u.c b/libio/getc_u.c index 4aa5cd5ccd..569e063b1f 100644 --- a/libio/getc_u.c +++ b/libio/getc_u.c @@ -28,11 +28,9 @@ the executable file might be covered by the GNU General Public License. */ #undef getc_unlocked int -__getc_unlocked (fp) +getc_unlocked (fp) FILE *fp; { CHECK_FILE (fp, EOF); return _IO_getc_unlocked (fp); } - -weak_alias (__getc_unlocked, getc_unlocked) diff --git a/libio/getchar.c b/libio/getchar.c index e7a236cf2e..d54ec58c1e 100644 --- a/libio/getchar.c +++ b/libio/getchar.c @@ -31,7 +31,8 @@ int getchar () { int result; - __libc_cleanup_region_start (&_IO_funlockfile, stdin); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, + stdin); _IO_flockfile (stdin); result = _IO_getc_unlocked (stdin); __libc_cleanup_region_end (1); diff --git a/libio/getchar_u.c b/libio/getchar_u.c index 0430f8119c..337f693709 100644 --- a/libio/getchar_u.c +++ b/libio/getchar_u.c @@ -28,9 +28,7 @@ the executable file might be covered by the GNU General Public License. */ #undef getchar_unlocked int -__getchar_unlocked () +getchar_unlocked () { return _IO_getc_unlocked (stdin); } - -weak_alias (__getchar_unlocked, getchar_unlocked) diff --git a/libio/iofclose.c b/libio/iofclose.c index 9d537377a4..77c7b50088 100644 --- a/libio/iofclose.c +++ b/libio/iofclose.c @@ -35,19 +35,19 @@ _IO_fclose (fp) CHECK_FILE(fp, EOF); - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); if (fp->_IO_file_flags & _IO_IS_FILEBUF) status = _IO_file_close_it (fp); else status = fp->_flags & _IO_ERR_SEEN ? -1 : 0; _IO_FINISH (fp); + __libc_cleanup_region_end (1); if (fp != _IO_stdin && fp != _IO_stdout && fp != _IO_stderr) { fp->_IO_file_flags = 0; free(fp); } - __libc_cleanup_region_end (1); return status; } diff --git a/libio/iofflush.c b/libio/iofflush.c index cbc5b1f6d7..385c9629eb 100644 --- a/libio/iofflush.c +++ b/libio/iofflush.c @@ -23,6 +23,7 @@ This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ #include "libioP.h" +#include int _IO_fflush (fp) @@ -34,7 +35,8 @@ _IO_fflush (fp) { int result; CHECK_FILE (fp, EOF); - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, + fp); _IO_flockfile (fp); result = _IO_SYNC (fp) ? EOF : 0; __libc_cleanup_region_end (1); diff --git a/libio/iofflush_u.c b/libio/iofflush_u.c index b7a91952b4..b8af7101a1 100644 --- a/libio/iofflush_u.c +++ b/libio/iofflush_u.c @@ -23,9 +23,10 @@ This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ #include "libioP.h" +#include int -_IO_fflush_unlocked (fp) +fflush_unlocked (fp) register _IO_FILE *fp; { if (fp == NULL) @@ -36,6 +37,3 @@ _IO_fflush_unlocked (fp) return _IO_SYNC (fp) ? EOF : 0; } } - -weak_alias (_IO_fflush_unlocked, fflush_unlocked) - diff --git a/libio/iofgetpos.c b/libio/iofgetpos.c index 4cec7a73d8..07128c16a3 100644 --- a/libio/iofgetpos.c +++ b/libio/iofgetpos.c @@ -33,7 +33,7 @@ _IO_fgetpos (fp, posp) { _IO_fpos_t pos; CHECK_FILE (fp, EOF); - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); pos = _IO_seekoff (fp, 0, _IO_seek_cur, 0); __libc_cleanup_region_end (1); diff --git a/libio/iofgets.c b/libio/iofgets.c index 4d4ce5c726..71d677c161 100644 --- a/libio/iofgets.c +++ b/libio/iofgets.c @@ -1,5 +1,5 @@ /* -Copyright (C) 1993, 1995 Free Software Foundation +Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc. This file is part of the GNU IO Library. This library is free software; you can redistribute it and/or modify it under the @@ -23,6 +23,7 @@ This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ #include "libioP.h" +#include char* _IO_fgets (buf, n, fp) @@ -35,7 +36,7 @@ _IO_fgets (buf, n, fp) CHECK_FILE (fp, NULL); if (n <= 0) return NULL; - __libc_cleanup_region_start (&__funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); __flockfile (fp); count = _IO_getline (fp, buf, n - 1, '\n', 1); if (count == 0 || (fp->_IO_file_flags & _IO_ERR_SEEN)) diff --git a/libio/iofputs.c b/libio/iofputs.c index a9fd5f29a3..6e94223a5c 100644 --- a/libio/iofputs.c +++ b/libio/iofputs.c @@ -33,7 +33,7 @@ _IO_fputs (str, fp) _IO_size_t len = strlen (str); int result; CHECK_FILE (fp, EOF); - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); if (_IO_sputn (fp, str, len) != len) result = EOF; diff --git a/libio/iofread.c b/libio/iofread.c index af6bc33f24..8610b0c87c 100644 --- a/libio/iofread.c +++ b/libio/iofread.c @@ -36,7 +36,7 @@ _IO_fread (buf, size, count, fp) CHECK_FILE (fp, 0); if (bytes_requested == 0) return 0; - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); bytes_read = _IO_sgetn (fp, (char *) buf, bytes_requested); __libc_cleanup_region_end (1); diff --git a/libio/iofsetpos.c b/libio/iofsetpos.c index 9013606e72..52700f70bc 100644 --- a/libio/iofsetpos.c +++ b/libio/iofsetpos.c @@ -32,7 +32,7 @@ _IO_fsetpos (fp, posp) { int result; CHECK_FILE (fp, EOF); - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); if (_IO_seekpos (fp, *posp, _IOS_INPUT|_IOS_OUTPUT) == _IO_pos_BAD) { diff --git a/libio/ioftell.c b/libio/ioftell.c index ec3b1a2f2e..1fc7c55a51 100644 --- a/libio/ioftell.c +++ b/libio/ioftell.c @@ -32,7 +32,7 @@ _IO_ftell (fp) { _IO_pos_t pos; CHECK_FILE (fp, -1L); - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); pos = _IO_seekoff (fp, 0, _IO_seek_cur, 0); __libc_cleanup_region_end (1); diff --git a/libio/iofwrite.c b/libio/iofwrite.c index 4ee489d2b1..7767a94e8a 100644 --- a/libio/iofwrite.c +++ b/libio/iofwrite.c @@ -36,7 +36,7 @@ _IO_fwrite (buf, size, count, fp) CHECK_FILE (fp, 0); if (request == 0) return 0; - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); written = _IO_sputn (fp, (const char *) buf, request); __libc_cleanup_region_end (1); diff --git a/libio/iogetdelim.c b/libio/iogetdelim.c index da6efa459a..d41bb6b2a9 100644 --- a/libio/iogetdelim.c +++ b/libio/iogetdelim.c @@ -52,7 +52,7 @@ _IO_getdelim (lineptr, n, delimiter, fp) return -1; } CHECK_FILE (fp, -1); - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); if (_IO_ferror_unlocked (fp)) { diff --git a/libio/iogetline.c b/libio/iogetline.c index 85dff7e3e7..a72707196b 100644 --- a/libio/iogetline.c +++ b/libio/iogetline.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free @@ -48,7 +48,7 @@ DEFUN(_IO_getline, (fp, buf, n, delim, extract_delim), break; else len = fp->_IO_read_end - fp->_IO_read_ptr; - if (len >= n) + if ((_IO_size_t) len >= n) len = n; t = (char*)memchr((void*)fp->_IO_read_ptr, delim, len); if (t != NULL) diff --git a/libio/iogets.c b/libio/iogets.c index 8fdc4350a9..e132093e48 100644 --- a/libio/iogets.c +++ b/libio/iogets.c @@ -32,7 +32,8 @@ _IO_gets (buf) _IO_size_t count; int ch; - __libc_cleanup_region_start (&_IO_funlockfile, _IO_stdin); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, + _IO_stdin); _IO_flockfile (_IO_stdin); ch = _IO_getc_unlocked (_IO_stdin); if (ch == EOF) diff --git a/libio/ioputs.c b/libio/ioputs.c index 2770ab2935..34e68b9f8b 100644 --- a/libio/ioputs.c +++ b/libio/ioputs.c @@ -30,7 +30,8 @@ _IO_puts (str) { int result; _IO_size_t len = strlen (str); - __libc_cleanup_region_start (&_IO_funlockfile, _IO_stdout); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, + _IO_stdout); _IO_flockfile (_IO_stdout); if (_IO_sputn (_IO_stdout, str, len) == len && _IO_putc_unlocked ('\n', _IO_stdout) != EOF) diff --git a/libio/iosetbuffer.c b/libio/iosetbuffer.c index e44f33962f..d14e5d411e 100644 --- a/libio/iosetbuffer.c +++ b/libio/iosetbuffer.c @@ -31,7 +31,7 @@ _IO_setbuffer (fp, buf, size) _IO_size_t size; { CHECK_FILE (fp, ); - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); fp->_flags &= ~_IO_LINE_BUF; if (!buf) diff --git a/libio/iosetvbuf.c b/libio/iosetvbuf.c index e9dccae529..3776330a88 100644 --- a/libio/iosetvbuf.c +++ b/libio/iosetvbuf.c @@ -37,7 +37,7 @@ _IO_setvbuf (fp, buf, mode, size) { int result; CHECK_FILE (fp, EOF); - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); switch (mode) { diff --git a/libio/ioungetc.c b/libio/ioungetc.c index cc414083f8..180e789c27 100644 --- a/libio/ioungetc.c +++ b/libio/ioungetc.c @@ -33,7 +33,7 @@ _IO_ungetc (c, fp) CHECK_FILE (fp, EOF); if (c == EOF) return EOF; - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); result = _IO_sputbackc (fp, (unsigned char) c); __libc_cleanup_region_end (1); diff --git a/libio/putc.c b/libio/putc.c index 5dff3de304..bc69e2efb7 100644 --- a/libio/putc.c +++ b/libio/putc.c @@ -28,7 +28,7 @@ putc (c, fp) { int result; CHECK_FILE (fp, EOF); - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); result = _IO_putc_unlocked (c, fp); __libc_cleanup_region_end (1); diff --git a/libio/putchar.c b/libio/putchar.c index a7891a5a2a..7822a31a1a 100644 --- a/libio/putchar.c +++ b/libio/putchar.c @@ -26,7 +26,8 @@ putchar (c) int c; { int result; - __libc_cleanup_region_start (&_IO_funlockfile, _IO_stdout); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, + _IO_stdout); _IO_flockfile (_IO_stdout); result = _IO_putc_unlocked (c, _IO_stdout); __libc_cleanup_region_end (1); diff --git a/libio/rewind.c b/libio/rewind.c index d30233e17e..2af2dd84d3 100644 --- a/libio/rewind.c +++ b/libio/rewind.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993 Free Software Foundation +/* Copyright (C) 1993, 1996 Free Software Foundation, Inc. This file is part of the GNU IO Library. This library is free software; you can redistribute it and/or modify it under the @@ -29,7 +29,7 @@ rewind (fp) _IO_FILE* fp; { CHECK_FILE (fp, ); - __libc_cleanup_region_start (&_IO_funlockfile, fp); + __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); _IO_rewind (fp); __libc_cleanup_region_end (1); diff --git a/libio/strops.c b/libio/strops.c index 98c5b263d5..464063322d 100644 --- a/libio/strops.c +++ b/libio/strops.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free @@ -112,7 +112,7 @@ DEFUN(_IO_str_overflow, (fp, c), fp->_flags |= _IO_CURRENTLY_PUTTING; get_pos = LEN(fp); } - if (pos >= _IO_blen(fp) + flush_only) + if (pos >= (_IO_size_t) (_IO_blen(fp) + flush_only)) { if (fp->_flags & _IO_USER_BUF) /* not allowed to enlarge */ { @@ -187,10 +187,10 @@ DEFUN(_IO_str_count, (fp), register _IO_FILE *fp) { _IO_ssize_t put_len = fp->_IO_write_ptr - fp->_IO_write_base; - if (put_len < LEN(fp)) + if (put_len < (_IO_ssize_t) LEN(fp)) put_len = LEN(fp); return put_len; -} +} _IO_pos_t DEFUN(_IO_str_seekoff, (fp, offset, dir, mode), @@ -213,7 +213,7 @@ DEFUN(_IO_str_seekoff, (fp, offset, dir, mode), default: /* case _IO_seek_set: */ break; } - if (offset < 0 || (_IO_size_t)offset > cur_size) + if (offset < 0 || (_IO_ssize_t)offset > cur_size) return EOF; fp->_IO_read_ptr = fp->_IO_read_base + offset; fp->_IO_read_end = fp->_IO_read_base + cur_size; @@ -234,7 +234,7 @@ DEFUN(_IO_str_seekoff, (fp, offset, dir, mode), default: /* case _IO_seek_set: */ break; } - if (offset < 0 || (_IO_size_t)offset > cur_size) + if (offset < 0 || (_IO_ssize_t)offset > cur_size) return EOF; LEN(fp) = cur_size; fp->_IO_write_ptr = fp->_IO_write_base + offset; -- cgit 1.4.1