kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 2016-05-08 16:47:22 +07:00 committed by Junio C Hamano
parent 58e4e5118a
commit fd1d672300
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-compat-util.h
View File

@ -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(const char *err, ...) __attribute__((format (printf, 1, 2)));
extern NORETURN void die_errno(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(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(const char *err, ...) __attribute__((format (printf, 1, 2)));
extern void warning_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));


#ifndef NO_OPENSSL #ifndef NO_OPENSSL
#ifdef APPLE_COMMON_CRYPTO #ifdef APPLE_COMMON_CRYPTO

21
usage.c
View File

@ -148,6 +148,17 @@ void NORETURN die_errno(const char *fmt, ...)
va_end(params); 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 #undef error
int error(const char *err, ...) int error(const char *err, ...)
{ {
@ -159,6 +170,16 @@ int error(const char *err, ...)
return -1; 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, ...) void warning(const char *warn, ...)
{ {
va_list params; va_list params;