Cleaned up the testing a bit.

[pdclib] / functions / stdio / fputs.c

diff --git a/functions/stdio/fputs.c b/functions/stdio/fputs.c
index 7a62d03de2ff5178b624c68b5fc0c381c407309a..1df0ebfa465cab4e81be1983fad5bdc5fe38ca56 100644 (file)
--- a/functions/stdio/fputs.c
+++ b/functions/stdio/fputs.c
@@ -11,7 +11,7 @@
 #ifndef REGTEST
 #include <_PDCLIB_glue.h>
 
-int fputs( const char * s, struct _PDCLIB_file_t * stream )
+int fputs( const char * _PDCLIB_restrict s, struct _PDCLIB_file_t * _PDCLIB_restrict stream )
 {
     if ( _PDCLIB_prepwrite( stream ) == EOF )
     {
@@ -24,9 +24,9 @@ int fputs( const char * s, struct _PDCLIB_file_t * stream )
            buffer runs full.
         */
         stream->buffer[ stream->bufidx++ ] = *s;
-        /* TODO: Should IOLBF flush on \n, or the correct EOL sequence of the system? */
-        if ( ( stream->bufidx == stream->bufsize )
-          || ( ( stream->status & _IOLBF ) && *s == '\n' ) )
+        if ( ( stream->bufidx == stream->bufsize ) ||
+             ( ( stream->status & _IOLBF ) && *s == '\n' )
+           )
         {
             if ( _PDCLIB_flushbuffer( stream ) == EOF )
             {
@@ -51,7 +51,6 @@ int fputs( const char * s, struct _PDCLIB_file_t * stream )
 
 int main( void )
 {
-    char const * const testfile = "testfile";
     char const * const message = "SUCCESS testing fputs()";
     FILE * fh;
     remove( testfile );