X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Fsetbuf.c;h=749ddc9d2a8aeefc366505fd6c2e1ec0a6db821d;hp=e77d2d4807692e80373c08080d95e78bc1f1c041;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=97e30a162595b6a709600f1f1d7d9ebf21f469d1

diff --git a/functions/stdio/setbuf.c b/functions/stdio/setbuf.c
index e77d2d4..749ddc9 100644
--- a/functions/stdio/setbuf.c
+++ b/functions/stdio/setbuf.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* setbuf( FILE *, char * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -10,9 +8,8 @@
 
 #ifndef REGTEST
 
-void setbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_restrict buf )
+void setbuf( FILE * _PDCLIB_restrict stream, char * _PDCLIB_restrict buf )
 {
-    /* TODO: Only allowed on a "virgin" stream; add check. */
     if ( buf == NULL )
     {
         setvbuf( stream, buf, _IONBF, BUFSIZ );
@@ -26,33 +23,28 @@ void setbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_res
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
+#include <stdlib.h>
+#ifndef REGTEST
+#include "_PDCLIB_io.h"
+#endif
 
 int main( void )
 {
     /* TODO: Extend testing once setvbuf() is finished. */
 #ifndef REGTEST
-    char const * const filename = "testfile";
-    char buffer[ 100 ];
-    struct _PDCLIB_file_t * fh;
+    char buffer[ BUFSIZ + 1 ];
+    FILE * fh;
     /* full buffered */
-    TESTCASE( ( fh = fopen( filename, "w" ) ) != NULL );
-    TESTCASE( fh->status & _PDCLIB_LIBBUFFER );
-    TESTCASE( fh->bufsize == BUFSIZ );
+    TESTCASE( ( fh = tmpfile() ) != NULL );
     setbuf( fh, buffer );
-#if 0
     TESTCASE( fh->buffer == buffer );
-    TESTCASE( fh->bufsize == BUFFERSIZE );
-#endif
+    TESTCASE( fh->bufsize == BUFSIZ );
     TESTCASE( ( fh->status & ( _IOFBF | _IONBF | _IOLBF ) ) == _IOFBF );
     TESTCASE( fclose( fh ) == 0 );
     /* not buffered */
-    TESTCASE( ( fh = fopen( filename, "w" ) ) != NULL );
+    TESTCASE( ( fh = tmpfile() ) != NULL );
     setbuf( fh, NULL );
-#if 0
-    TESTCASE( fh->buffer == NULL );
-    TESTCASE( fh->bufsize == 0 );
-#endif
     TESTCASE( ( fh->status & ( _IOFBF | _IONBF | _IOLBF ) ) == _IONBF );
     TESTCASE( fclose( fh ) == 0 );
 #else