Use va_list for die_format, replaced remaining error code with die_format

Author: twojstaryzdomu

bchunk.c

@@ -19,6 +19,7 @@
   */
 
 #define _GNU_SOURCE
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -127,9 +128,12 @@ void free_all(void)
 	free(cuefile);
 }
 
-void die_format(int status, char *format, char *error)
+void die_format(int status, char *format, ...)
 {
-	fprintf(stderr, format, error);
+	va_list args;
+	va_start(args, format);
+	vfprintf(stderr, format, args);
+	va_end(args);
 	free_all();
 	exit(status);
 }
@@ -196,8 +200,7 @@ void parse_args(int argc, char *argv[])
 				basefile = strdup(argv[i]);
 				break;
 			default:
-				fprintf(stderr, "Gratuitous argument %s\n%s", argv[i], USAGE);
-				exit(1);
+				die_format(1, "Gratuitous argument %s\n%s", argv[i], USAGE);
 		}
 	}
 }
@@ -411,8 +414,7 @@ int writetrack(FILE *bf, struct track_t *track)
 	fflush(stdout);
 
 	if (ferror(bf)) {
-		fprintf(stderr, " Could not read from %s: %s\n", binfile, strerror(errno));
-		exit(4);
+		die_format(4, " Could not read from %s: %s\n", binfile, strerror(errno));
 	}
 	if (fclose(f))
 		die_format(4, " Could not fclose track file: %s\n", strerror(errno));