diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-03-03 13:34:35 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-03-03 13:34:35 +0000 |
| commit | d0fec8d06cc2234c8114b51f630466eff9d5f841 (patch) | |
| tree | 223a7fdae69137bd5670e59249442bc6a2db1ad1 /libio | |
| parent | 00e4559b612f179492ff3721f86c92498894432f (diff) | |
Updated to fedora-glibc-20050302T1820
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/bits/stdio2.h | 19 | ||||
| -rw-r--r-- | libio/libio.h | 4 |
2 files changed, 17 insertions, 6 deletions
diff --git a/libio/bits/stdio2.h b/libio/bits/stdio2.h index 42a326c60a..e33cbb401a 100644 --- a/libio/bits/stdio2.h +++ b/libio/bits/stdio2.h @@ -1,5 +1,5 @@ /* Checking macros for stdio functions. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 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 @@ -49,7 +49,7 @@ extern int __vsnprintf_chk (char *__restrict __s, size_t __n, int __flag, __builtin___vsnprintf_chk (str, len, __USE_FORTIFY_LEVEL - 1, __bos (str), \ fmt, ap) -#endif +#endif #if __USE_FORTIFY_LEVEL > 1 @@ -85,5 +85,16 @@ extern int __vprintf_chk (int __flag, __const char *__restrict __format, extern char *__gets_chk (char *__str, size_t); #define gets(__str) \ - ((__bos (__str) == (size_t) -1) \ - ? (gets) (__str) : __gets_chk (__str, __bos (__str))) + ((__bos (__str) == (size_t) -1) \ + ? gets (__str) : __gets_chk (__str, __bos (__str))) + +extern char *__fgets_chk (char *s, size_t size, int n, FILE *stream); +#define fgets(__str, __n, __fp) \ + ((__bos (__str) == (size_t) -1) \ + ? fgets (__str, __n, __fp) : __fgets_chk (__str, __bos (__str), __n, __fp)) + +extern char *__fgets_unlocked_chk (char *s, size_t size, int n, FILE *stream); +#define fgets_unlocked(__str, __n, __fp) \ + ((__bos (__str) == (size_t) -1) \ + ? fgets_unlocked (__str, __n, __fp) \ + : __fgets_unlocked_chk (__str, __bos (__str), __n, __fp)) diff --git a/libio/libio.h b/libio/libio.h index 3b6facdddb..21e70489cf 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1995, 1997-2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1991-1995,1997-2003,2004,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Per Bothner <bothner@cygnus.com>. @@ -411,7 +411,7 @@ extern _IO_wint_t __wuflow (_IO_FILE *) __THROW; extern _IO_wint_t __woverflow (_IO_FILE *, _IO_wint_t) __THROW; #if __GNUC__ >= 3 -# define _IO_BE(expr, res) __builtin_expect (expr, res) +# define _IO_BE(expr, res) __builtin_expect ((expr), res) #else # define _IO_BE(expr, res) (expr) #endif |