dj(1): fix fprintio signature

src/dj.c

@@ -118,7 +118,7 @@ oserr(char *e, int n) {
 
 /* Prints statistics regarding the use of dj, particularly partially and
  * completely read and written records. */
-static void
+static int
 fprintio(FILE *stream, char *fmt, struct Io io[2]) {
 	return fprintf(
 		stream,

src/mm.c

@@ -88,25 +88,6 @@ oserr(char *s, char *r) {
 	return EX_OSERR;
 }
 
-/* Hijacks i and j from main and destructs the files[2] struct used by main by
- * closing its files and freeing its files and names arrays, returning retval
- * from main. */
-#define terminate \
-	for (i = 0; i < 2; ++i) { \
-		for (j = 0; j < files[i].s; ++j) { \
-			if ( \
-				files[i].files[j] != stdin \
-				&& files[i].files[j] != stdout \
-				&& files[i].files[j] != stderr \
-			) { \
-				fclose(files[i].files[j]); \
-			} \
-		} \
-		free(files[i].files); \
-		free(files[i].names); \
-	} \
-	return retval
-
 static int
 usage(char *argv0) {
 	(void)fprintf(
@@ -163,8 +144,7 @@ int main(int argc, char *argv[]) {
 						break;
 					}
 
-					retval = oserr(program_name, "-e");
+					return oserr(program_name, "-e");
-					terminate;
 				case 'i':
 					if (
 						(strcmp(optarg, "-") == 0