projects
/
fw
/
pdclib
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo. How come GCC doesn't warn about this one?
[fw/pdclib]
/
functions
/
stdio
/
clearerr.c
diff --git
a/functions/stdio/clearerr.c
b/functions/stdio/clearerr.c
index 4c51d714f54aefb4c019a6b8c216bd6820d19634..922f6ab9d239e18cbf5eea9d959d0102c10d9f54 100644
(file)
--- a/
functions/stdio/clearerr.c
+++ b/
functions/stdio/clearerr.c
@@
-22,37
+22,33
@@
void clearerr( struct _PDCLIB_file_t * stream )
int main( void )
{
int main( void )
{
-#ifndef REGTEST
- FILE file = { 0, { 0 }, NULL, 0, 0, 0, NULL };
- FILE * fh = &file;
+ FILE * fh;
+ remove( "testfile" );
+ TESTCASE( ( fh = fopen( "testfile", "w+" ) ) != NULL );
+ /* Flags should be clear */
TESTCASE( ! ferror( fh ) );
TESTCASE( ! feof( fh ) );
TESTCASE( ! ferror( fh ) );
TESTCASE( ! feof( fh ) );
- fh->status |= _PDCLIB_ERRORFLAG;
+ /* Reading from input stream - should provoke error */
+ TESTCASE( fgetc( fh ) == EOF );
TESTCASE( ferror( fh ) );
TESTCASE( ! feof( fh ) );
TESTCASE( ferror( fh ) );
TESTCASE( ! feof( fh ) );
+ /* clearerr() should clear flags */
clearerr( fh );
TESTCASE( ! ferror( fh ) );
TESTCASE( ! feof( fh ) );
clearerr( fh );
TESTCASE( ! ferror( fh ) );
TESTCASE( ! feof( fh ) );
- fh->status |= _PDCLIB_EOFFLAG;
- TESTCASE( ! ferror( fh ) );
- TESTCASE( feof( fh ) );
- clearerr( fh );
+ /* Reading from empty stream - should provoke EOF */
+ rewind( fh );
+ TESTCASE( fgetc( fh ) == EOF );
TESTCASE( ! ferror( fh ) );
TESTCASE( ! ferror( fh ) );
- TESTCASE( ! feof( fh ) );
- fh->status |= _PDCLIB_EOFFLAG | _PDCLIB_ERRORFLAG;
- TESTCASE( ferror( fh ) );
TESTCASE( feof( fh ) );
TESTCASE( feof( fh ) );
+ /* clearerr() should clear flags */
clearerr( fh );
TESTCASE( ! ferror( fh ) );
TESTCASE( ! feof( fh ) );
clearerr( fh );
TESTCASE( ! ferror( fh ) );
TESTCASE( ! feof( fh ) );
-#else
- /* TODO: The above is ad-hoc and PDCLib specific. A better test driver
- should be internals-agnostic (provoking the error / eof flag by
- "regular" operations).
- */
- TESTCASE( NO_TESTDRIVER );
-#endif
+ TESTCASE( fclose( fh ) == 0 );
+ remove( "testfile" );
return TEST_RESULTS;
}
#endif
return TEST_RESULTS;
}
#endif
+