From 58e4e5118ae3707b417a19e8dc9224ac25c3f32f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Sun, 8 May 2016 16:47:21 +0700 Subject: usage.c: move format processing out of die_errno() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fmt_with_err() will be shared with the coming error_errno() and warning_errno(). Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- usage.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'usage.c') diff --git a/usage.c b/usage.c index 82ff13163..8675d72f3 100644 --- a/usage.c +++ b/usage.c @@ -109,19 +109,11 @@ void NORETURN die(const char *err, ...) va_end(params); } -void NORETURN die_errno(const char *fmt, ...) +static const char *fmt_with_err(char *buf, int n, const char *fmt) { - va_list params; - char fmt_with_err[1024]; char str_error[256], *err; int i, j; - if (die_is_recursing()) { - fputs("fatal: recursion detected in die_errno handler\n", - stderr); - exit(128); - } - err = strerror(errno); for (i = j = 0; err[i] && j < sizeof(str_error) - 1; ) { if ((str_error[j++] = err[i++]) != '%') @@ -136,10 +128,23 @@ void NORETURN die_errno(const char *fmt, ...) } } str_error[j] = 0; - snprintf(fmt_with_err, sizeof(fmt_with_err), "%s: %s", fmt, str_error); + snprintf(buf, n, "%s: %s", fmt, str_error); + return buf; +} + +void NORETURN die_errno(const char *fmt, ...) +{ + char buf[1024]; + va_list params; + + if (die_is_recursing()) { + fputs("fatal: recursion detected in die_errno handler\n", + stderr); + exit(128); + } va_start(params, fmt); - die_routine(fmt_with_err, params); + die_routine(fmt_with_err(buf, sizeof(buf), fmt), params); va_end(params); } -- cgit v1.2.1 From fd1d672300f36b2b06c2951ec450de0cf8f17797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Sun, 8 May 2016 16:47:22 +0700 Subject: usage.c: add warning_errno() and error_errno() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Similar to die_errno(), these functions will append strerror() automatically. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- usage.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'usage.c') diff --git a/usage.c b/usage.c index 8675d72f3..1dad03fb5 100644 --- a/usage.c +++ b/usage.c @@ -148,6 +148,17 @@ void NORETURN die_errno(const char *fmt, ...) va_end(params); } +int error_errno(const char *fmt, ...) +{ + char buf[1024]; + va_list params; + + va_start(params, fmt); + error_routine(fmt_with_err(buf, sizeof(buf), fmt), params); + va_end(params); + return -1; +} + #undef error int error(const char *err, ...) { @@ -159,6 +170,16 @@ int error(const char *err, ...) return -1; } +void warning_errno(const char *warn, ...) +{ + char buf[1024]; + va_list params; + + va_start(params, warn); + warn_routine(fmt_with_err(buf, sizeof(buf), warn), params); + va_end(params); +} + void warning(const char *warn, ...) { va_list params; -- cgit v1.2.1