diff --git a/src/co65/convert.c b/src/co65/convert.c index 1edd23190..bf50fb539 100644 --- 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 5773fd461..b7512d3b0 100644 --- 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 adb176637..e90be9f09 100644 --- 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;