Changeset 225 in xtideuniversalbios for trunk/Serial_Server/library

Timestamp:

Jan 27, 2012, 6:19:21 PM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Serial Server, minor improvements to file handling.

Location:

trunk/Serial_Server/library

Files:

• File.h (modified) (2 diffs)
• FlatImage.h (modified) (1 diff)

trunk/Serial_Server/library/File.h

@@ -18 +18 @@
 {
 public:
-    void Create( char *p_name )
+    int Create( char *p_name )
     {
         fp = fopen( p_name, "r" );
 
         if( fp )
-            log( -1, "Create Failure: '%s' already exists", p_name );
+        {
+            log( 0, "'%s' file already exists", p_name );
+            fclose( fp );
+            return( 0 );
+        }
         
         if( !(fp = fopen( p_name, "w" )) )
@@ -29 +33 @@
 
         name = p_name;
+        
+        return( 1 );
     }
 

trunk/Serial_Server/library/FlatImage.h

@@ -30 +30 @@
             sizef = size / 2048.0;   // 512 byte sectors -> MB
 
-            cf.Create( name );
-
-            memset( &buff[0], 0, 512 );
-            while( size-- )
-                cf.Write( &buff[0], 512 );
-        
-            if( p_cyl > 1024 )
-                log( 0, "Created file '%s', size %.1lf MB", name, sizef );
-            else
-                log( 0, "Created file '%s', geometry %u:%u:%u, size %.1lf MB", name, p_cyl, p_sect, p_head, sizef );
-
-            cf.Close();
+            if( cf.Create( name ) )
+            {
+                memset( &buff[0], 0, 512 );
+                while( size-- )
+                    cf.Write( &buff[0], 512 );
+                
+                if( p_cyl > 1024 )
+                    log( 0, "Created file '%s', size %.1lf MB", name, sizef );
+                else
+                    log( 0, "Created file '%s', geometry %u:%u:%u, size %.1lf MB", name, p_cyl, p_sect, p_head, sizef );
+                cf.Close();
+            }
         }