This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH][BZ #14254] Remove wur on scanf et al.
- From: OndÅej BÃlka <neleai at seznam dot cz>
- To: libc-alpha at sourceware dot org
- Date: Tue, 8 Oct 2013 17:53:31 +0200
- Subject: [PATCH][BZ #14254] Remove wur on scanf et al.
- Authentication-results: sourceware.org; auth=none
Hi,
This is another bug with simple patch. Accept it or close but we should
not keep these in indefinite state.
https://sourceware.org/bugzilla/show_bug.cgi?id=14254
* libio/stdio.h: Do not use wur for scanf et al.
---
libio/stdio.h | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/libio/stdio.h b/libio/stdio.h
index 754301f..c02264c 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -423,12 +423,12 @@ __BEGIN_NAMESPACE_STD
This function is a possible cancellation point and therefore not
marked with __THROW. */
extern int fscanf (FILE *__restrict __stream,
- const char *__restrict __format, ...) __wur;
+ const char *__restrict __format, ...);
/* Read formatted input from stdin.
This function is a possible cancellation point and therefore not
marked with __THROW. */
-extern int scanf (const char *__restrict __format, ...) __wur;
+extern int scanf (const char *__restrict __format, ...);
/* Read formatted input from S. */
extern int sscanf (const char *__restrict __s,
const char *__restrict __format, ...) __THROW;
@@ -442,16 +442,16 @@ extern int sscanf (const char *__restrict __s,
s, S or [. */
extern int __REDIRECT (fscanf, (FILE *__restrict __stream,
const char *__restrict __format, ...),
- __isoc99_fscanf) __wur;
+ __isoc99_fscanf);
extern int __REDIRECT (scanf, (const char *__restrict __format, ...),
- __isoc99_scanf) __wur;
+ __isoc99_scanf);
extern int __REDIRECT_NTH (sscanf, (const char *__restrict __s,
const char *__restrict __format, ...),
__isoc99_sscanf);
# else
extern int __isoc99_fscanf (FILE *__restrict __stream,
- const char *__restrict __format, ...) __wur;
-extern int __isoc99_scanf (const char *__restrict __format, ...) __wur;
+ const char *__restrict __format, ...);
+extern int __isoc99_scanf (const char *__restrict __format, ...);
extern int __isoc99_sscanf (const char *__restrict __s,
const char *__restrict __format, ...) __THROW;
# define fscanf __isoc99_fscanf
@@ -470,14 +470,14 @@ __BEGIN_NAMESPACE_C99
marked with __THROW. */
extern int vfscanf (FILE *__restrict __s, const char *__restrict __format,
_G_va_list __arg)
- __attribute__ ((__format__ (__scanf__, 2, 0))) __wur;
+ __attribute__ ((__format__ (__scanf__, 2, 0)));
/* Read formatted input from stdin into argument list ARG.
This function is a possible cancellation point and therefore not
marked with __THROW. */
extern int vscanf (const char *__restrict __format, _G_va_list __arg)
- __attribute__ ((__format__ (__scanf__, 1, 0))) __wur;
+ __attribute__ ((__format__ (__scanf__, 1, 0)));
/* Read formatted input from S into argument list ARG. */
extern int vsscanf (const char *__restrict __s,
@@ -495,10 +495,10 @@ extern int __REDIRECT (vfscanf,
(FILE *__restrict __s,
const char *__restrict __format, _G_va_list __arg),
__isoc99_vfscanf)
- __attribute__ ((__format__ (__scanf__, 2, 0))) __wur;
+ __attribute__ ((__format__ (__scanf__, 2, 0)));
extern int __REDIRECT (vscanf, (const char *__restrict __format,
_G_va_list __arg), __isoc99_vscanf)
- __attribute__ ((__format__ (__scanf__, 1, 0))) __wur;
+ __attribute__ ((__format__ (__scanf__, 1, 0)));
extern int __REDIRECT_NTH (vsscanf,
(const char *__restrict __s,
const char *__restrict __format,
@@ -507,9 +507,9 @@ extern int __REDIRECT_NTH (vsscanf,
# else
extern int __isoc99_vfscanf (FILE *__restrict __s,
const char *__restrict __format,
- _G_va_list __arg) __wur;
+ _G_va_list __arg);
extern int __isoc99_vscanf (const char *__restrict __format,
- _G_va_list __arg) __wur;
+ _G_va_list __arg);
extern int __isoc99_vsscanf (const char *__restrict __s,
const char *__restrict __format,
_G_va_list __arg) __THROW;
--
1.8.4.rc3