undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Johannes Sixt 2010-03-06 16:40:39 +01:00 committed by Junio C Hamano
parent 1d8cd418b4
commit ebaa79f462
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fast-import.c
View File

@ -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();

1
git-compat-util.h
View File

@ -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)));

5
http-backend.c
View File

@ -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);
}

10
usage.c
View File

@ -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