Libc-1439.100.3.tar.gz

[apple/libc.git] / stdio / FreeBSD / ferror.c

diff --git a/stdio/FreeBSD/ferror.c b/stdio/FreeBSD/ferror.c
index 11e5f7dacc34cd82c36faf087cb5daf7c779b892..830fb9ba54dda50132c75d047847cf13ae091c3f 100644 (file)
--- a/stdio/FreeBSD/ferror.c
+++ b/stdio/FreeBSD/ferror.c
@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -38,19 +34,16 @@
 static char sccsid[] = "@(#)ferror.c   8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.8 2002/03/22 21:53:04 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.12 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
 #include "un-namespace.h"
 #include "libc_private.h"
 
-/*
- * ferror has traditionally been a macro in <stdio.h>.  That is no
- * longer true because it needs to be thread-safe.
- *
- * #undef ferror
- */
+#undef ferror
+#undef ferror_unlocked
+
 int
 ferror(FILE *fp)
 {
@@ -61,3 +54,10 @@ ferror(FILE *fp)
        FUNLOCKFILE(fp);
        return (ret);
 }
+
+int
+ferror_unlocked(FILE *fp)
+{
+
+       return (__sferror(fp));
+}