lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Update.

Browse Source 
2003-08-12  Jakub Jelinek  <jakub@redhat.com>

	* libio/libioP.h (_IO_vtable_offset): Define.
	* libio/freopen.c (freopen): Use it.
	* libio/ioputs.c (_IO_puts): Likewise.
	* libio/freopen64.c (freopen64): Likewise.
	* libio/genops.c (__underflow, __uflow, _IO_flush_all_lockp):
	Likewise.
	* libio/iofclose.c (_IO_new_fclose): Likewise.
	* libio/iofputs.c (_IO_fputs): Likewise.
	* libio/ioftell.c (_IO_ftell): Likewise.
	* libio/iofwrite.c (_IO_fwrite): Likewise.
	* libio/ioseekoff.c (_IO_seekoff_unlocked): Likewise.
	* libio/iosetbuffer.c (_IO_setbuffer): Likewise.
	* stdio-common/vfprintf.c (ORIENT, vfprintf): Likewise.
	* stdio-common/vfscanf.c (ORIENT): Likewise.
This commit is contained in:
Ulrich Drepper
2003-08-12 18:40:03 +00:00
parent ca91553a6f
commit bbdef797ba
12 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
2003-08-12 Jakub Jelinek <jakub@redhat.com>
* libio/libioP.h (_IO_vtable_offset): Define.
* libio/freopen.c (freopen): Use it.
* libio/ioputs.c (_IO_puts): Likewise.
* libio/freopen64.c (freopen64): Likewise.
* libio/genops.c (__underflow, __uflow, _IO_flush_all_lockp):
Likewise.
* libio/iofclose.c (_IO_new_fclose): Likewise.
* libio/iofputs.c (_IO_fputs): Likewise.
* libio/ioftell.c (_IO_ftell): Likewise.
* libio/iofwrite.c (_IO_fwrite): Likewise.
* libio/ioseekoff.c (_IO_seekoff_unlocked): Likewise.
* libio/iosetbuffer.c (_IO_setbuffer): Likewise.
* stdio-common/vfprintf.c (ORIENT, vfprintf): Likewise.
* stdio-common/vfscanf.c (ORIENT): Likewise.
2003-08-11 Ulrich Drepper <drepper@redhat.com> 2003-08-11 Ulrich Drepper <drepper@redhat.com>
* assert/assert.h: Use __builtin_expect in assert and * assert/assert.h: Use __builtin_expect in assert and

2
libio/freopen.c
View File

@ -69,7 +69,7 @@ freopen (filename, mode, fp)
{ {
INTUSE(_IO_file_close_it) (fp); INTUSE(_IO_file_close_it) (fp);
_IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps; _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps;
if (fp->_vtable_offset == 0 && fp->_wide_data != NULL) if (_IO_vtable_offset (fp) == 0 && fp->_wide_data != NULL)
fp->_wide_data->_wide_vtable = &_IO_wfile_jumps; fp->_wide_data->_wide_vtable = &_IO_wfile_jumps;
result = INTUSE(_IO_file_fopen) (fp, filename, mode, 1); result = INTUSE(_IO_file_fopen) (fp, filename, mode, 1);
if (result != NULL) if (result != NULL)

2
libio/freopen64.c
View File

@ -54,7 +54,7 @@ freopen64 (filename, mode, fp)
} }
INTUSE(_IO_file_close_it) (fp); INTUSE(_IO_file_close_it) (fp);
_IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps; _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps;
if (fp->_vtable_offset == 0 && fp->_wide_data != NULL) if (_IO_vtable_offset (fp) == 0 && fp->_wide_data != NULL)
fp->_wide_data->_wide_vtable = &_IO_wfile_jumps; fp->_wide_data->_wide_vtable = &_IO_wfile_jumps;
result = INTUSE(_IO_file_fopen) (fp, filename, mode, 0); result = INTUSE(_IO_file_fopen) (fp, filename, mode, 0);
if (result != NULL) if (result != NULL)

6
libio/genops.c
View File

