X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fsetvbuf.c;h=00592ff94bb8c20fff24495f0ad7c557e1e680a5;hb=d865c4403fc91d1f1ac95ba76febcee9f429bb97;hp=2c333382be537002c621b6299ff2fb14ae37545a;hpb=55cf35957bf8dec0a489ba758c02c83303a5eb50;p=pdclib

diff --git a/functions/stdio/setvbuf.c b/functions/stdio/setvbuf.c
index 2c33338..00592ff 100644
--- a/functions/stdio/setvbuf.c
+++ b/functions/stdio/setvbuf.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* setvbuf( FILE *, char *, int, size_t )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -21,7 +19,6 @@ int setvbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_res
                we don't want to e.g. flush the stream for every character of a
                stream being printed.
             */
-            /* TODO: Check this */
             break;
         case _IOFBF:
         case _IOLBF:
@@ -39,7 +36,7 @@ int setvbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_res
                 */
                 /* If current buffer is big enough for requested size, but not
                    over twice as big (and wasting memory space), we use the
-                   current buffer (i.e., do nothing), to save the malloc() / 
+                   current buffer (i.e., do nothing), to save the malloc() /
                    free() overhead.
                 */
                 if ( ( stream->bufsize < size ) || ( stream->bufsize > ( size << 1 ) ) )
@@ -71,7 +68,8 @@ int setvbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_res
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+
+#include "_PDCLIB_test.h"
 
 #include <errno.h>
 
@@ -82,29 +80,25 @@ int main( void )
 #ifndef REGTEST
     char buffer[ BUFFERSIZE ];
     FILE * fh;
-    remove( testfile );
     /* full buffered, user-supplied buffer */
-    TESTCASE( ( fh = fopen( testfile, "w" ) ) != NULL );
+    TESTCASE( ( fh = tmpfile() ) != NULL );
     TESTCASE( setvbuf( fh, buffer, _IOFBF, BUFFERSIZE ) == 0 );
     TESTCASE( fh->buffer == buffer );
     TESTCASE( fh->bufsize == BUFFERSIZE );
     TESTCASE( ( fh->status & ( _IOFBF | _IONBF | _IOLBF ) ) == _IOFBF );
     TESTCASE( fclose( fh ) == 0 );
-    TESTCASE( remove( testfile ) == 0 );
     /* line buffered, lib-supplied buffer */
-    TESTCASE( ( fh = fopen( testfile, "w" ) ) != NULL );
+    TESTCASE( ( fh = tmpfile() ) != NULL );
     TESTCASE( setvbuf( fh, NULL, _IOLBF, BUFFERSIZE ) == 0 );
     TESTCASE( fh->buffer != NULL );
     TESTCASE( fh->bufsize == BUFFERSIZE );
     TESTCASE( ( fh->status & ( _IOFBF | _IONBF | _IOLBF ) ) == _IOLBF );
     TESTCASE( fclose( fh ) == 0 );
-    TESTCASE( remove( testfile ) == 0 );
     /* not buffered, user-supplied buffer */
-    TESTCASE( ( fh = fopen( testfile, "w" ) ) != NULL );
+    TESTCASE( ( fh = tmpfile() ) != NULL );
     TESTCASE( setvbuf( fh, buffer, _IONBF, BUFFERSIZE ) == 0 );
     TESTCASE( ( fh->status & ( _IOFBF | _IONBF | _IOLBF ) ) == _IONBF );
     TESTCASE( fclose( fh ) == 0 );
-    TESTCASE( remove( testfile ) == 0 );
 #else
     puts( " NOTEST setvbuf() test driver is PDCLib-specific." );
 #endif
@@ -112,4 +106,3 @@ int main( void )
 }
 
 #endif
-