Using constants for testfile names

[fw/pdclib] / functions / stdio / fclose.c

diff --git a/functions/stdio/fclose.c b/functions/stdio/fclose.c
index 5c1e4d44d96c0b44e44a990468f25b32c3159769..cfea90234a9e89e5ad76b8d9ee13b72bca750862 100644 (file)
--- a/functions/stdio/fclose.c
+++ b/functions/stdio/fclose.c
@@ -49,7 +49,7 @@ int fclose( struct _PDCLIB_file_t * stream )
                 remove( stream->filename );
             }
             /* Free stream */
-            if ( ! stream->status & _PDCLIB_STATIC )
+            if ( ! ( stream->status & _PDCLIB_STATIC ) )
             {
                 free( stream );
             }
@@ -72,23 +72,23 @@ int main( void )
 #ifndef REGTEST
     struct _PDCLIB_file_t * file1;
     struct _PDCLIB_file_t * file2;
-    remove( "testing/testfile1" );
-    remove( "testing/testfile2" );
+    remove( testfile1 );
+    remove( testfile2 );
     TESTCASE( _PDCLIB_filelist == stdin );
-    TESTCASE( ( file1 = fopen( "testing/testfile1", "w" ) ) != NULL );
+    TESTCASE( ( file1 = fopen( testfile1, "w" ) ) != NULL );
     TESTCASE( _PDCLIB_filelist == file1 );
-    TESTCASE( ( file2 = fopen( "testing/testfile2", "w" ) ) != NULL );
+    TESTCASE( ( file2 = fopen( testfile2, "w" ) ) != NULL );
     TESTCASE( _PDCLIB_filelist == file2 );
     TESTCASE( fclose( file2 ) == 0 );
     TESTCASE( _PDCLIB_filelist == file1 );
-    TESTCASE( ( file2 = fopen( "testing/testfile1", "w" ) ) != NULL );
+    TESTCASE( ( file2 = fopen( testfile1, "w" ) ) != NULL );
     TESTCASE( _PDCLIB_filelist == file2 );
     TESTCASE( fclose( file1 ) == 0 );
     TESTCASE( _PDCLIB_filelist == file2 );
     TESTCASE( fclose( file2 ) == 0 );
     TESTCASE( _PDCLIB_filelist == stdin );
-    remove( "testing/testfile1" );
-    remove( "testing/testfile2" );
+    remove( testfile1 );
+    remove( testfile2 );
 #else
     puts( " NOTEST fclose() test driver is PDCLib-specific." );
 #endif