builtin-mailinfo.c: fix confusing internal API to mailinfo()

gitster · gitster · commit 606417bc6dba · 2009-08-26T22:21:30.000-07:00
It fed two arguments to override the corresponding global variables,
but the caller always assigned the values to the global variables
first and then passed those global variables to this function.

Stop pretending to be a proper API to confuse people.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
@@ -885,12 +885,9 @@ static void handle_info(void)
 	fprintf(fout, "\n");
 }
 
-static int mailinfo(FILE *in, FILE *out, int ks, const char *encoding,
-		    const char *msg, const char *patch)
+static int mailinfo(FILE *in, FILE *out, const char *msg, const char *patch)
 {
 	int peek;
-	keep_subject = ks;
-	metainfo_charset = encoding;
 	fin = in;
 	fout = out;
 
@@ -956,5 +953,5 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix)
 	if (argc != 3)
 		usage(mailinfo_usage);
 
-	return !!mailinfo(stdin, stdout, keep_subject, metainfo_charset, argv[1], argv[2]);
+	return !!mailinfo(stdin, stdout, argv[1], argv[2]);
 }

Original file line number	Diff line number	Diff line change
`@@ -885,12 +885,9 @@ static void handle_info(void)`
`885`	`885`	`fprintf(fout, "\n");`
`886`	`886`	`}`
`887`	`887`
`888`		`-static int mailinfo(FILE in, FILE out, int ks, const char *encoding,`
`889`		`- const char msg, const char patch)`
	`888`	`+static int mailinfo(FILE in, FILE out, const char msg, const char patch)`
`890`	`889`	`{`
`891`	`890`	`int peek;`
`892`		`- keep_subject = ks;`
`893`		`- metainfo_charset = encoding;`
`894`	`891`	`fin = in;`
`895`	`892`	`fout = out;`
`896`	`893`
`@@ -956,5 +953,5 @@ int cmd_mailinfo(int argc, const char *argv, const char prefix)`
`956`	`953`	`if (argc != 3)`
`957`	`954`	`usage(mailinfo_usage);`
`958`	`955`
`959`		`- return !!mailinfo(stdin, stdout, keep_subject, metainfo_charset, argv[1], argv[2]);`
	`956`	`+ return !!mailinfo(stdin, stdout, argv[1], argv[2]);`
`960`	`957`	`}`