usage.c + gc: add and use a die_message_errno()
Change the "error: " output when we exit with 128 due to gc.log errors to use a "fatal: " prefix instead. To do this add a die_message_errno() a sibling function to the die_errno() added in a preceding commit. Before this we'd expect report_last_gc_error() to return -1 from error_errno() in this case. It already treated a status of 0 and 1 specially. Let's just document that anything that's not 0 or 1 should be returned. We could also retain the "ret < 0" behavior here without hardcoding 128 by returning -128, and having the caller do a "return -ret", but I think this makes more sense, and preserves the path from die_message*()'s return value to the "return" without hardcoding "128". Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
0faf84d97d
commit
24f6e6d626
12
usage.c
12
usage.c
@@ -233,6 +233,18 @@ int die_message(const char *err, ...)
|
||||
return 128;
|
||||
}
|
||||
|
||||
#undef die_message_errno
|
||||
int die_message_errno(const char *fmt, ...)
|
||||
{
|
||||
char buf[1024];
|
||||
va_list params;
|
||||
|
||||
va_start(params, fmt);
|
||||
die_message_routine(fmt_with_err(buf, sizeof(buf), fmt), params);
|
||||
va_end(params);
|
||||
return 128;
|
||||
}
|
||||
|
||||
#undef error_errno
|
||||
int error_errno(const char *fmt, ...)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user