AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-08 14:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a couple of __REDIRECT () __THROW occurrences

Browse Source 
This patch fixes some cases which fail to parse with C++.
This commit is contained in:
Jakub Jelinek 2010-06-14 08:18:26 -07:00 committed by Ulrich Drepper
parent 2a50c07836
commit f32f28695d
4 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2010-06-07 Jakub Jelinek <jakub@redhat.com>
* libio/stdio.h (sscanf, vsscanf): Use __REDIRECT_NTH instead of
__REDIRECT followed by __THROW.
* wcsmbs/wchar.h (swscanf, vswscanf): Likewise.
* posix/getopt.h (getopt): Likewise.
2010-06-02 Emilio Pozuelo Monfort <pochu27@gmail.com> 2010-06-02 Emilio Pozuelo Monfort <pochu27@gmail.com>
* hurd/lookup-at.c (__file_name_lookup_at): Accept * hurd/lookup-at.c (__file_name_lookup_at): Accept

16
libio/stdio.h
View File

@ -447,9 +447,9 @@ extern int __REDIRECT (fscanf, (FILE *__restrict __stream,
__isoc99_fscanf) __wur; __isoc99_fscanf) __wur;
extern int __REDIRECT (scanf, (__const char *__restrict __format, ...), extern int __REDIRECT (scanf, (__const char *__restrict __format, ...),
__isoc99_scanf) __wur; __isoc99_scanf) __wur;
extern int __REDIRECT (sscanf, (__const char *__restrict __s, extern int __REDIRECT_NTH (sscanf, (__const char *__restrict __s,
__const char *__restrict __format, ...), __const char *__restrict __format, ...),
__isoc99_sscanf) __THROW; __isoc99_sscanf);
# else # else
extern int __isoc99_fscanf (FILE *__restrict __stream, extern int __isoc99_fscanf (FILE *__restrict __stream,
__const char *__restrict __format, ...) __wur; __const char *__restrict __format, ...) __wur;
@ -501,11 +501,11 @@ extern int __REDIRECT (vfscanf,
extern int __REDIRECT (vscanf, (__const char *__restrict __format, extern int __REDIRECT (vscanf, (__const char *__restrict __format,
_G_va_list __arg), __isoc99_vscanf) _G_va_list __arg), __isoc99_vscanf)
__attribute__ ((__format__ (__scanf__, 1, 0))) __wur; __attribute__ ((__format__ (__scanf__, 1, 0))) __wur;
extern int __REDIRECT (vsscanf, extern int __REDIRECT_NTH (vsscanf,
(__const char *__restrict __s, (__const char *__restrict __s,
__const char *__restrict __format, _G_va_list __arg), __const char *__restrict __format,
__isoc99_vsscanf) _G_va_list __arg), __isoc99_vsscanf)
__THROW __attribute__ ((__format__ (__scanf__, 2, 0))); __attribute__ ((__format__ (__scanf__, 2, 0)));
# else # else
extern int __isoc99_vfscanf (FILE *__restrict __s, extern int __isoc99_vfscanf (FILE *__restrict __s,
__const char *__restrict __format, __const char *__restrict __format,

8
posix/getopt.h
View File

@ -1,5 +1,5 @@
/* Declarations for getopt. /* Declarations for getopt.
Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2009 Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2009,2010
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -158,9 +158,9 @@ extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
additional functionality can be disable at runtime. This redirection additional functionality can be disable at runtime. This redirection
helps to also do this at runtime. */ helps to also do this at runtime. */
# ifdef __REDIRECT # ifdef __REDIRECT
extern int __REDIRECT (getopt, (int ___argc, char *const *___argv, extern int __REDIRECT_NTH (getopt, (int ___argc, char *const *___argv,
const char *__shortopts), const char *__shortopts),
__posix_getopt) __THROW; __posix_getopt);
# else # else
extern int __posix_getopt (int ___argc, char *const *___argv, extern int __posix_getopt (int ___argc, char *const *___argv,
const char *__shortopts) __THROW; const char *__shortopts) __THROW;

16
wcsmbs/wchar.h
View File

@ -658,10 +658,10 @@ extern int __REDIRECT (fwscanf, (__FILE *__restrict __stream,
extern int __REDIRECT (wscanf, (__const wchar_t *__restrict __format, ...), extern int __REDIRECT (wscanf, (__const wchar_t *__restrict __format, ...),
__isoc99_wscanf) __isoc99_wscanf)
/* __attribute__ ((__format__ (__wscanf__, 1, 2))) */; /* __attribute__ ((__format__ (__wscanf__, 1, 2))) */;
extern int __REDIRECT (swscanf, (__const wchar_t *__restrict __s, extern int __REDIRECT_NTH (swscanf, (__const wchar_t *__restrict __s,
__const wchar_t *__restrict __format, ...), __const wchar_t *__restrict __format,
__isoc99_swscanf) ...), __isoc99_swscanf)
__THROW /* __attribute__ ((__format__ (__wscanf__, 2, 3))) */; /* __attribute__ ((__format__ (__wscanf__, 2, 3))) */;
# else # else
extern int __isoc99_fwscanf (__FILE *__restrict __stream, extern int __isoc99_fwscanf (__FILE *__restrict __stream,
__const wchar_t *__restrict __format, ...); __const wchar_t *__restrict __format, ...);
@ -712,10 +712,10 @@ extern int __REDIRECT (vfwscanf, (__FILE *__restrict __s,
extern int __REDIRECT (vwscanf, (__const wchar_t *__restrict __format, extern int __REDIRECT (vwscanf, (__const wchar_t *__restrict __format,
__gnuc_va_list __arg), __isoc99_vwscanf) __gnuc_va_list __arg), __isoc99_vwscanf)
/* __attribute__ ((__format__ (__wscanf__, 1, 0))) */; /* __attribute__ ((__format__ (__wscanf__, 1, 0))) */;
extern int __REDIRECT (vswscanf, (__const wchar_t *__restrict __s, extern int __REDIRECT_NTH (vswscanf, (__const wchar_t *__restrict __s,
__const wchar_t *__restrict __format, __const wchar_t *__restrict __format,
__gnuc_va_list __arg), __isoc99_vswscanf) __gnuc_va_list __arg), __isoc99_vswscanf)
__THROW /* __attribute__ ((__format__ (__wscanf__, 2, 0))) */; /* __attribute__ ((__format__ (__wscanf__, 2, 0))) */;
# else # else
extern int __isoc99_vfwscanf (__FILE *__restrict __s, extern int __isoc99_vfwscanf (__FILE *__restrict __s,
__const wchar_t *__restrict __format, __const wchar_t *__restrict __format,