Skip to content

Commit

Permalink
Make report() from usage.c public as vreportf() and use it.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Sixt authored and Junio C Hamano committed Mar 7, 2010
1 parent 1d8cd41 commit ebaa79f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 14 deletions.
8 changes: 3 additions & 5 deletions fast-import.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 1 addition & 0 deletions git-compat-util.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
Expand Down
5 changes: 1 addition & 4 deletions http-backend.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
10 changes: 5 additions & 5 deletions usage.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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
Expand Down

0 comments on commit ebaa79f

Please sign in to comment.