Browse Source

usage.c: add warning_errno() and error_errno()

Similar to die_errno(), these functions will append strerror()
automatically.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 9 years ago committed by Junio C Hamano
parent
commit
fd1d672300
  1. 2
      git-compat-util.h
  2. 21
      usage.c

2
git-compat-util.h

@ -412,7 +412,9 @@ extern NORETURN void usagef(const char *err, ...) __attribute__((format (printf, @@ -412,7 +412,9 @@ extern NORETURN void usagef(const char *err, ...) __attribute__((format (printf,
extern NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2)));
extern NORETURN void die_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
extern int error_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
extern void warning_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));

#ifndef NO_OPENSSL
#ifdef APPLE_COMMON_CRYPTO

21
usage.c

@ -148,6 +148,17 @@ void NORETURN die_errno(const char *fmt, ...) @@ -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, ...) @@ -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;

Loading…
Cancel
Save