diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | libio/genops.c | 16 | ||||
| -rw-r--r-- | libio/libioP.h | 1 | ||||
| -rw-r--r-- | libio/oldiofdopen.c | 4 | ||||
| -rw-r--r-- | libio/oldiofopen.c | 4 | ||||
| -rw-r--r-- | localedata/ChangeLog | 1 | ||||
| -rwxr-xr-x | localedata/tst-langinfo.sh | 30 |
7 files changed, 41 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog index 5cc3a1976d..fdafff7e80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-05-06 Ulrich Drepper <drepper@redhat.com> + + * libio/oldiofdopen.c (_IO_old_fdopen): Use _IO_old_init not _IO_init. + * libio/oldiofopen.c (_IO_old_fopen): Likewise. + * libio/libioP.h: Declare _IO_old_init. + * libio/genops.c (_IO_no_init): Split in two. New function + _IO_old_init. + 2003-05-05 Ulrich Drepper <drepper@redhat.com> * sysdeps/generic/enbl-secure.c (__libc_enable_secure_decided): New diff --git a/libio/genops.c b/libio/genops.c index c88a26f5f9..8077268ba9 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -602,12 +602,9 @@ _IO_init (fp, flags) INTDEF(_IO_init) void -_IO_no_init (fp, flags, orientation, wd, jmp) +_IO_old_init (fp, flags) _IO_FILE *fp; int flags; - int orientation; - struct _IO_wide_data *wd; - struct _IO_jump_t *jmp; { fp->_flags = _IO_MAGIC|flags; fp->_flags2 = 0; @@ -633,6 +630,17 @@ _IO_no_init (fp, flags, orientation, wd, jmp) if (fp->_lock != NULL) _IO_lock_init (*fp->_lock); #endif +} + +void +_IO_no_init (fp, flags, orientation, wd, jmp) + _IO_FILE *fp; + int flags; + int orientation; + struct _IO_wide_data *wd; + struct _IO_jump_t *jmp; +{ + _IO_old_init (fp, flags); fp->_mode = orientation; #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T if (orientation >= 0) diff --git a/libio/libioP.h b/libio/libioP.h index 8255fc997f..ca6535aab0 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -479,6 +479,7 @@ extern int _IO_new_fgetpos64 __P ((_IO_FILE *, _IO_fpos64_t *)); extern int _IO_old_fgetpos64 __P ((_IO_FILE *, _IO_fpos64_t *)); extern int _IO_new_fsetpos64 __P ((_IO_FILE *, const _IO_fpos64_t *)); extern int _IO_old_fsetpos64 __P ((_IO_FILE *, const _IO_fpos64_t *)); +extern void _IO_old_init __P ((_IO_FILE *fp, int flags)); #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T diff --git a/libio/oldiofdopen.c b/libio/oldiofdopen.c index 9015504970..824a2fb0cc 100644 --- a/libio/oldiofdopen.c +++ b/libio/oldiofdopen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,94,97,99,2000,2002 Free Software Foundation, Inc. +/* Copyright (C) 1993,94,97,99,2000,2002,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -114,7 +114,7 @@ _IO_old_fdopen (fd, mode) #ifdef _IO_MTSAFE_IO new_f->fp.file._lock = &new_f->lock; #endif - INTUSE(_IO_init) (&new_f->fp.file, 0); + _IO_old_init (&new_f->fp.file, 0); _IO_JUMPS (&new_f->fp) = &_IO_old_file_jumps; _IO_old_file_init (&new_f->fp); #if !_IO_UNIFIED_JUMPTABLES diff --git a/libio/oldiofopen.c b/libio/oldiofopen.c index 67a9eba6a6..29c0a18a21 100644 --- a/libio/oldiofopen.c +++ b/libio/oldiofopen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1993,1997,1999,2000,2002,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -53,7 +53,7 @@ _IO_old_fopen (filename, mode) #ifdef _IO_MTSAFE_IO new_f->fp.file._lock = &new_f->lock; #endif - INTUSE(_IO_init) (&new_f->fp.file, 0); + _IO_old_init (&new_f->fp.file, 0); _IO_JUMPS (&new_f->fp) = &_IO_old_file_jumps; _IO_old_file_init (&new_f->fp); #if !_IO_UNIFIED_JUMPTABLES diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 7538e0aef6..cfcf9c9377 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,6 +1,7 @@ 2003-05-06 Ulrich Drepper <drepper@redhat.com> * locales/de_DE: Use two-letter abday values. + * tst-langinfo.sh: Update after de_DE locale change. 2003-05-05 Jakub Jelinek <jakub@redhat.com> diff --git a/localedata/tst-langinfo.sh b/localedata/tst-langinfo.sh index c0d0ba2f61..412102613f 100755 --- a/localedata/tst-langinfo.sh +++ b/localedata/tst-langinfo.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test nl_langinfo. -# Copyright (C) 2000, 2001 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. # This file is part of the GNU C Library. # @@ -155,13 +155,13 @@ en_US.ISO-8859-1 RADIXCHAR . en_US.ISO-8859-1 THOUSEP , en_US.ISO-8859-1 YESEXPR ^[yY].* en_US.ISO-8859-1 NOEXPR ^[nN].* -de_DE.ISO-8859-1 ABDAY_1 Son -de_DE.ISO-8859-1 ABDAY_2 Mon -de_DE.ISO-8859-1 ABDAY_3 Die -de_DE.ISO-8859-1 ABDAY_4 Mit -de_DE.ISO-8859-1 ABDAY_5 Don -de_DE.ISO-8859-1 ABDAY_6 Fre -de_DE.ISO-8859-1 ABDAY_7 Sam +de_DE.ISO-8859-1 ABDAY_1 So +de_DE.ISO-8859-1 ABDAY_2 Mo +de_DE.ISO-8859-1 ABDAY_3 Di +de_DE.ISO-8859-1 ABDAY_4 Mi +de_DE.ISO-8859-1 ABDAY_5 Do +de_DE.ISO-8859-1 ABDAY_6 Fr +de_DE.ISO-8859-1 ABDAY_7 Sa de_DE.ISO-8859-1 DAY_1 Sonntag de_DE.ISO-8859-1 DAY_2 Montag de_DE.ISO-8859-1 DAY_3 Dienstag @@ -200,13 +200,13 @@ de_DE.ISO-8859-1 RADIXCHAR , de_DE.ISO-8859-1 THOUSEP . de_DE.ISO-8859-1 YESEXPR ^[jJyY].* de_DE.ISO-8859-1 NOEXPR ^[nN].* -de_DE.UTF-8 ABDAY_1 Son -de_DE.UTF-8 ABDAY_2 Mon -de_DE.UTF-8 ABDAY_3 Die -de_DE.UTF-8 ABDAY_4 Mit -de_DE.UTF-8 ABDAY_5 Don -de_DE.UTF-8 ABDAY_6 Fre -de_DE.UTF-8 ABDAY_7 Sam +de_DE.UTF-8 ABDAY_1 So +de_DE.UTF-8 ABDAY_2 Mo +de_DE.UTF-8 ABDAY_3 Di +de_DE.UTF-8 ABDAY_4 Mi +de_DE.UTF-8 ABDAY_5 Do +de_DE.UTF-8 ABDAY_6 Fr +de_DE.UTF-8 ABDAY_7 Sa de_DE.UTF-8 DAY_1 Sonntag de_DE.UTF-8 DAY_2 Montag de_DE.UTF-8 DAY_3 Dienstag |