Make report() from usage.c public as vreportf() and use it.

j6t · gitster · commit ebaa79f462c4 · 2010-03-07T00:37:35.000-08:00
There exist already a number of static functions named 'report', therefore,
the function name was changed.

Signed-off-by: Johannes Sixt &lt;j6t@kdbg.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/fast-import.c b/fast-import.c
@@ -483,14 +483,12 @@ static void dump_marks(void);
 static NORETURN void die_nicely(const char *err, va_list params)
 {
 	static int zombie;
-	char message[2 * PATH_MAX];
 
-	vsnprintf(message, sizeof(message), err, params);
-	fputs("fatal: ", stderr);
-	fputs(message, stderr);
-	fputc('\n', stderr);
+	vreportf("fatal: ", err, params);
 
 	if (!zombie) {
+		char message[2 * PATH_MAX];
+
 		zombie = 1;
 		write_crash_report(message);
 		end_packfile();
diff --git a/git-compat-util.h b/git-compat-util.h
@@ -192,6 +192,7 @@ extern char *gitbasename(char *);
 #include "compat/bswap.h"
 
 /* General helper functions */
+extern void vreportf(const char *prefix, const char *err, va_list params);
 extern NORETURN void usage(const char *err);
 extern NORETURN void usagef(const char *err, ...) __attribute__((format (printf, 1, 2)));
 extern NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2)));
diff --git a/http-backend.c b/http-backend.c
@@ -538,14 +538,11 @@ static void service_rpc(char *service_name)
 
 static NORETURN void die_webcgi(const char *err, va_list params)
 {
-	char buffer[1000];
-
 	http_status(500, "Internal Server Error");
 	hdr_nocache();
 	end_headers();
 
-	vsnprintf(buffer, sizeof(buffer), err, params);
-	fprintf(stderr, "fatal: %s\n", buffer);
+	vreportf("fatal: ", err, params);
 	exit(0);
 }
 
diff --git a/usage.c b/usage.c
@@ -5,7 +5,7 @@
  */
 #include "git-compat-util.h"
 
-static void report(const char *prefix, const char *err, va_list params)
+void vreportf(const char *prefix, const char *err, va_list params)
 {
 	char msg[4096];
 	vsnprintf(msg, sizeof(msg), err, params);
@@ -14,24 +14,24 @@ static void report(const char *prefix, const char *err, va_list params)
 
 static NORETURN void usage_builtin(const char *err, va_list params)
 {
-	report("usage: ", err, params);
+	vreportf("usage: ", err, params);
 	exit(129);
 }
 
 static NORETURN void die_builtin(const char *err, va_list params)
 {
-	report("fatal: ", err, params);
+	vreportf("fatal: ", err, params);
 	exit(128);
 }
 
 static void error_builtin(const char *err, va_list params)
 {
-	report("error: ", err, params);
+	vreportf("error: ", err, params);
 }
 
 static void warn_builtin(const char *warn, va_list params)
 {
-	report("warning: ", warn, params);
+	vreportf("warning: ", warn, params);
 }
 
 /* If we are in a dlopen()ed .so write to a global variable would segfault

Original file line number	Diff line number	Diff line change
`@@ -538,14 +538,11 @@ static void service_rpc(char *service_name)`
`538`	`538`
`539`	`539`	`static NORETURN void die_webcgi(const char *err, va_list params)`
`540`	`540`	`{`
`541`		`- char buffer[1000];`
`542`		`-`
`543`	`541`	`http_status(500, "Internal Server Error");`
`544`	`542`	`hdr_nocache();`
`545`	`543`	`end_headers();`
`546`	`544`
`547`		`- vsnprintf(buffer, sizeof(buffer), err, params);`
`548`		`- fprintf(stderr, "fatal: %s\n", buffer);`
	`545`	`+ vreportf("fatal: ", err, params);`
`549`	`546`	`exit(0);`
`550`	`547`	`}`
`551`	`548`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*/`
`6`	`6`	`#include "git-compat-util.h"`
`7`	`7`
`8`		`-static void report(const char prefix, const char err, va_list params)`
	`8`	`+void vreportf(const char prefix, const char err, va_list params)`
`9`	`9`	`{`
`10`	`10`	`char msg[4096];`
`11`	`11`	`vsnprintf(msg, sizeof(msg), err, params);`
`@@ -14,24 +14,24 @@ static void report(const char prefix, const char err, va_list params)`
`14`	`14`
`15`	`15`	`static NORETURN void usage_builtin(const char *err, va_list params)`
`16`	`16`	`{`
`17`		`- report("usage: ", err, params);`
	`17`	`+ vreportf("usage: ", err, params);`
`18`	`18`	`exit(129);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`static NORETURN void die_builtin(const char *err, va_list params)`
`22`	`22`	`{`
`23`		`- report("fatal: ", err, params);`
	`23`	`+ vreportf("fatal: ", err, params);`
`24`	`24`	`exit(128);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`static void error_builtin(const char *err, va_list params)`
`28`	`28`	`{`
`29`		`- report("error: ", err, params);`
	`29`	`+ vreportf("error: ", err, params);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`static void warn_builtin(const char *warn, va_list params)`
`33`	`33`	`{`
`34`		`- report("warning: ", warn, params);`
	`34`	`+ vreportf("warning: ", warn, params);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/* If we are in a dlopen()ed .so write to a global variable would segfault`