Minor cleanup

git-svn-id: svn://svn.cc65.org/cc65/trunk@1979 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/co65/convert.c b/src/co65/convert.c
index 1edd231908750b3152b2f995d14610cd3a5b5133..bf50fb539cbc5788de265cbdf6ce6c8b696d47b7 100644 (file)
--- a/src/co65/convert.c
+++ b/src/co65/convert.c
@@ -352,7 +352,7 @@ static void ConvertZeropageSeg (FILE* F, const O65Data* D)
 
 
 
-void Convert (const O65Data* D, const char* OutputFile)
+void Convert (const O65Data* D)
 /* Convert the o65 file in D using the given output file. */
 {
     FILE*       F;
@@ -435,10 +435,10 @@ void Convert (const O65Data* D, const char* OutputFile)
         return;
     }
 
-    /* Open the output file */                                                    
-    F = fopen (OutputFile, "wb");
+    /* Open the output file */
+    F = fopen (OutputName, "wb");
     if (F == 0) {
-        Error ("Cannot open `%s': %s", OutputFile, strerror (errno));
+        Error ("Cannot open `%s': %s", OutputName, strerror (errno));
     }
 
     /* Create a header */

diff --git a/src/co65/convert.h b/src/co65/convert.h
index 5773fd461e40992c67a7f29a1800934489f75564..b7512d3b043ec40eb5535854153eab8816eab475 100644 (file)
--- a/src/co65/convert.h
+++ b/src/co65/convert.h
@@ -55,8 +55,8 @@ struct O65Data;
 
 
 
-void Convert (const struct O65Data* D, const char* OutputFile);
-/* Convert the o65 file in D using the given output file. */
+void Convert (const struct O65Data* D);
+/* Convert the o65 file in D */ 
 
 
 

diff --git a/src/co65/main.c b/src/co65/main.c
index adb1766374d39627372e4a286da6b5191cba8fc9..e90be9f09130a398736561acecaef244b2a9b380 100644 (file)
--- a/src/co65/main.c
+++ b/src/co65/main.c
@@ -295,14 +295,14 @@ static void OptZeropageName (const char* Opt attribute ((unused)), const char* A
 
 
 
-static void ConvertOneFile (const char* InputFile, const char* OutputFile)
+static void DoConversion (void)
 /* Do file conversion */
 {
     /* Read the o65 file into memory */
-    O65Data* D = ReadO65File (InputFile);
+    O65Data* D = ReadO65File (InputName);
 
     /* Do the conversion */
-    Convert (D, OutputFile);
+    Convert (D);
 
     /* Free the o65 module data */
     /* ### */
@@ -410,7 +410,7 @@ int main (int argc, char* argv [])
     }
 
     /* Do the conversion */
-    ConvertOneFile (InputName, OutputName);
+    DoConversion ();
 
     /* Return an apropriate exit code */
     return EXIT_SUCCESS;