@ -324,7 +324,7 @@ __underflow (fp)
_IO_FILE *fp; _IO_FILE *fp;
{ {
#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
if (fp->_vtable_offset == 0 && _IO_fwide (fp, -1) != -1) if (_IO_vtable_offset (fp) == 0 && _IO_fwide (fp, -1) != -1)
return EOF; return EOF;
#endif #endif
@ -357,7 +357,7 @@ __uflow (fp)
_IO_FILE *fp; _IO_FILE *fp;
{ {
#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
if (fp->_vtable_offset == 0 && _IO_fwide (fp, -1) != -1) if (_IO_vtable_offset (fp) == 0 && _IO_fwide (fp, -1) != -1)
return EOF; return EOF;
#endif #endif
@ -834,7 +834,7 @@ _IO_flush_all_lockp (int do_lock)
if (((fp->_mode <= 0 && fp->_IO_write_ptr > fp->_IO_write_base) if (((fp->_mode <= 0 && fp->_IO_write_ptr > fp->_IO_write_base)
#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
|| (fp->_vtable_offset == 0 || (_IO_vtable_offset (fp) == 0
&& fp->_mode > 0 && (fp->_wide_data->_IO_write_ptr && fp->_mode > 0 && (fp->_wide_data->_IO_write_ptr
> fp->_wide_data->_IO_write_base)) > fp->_wide_data->_IO_write_base))
#endif #endif

4
libio/iofclose.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1993,1995,1997-2001,2002 Free Software Foundation, Inc. /* Copyright (C) 1993,1995,1997-2001,2002,2003 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -49,7 +49,7 @@ _IO_new_fclose (fp)
/* We desperately try to help programs which are using streams in a /* We desperately try to help programs which are using streams in a
strange way and mix old and new functions. Detect old streams strange way and mix old and new functions. Detect old streams
here. */ here. */
if (fp->_vtable_offset != 0) if (_IO_vtable_offset (fp) != 0)
return _IO_old_fclose (fp); return _IO_old_fclose (fp);
#endif #endif

5
libio/iofputs.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1993,1996,1997,1998,1999,2002 Free Software Foundation, Inc. /* Copyright (C) 1993, 1996, 1997, 1998, 1999, 2002, 2003
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -38,7 +39,7 @@ _IO_fputs (str, fp)
CHECK_FILE (fp, EOF); CHECK_FILE (fp, EOF);
_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
_IO_flockfile (fp); _IO_flockfile (fp);
if ((fp->_vtable_offset != 0 || _IO_fwide (fp, -1) == -1) if ((_IO_vtable_offset (fp) != 0 || _IO_fwide (fp, -1) == -1)
&& _IO_sputn (fp, str, len) == len) && _IO_sputn (fp, str, len) == len)
result = 1; result = 1;
_IO_funlockfile (fp); _IO_funlockfile (fp);

4
libio/ioftell.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1993, 1995-2000, 2001, 2002 Free Software Foundation, Inc. /* Copyright (C) 1993,1995-2000,2001,2002,2003 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -41,7 +41,7 @@ _IO_ftell (fp)
pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0); pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0);
if (_IO_in_backup (fp)) if (_IO_in_backup (fp))
{ {
if (fp->_vtable_offset != 0 || fp->_mode <= 0) if (_IO_vtable_offset (fp) != 0 || fp->_mode <= 0)
pos -= fp->_IO_save_end - fp->_IO_save_base; pos -= fp->_IO_save_end - fp->_IO_save_base;
} }
_IO_funlockfile (fp); _IO_funlockfile (fp);

5
libio/iofwrite.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1993,96,97,98,99,2000,2002 Free Software Foundation, Inc. /* Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2002, 2003
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -41,7 +42,7 @@ _IO_fwrite (buf, size, count, fp)
return 0; return 0;
_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
_IO_flockfile (fp); _IO_flockfile (fp);
if (fp->_vtable_offset != 0 || _IO_fwide (fp, -1) == -1) if (_IO_vtable_offset (fp) != 0 || _IO_fwide (fp, -1) == -1)
written = _IO_sputn (fp, (const char *) buf, request); written = _IO_sputn (fp, (const char *) buf, request);
_IO_funlockfile (fp); _IO_funlockfile (fp);
_IO_cleanup_region_end (0); _IO_cleanup_region_end (0);

5
libio/ioputs.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1993, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. /* Copyright (C) 1993,1996,1997,1998,1999,2003 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -38,7 +38,8 @@ _IO_puts (str)
_IO_stdout); _IO_stdout);
_IO_flockfile (_IO_stdout); _IO_flockfile (_IO_stdout);
if ((_IO_stdout->_vtable_offset != 0 || _IO_fwide (_IO_stdout, -1) == -1) if ((_IO_vtable_offset (_IO_stdout) != 0
|| _IO_fwide (_IO_stdout, -1) == -1)
&& _IO_sputn (_IO_stdout, str, len) == len && _IO_sputn (_IO_stdout, str, len) == len
&& _IO_putc_unlocked ('\n', _IO_stdout) != EOF) && _IO_putc_unlocked ('\n', _IO_stdout) != EOF)
result = len + 1; result = len + 1;

5
libio/ioseekoff.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1993,1997,1998,1999,2001,2002 Free Software Foundation, Inc. /* Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -56,7 +57,7 @@ _IO_seekoff_unlocked (fp, offset, dir, mode)
{ {
if (dir == _IO_seek_cur && _IO_in_backup (fp)) if (dir == _IO_seek_cur && _IO_in_backup (fp))
{ {
if (fp->_vtable_offset != 0 || fp->_mode <= 0) if (_IO_vtable_offset (fp) != 0 || fp->_mode <= 0)
offset -= fp->_IO_read_end - fp->_IO_read_ptr; offset -= fp->_IO_read_end - fp->_IO_read_ptr;
else else
abort (); abort ();

5
libio/iosetbuffer.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1993,95,96,97,98,99,2000,2002 Free Software Foundation, Inc. /* Copyright (C) 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -40,7 +41,7 @@ _IO_setbuffer (fp, buf, size)
if (!buf) if (!buf)
size = 0; size = 0;
(void) _IO_SETBUF (fp, buf, size); (void) _IO_SETBUF (fp, buf, size);
if (fp->_vtable_offset == 0 && fp->_mode == 0 && _IO_CHECK_WIDE (fp)) if (_IO_vtable_offset (fp) == 0 && fp->_mode == 0 && _IO_CHECK_WIDE (fp))
/* We also have to set the buffer using the wide char function. */ /* We also have to set the buffer using the wide char function. */
(void) _IO_WSETBUF (fp, buf, size); (void) _IO_WSETBUF (fp, buf, size);
_IO_funlockfile (fp); _IO_funlockfile (fp);

2
libio/libioP.h
View File

@ -110,8 +110,10 @@ extern "C" {
# define _IO_JUMPS_FUNC(THIS) \ # define _IO_JUMPS_FUNC(THIS) \
(*(struct _IO_jump_t **) ((void *) &_IO_JUMPS ((struct _IO_FILE_plus *) (THIS)) \ (*(struct _IO_jump_t **) ((void *) &_IO_JUMPS ((struct _IO_FILE_plus *) (THIS)) \
+ (THIS)->_vtable_offset)) + (THIS)->_vtable_offset))
# define _IO_vtable_offset(THIS) (THIS)->_vtable_offset
#else #else
# define _IO_JUMPS_FUNC(THIS) _IO_JUMPS ((struct _IO_FILE_plus *) (THIS)) # define _IO_JUMPS_FUNC(THIS) _IO_JUMPS ((struct _IO_FILE_plus *) (THIS))
# define _IO_vtable_offset(THIS) 0
#endif #endif
#define _IO_WIDE_JUMPS_FUNC(THIS) _IO_WIDE_JUMPS(THIS) #define _IO_WIDE_JUMPS_FUNC(THIS) _IO_WIDE_JUMPS(THIS)
#ifdef _G_USING_THUNKS #ifdef _G_USING_THUNKS