Make report() from usage.c public as vreportf() and use it.
There exist already a number of static functions named 'report', therefore, the function name was changed. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt committed
Mar 6, 2010 at 16:40 UTC
ebaa79f462c48e0ed0341d9c8f9c97de557afcfd
4 files changed
+10
-14
fast-import.c
+3
-5
@@ -483,14 +483,12 @@ static void dump_marks(void);
483
static NORETURN void die_nicely(const char *err, va_list params)
484
{
485
static int zombie;
486
- char message[2 * PATH_MAX];
486
488
- vsnprintf(message, sizeof(message), err, params);
489
- fputs("fatal: ", stderr);
490
- fputs(message, stderr);
491
- fputc('\n', stderr);
487
+ vreportf("fatal: ", err, params);
488
489
if (!zombie) {
490
+ char message[2 * PATH_MAX];
491
+
492
zombie = 1;
493
write_crash_report(message);
494
end_packfile();
git-compat-util.h
+1
@@ -192,6 +192,7 @@ extern char *gitbasename(char *);
192
#include "compat/bswap.h"
193
194
/* General helper functions */
195
+extern void vreportf(const char *prefix, const char *err, va_list params);
196
extern NORETURN void usage(const char *err);
197
extern NORETURN void usagef(const char *err, ...) __attribute__((format (printf, 1, 2)));
198
extern NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2)));
http-backend.c
+1
-4
@@ -538,14 +538,11 @@ static void service_rpc(char *service_name)
538
539
static NORETURN void die_webcgi(const char *err, va_list params)
540
{
541
- char buffer[1000];
542
-
541
http_status(500, "Internal Server Error");
542
hdr_nocache();
543
end_headers();
544
547
- vsnprintf(buffer, sizeof(buffer), err, params);
548
- fprintf(stderr, "fatal: %s\n", buffer);
545
+ vreportf("fatal: ", err, params);
546
exit(0);
547
}
548
usage.c
+5
-5
@@ -5,7 +5,7 @@
5
*/
6
#include "git-compat-util.h"
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
{
10
char msg[4096];
11
vsnprintf(msg, sizeof(msg), err, params);
@@ -14,24 +14,24 @@ static void report(const char *prefix, const char *err, va_list params)
14
15
static NORETURN void usage_builtin(const char *err, va_list params)
16
{
17
- report("usage: ", err, params);
17
+ vreportf("usage: ", err, params);
18
exit(129);
19
}
20
21
static NORETURN void die_builtin(const char *err, va_list params)
22
{
23
- report("fatal: ", err, params);
23
+ vreportf("fatal: ", err, params);
24
exit(128);
25
}
26
27
static void error_builtin(const char *err, va_list params)
28
{
29
- report("error: ", err, params);
29
+ vreportf("error: ", err, params);
30
}
31
32
static void warn_builtin(const char *warn, va_list params)
33
{
34
- report("warning: ", warn, params);
34
+ vreportf("warning: ", warn, params);
35
}
36
37
/* If we are in a dlopen()ed .so write to a global variable would segfault