Tightening the code a bit.

[pdclib] / functions / stdio / fwrite.c

diff --git a/functions/stdio/fwrite.c b/functions/stdio/fwrite.c
index 8e5db3d96b743e34f8232e51d75bd3c322bbd1d2..8b40551d6598d2ee780f07535d814f798b2c64be 100644 (file)
--- a/functions/stdio/fwrite.c
+++ b/functions/stdio/fwrite.c
@@ -7,10 +7,11 @@
 */
 
 #include <stdio.h>
-#include <_PDCLIB_glue.h>
 
 #ifndef REGTEST
 
+#include <_PDCLIB_glue.h>
+
 #include <stdbool.h>
 #include <string.h>
 
@@ -27,7 +28,6 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str
     {
         for ( size_t size_i = 0; size_i < size; ++size_i )
         {
-            /* TODO: Should line-buffered streams be flushed on '\n' or system EOL? */
             if ( ( stream->buffer[ stream->bufidx++ ] = ((char*)ptr)[ nmemb_i * size + size_i ] ) == '\n' )
             {
                 /* Remember last newline, in case we have to do a partial line-buffered flush */
@@ -88,12 +88,10 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str
 int main( void )
 {
     FILE * fh;
-    remove( "testfile" );
-    TESTCASE( ( fh = fopen( "testfile", "w" ) ) != NULL );
+    TESTCASE( ( fh = tmpfile() ) != NULL );
     TESTCASE( fwrite( "SUCCESS testing fwrite()\n", 1, 25, fh ) == 25 );
-    TESTCASE( fclose( fh ) == 0 );
     /* TODO: Add readback test. */
-    TESTCASE( remove( "testfile" ) == 0 );
+    TESTCASE( fclose( fh ) == 0 );
     return TEST_RESULTS;
 }