X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffwrite.c;h=e64e36c96662427d69199a815dcccc0dbdecadcd;hb=d865c4403fc91d1f1ac95ba76febcee9f429bb97;hp=8e5db3d96b743e34f8232e51d75bd3c322bbd1d2;hpb=318b4abba5d5d901679ea5a517154232892866d2;p=pdclib

diff --git a/functions/stdio/fwrite.c b/functions/stdio/fwrite.c
index 8e5db3d..e64e36c 100644
--- a/functions/stdio/fwrite.c
+++ b/functions/stdio/fwrite.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* fwrite( const void *, size_t, size_t, FILE * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -7,12 +5,12 @@
 */
 
 #include <stdio.h>
-#include <_PDCLIB_glue.h>
+#include <stdbool.h>
+#include <string.h>
 
 #ifndef REGTEST
 
-#include <stdbool.h>
-#include <string.h>
+#include "_PDCLIB_glue.h"
 
 size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, struct _PDCLIB_file_t * _PDCLIB_restrict stream )
 {
@@ -21,18 +19,18 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str
         return 0;
     }
     _PDCLIB_size_t offset = 0;
-    bool lineend = false;
+    /* TODO: lineend */
+    /* bool lineend = false; */
     size_t nmemb_i;
     for ( nmemb_i = 0; nmemb_i < nmemb; ++nmemb_i )
     {
         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 */
                 offset = stream->bufidx;
-                lineend = true;
+                /* lineend = true; */
             }
             if ( stream->bufidx == stream->bufsize )
             {
@@ -41,7 +39,7 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str
                     /* Returning number of objects completely buffered */
                     return nmemb_i;
                 }
-                lineend = false;
+                /* lineend = false; */
             }
         }
     }
@@ -83,19 +81,13 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+
+#include "_PDCLIB_test.h"
 
 int main( void )
 {
-    FILE * fh;
-    remove( "testfile" );
-    TESTCASE( ( fh = fopen( "testfile", "w" ) ) != NULL );
-    TESTCASE( fwrite( "SUCCESS testing fwrite()\n", 1, 25, fh ) == 25 );
-    TESTCASE( fclose( fh ) == 0 );
-    /* TODO: Add readback test. */
-    TESTCASE( remove( "testfile" ) == 0 );
+    /* Testing covered by fread(). */
     return TEST_RESULTS;
 }
 
 #endif
-