X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fferror.c;h=394dcda2bc7dd07dee9cad93b61dfd95ec50ddd1;hb=84d648157e22cecc65902ecfdd4e3a1b88d5e53f;hp=cf11f4ca37978366d37a2bc56d140ba93d8e5cdb;hpb=c8f799d852e3698468a78954d82588e841cc0b70;p=pdclib.old

diff --git a/functions/stdio/ferror.c b/functions/stdio/ferror.c
index cf11f4c..394dcda 100644
--- a/functions/stdio/ferror.c
+++ b/functions/stdio/ferror.c
@@ -1,16 +1,38 @@
-/* ----------------------------------------------------------------------------
- * $Id$
- * ----------------------------------------------------------------------------
- * Public Domain C Library - http://pdclib.sourceforge.net
- * This code is Public Domain. Use, modify, and redistribute at will.
- * --------------------------------------------------------------------------*/
-
-#ifndef __FILE_H
-#define __FILE_H __FILE_H
-#include <__FILE.h>
-#endif // __FILE_H
-
-int ferror( FILE * fh )
+/* $Id$ */
+
+/* ferror( FILE * )
+
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <stdio.h>
+
+#ifndef REGTEST
+
+int ferror_unlocked( struct _PDCLIB_file_t * stream )
+{
+    return stream->status & _PDCLIB_ERRORFLAG;
+}
+
+int ferror( struct _PDCLIB_file_t * stream )
 {
-    return fh->ErrorIndicator;
+    flockfile( stream );
+    int error = ferror_unlocked( stream );
+    funlockfile( stream );
+    return error;
 }
+
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main( void )
+{
+    /* Testing covered by clearerr(). */
+    return TEST_RESULTS;
+}
+
+#endif
+