From: Seija Kijin <doremylover123@gmail.com>
The headers for the die and usage functions have different parameter names or are missing the "NORETURN" attribute
Signed-off-by: Seija Kijin <doremylover123@gmail.com>
---
die: fix inconsistencies with header
The headers for the die and usage functions have different parameter
names or are missing the "NORETURN" attribute
Signed-off-by: Seija Kijin doremylover123@gmail.comPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1439%2FAtariDreams%2Fperror-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1439/AtariDreams/perror-v1 Pull-Request: https://github.com/git/git/pull/1439
contrib/credential/osxkeychain/git-credential-osxkeychain.c | 2 +- contrib/credential/wincred/git-credential-wincred.c | 2 +- usage.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-)
Show changes to 3 files +5 −5
contrib/credential/osxkeychain/git-credential-osxkeychain.c, contrib/credential/wincred/git-credential-wincred.c, usage.c
diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c index e29cc28779d..fa88d621865 100644 --- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c +++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c @@ -11,7 +11,7 @@ static char *password; static UInt16 port; __attribute__((format (printf, 1, 2))) -static void die(const char *err, ...) +static void NORETURN die(const char *err, ...) { char msg[4096]; va_list params; diff --git a/contrib/credential/wincred/git-credential-wincred.c b/contrib/credential/wincred/git-credential-wincred.c index ead6e267c78..c0610d7648c 100644 --- a/contrib/credential/wincred/git-credential-wincred.c +++ b/contrib/credential/wincred/git-credential-wincred.c @@ -12,7 +12,7 @@ #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) __attribute__((format (printf, 1, 2))) -static void die(const char *err, ...) +static void NORETURN die(const char *err, ...) { char msg[4096]; va_list params; diff --git a/usage.c b/usage.c index 5a7c6c346c1..5f5510ceeeb 100644 --- a/usage.c +++ b/usage.c @@ -206,7 +206,7 @@ static const char *fmt_with_err(char *buf, int n, const char *fmt) return buf; } -void NORETURN die_errno(const char *fmt, ...) +void NORETURN die_errno(const char *err, ...) { char buf[1024]; va_list params; @@ -217,8 +217,8 @@ void NORETURN die_errno(const char *fmt, ...) exit(128); } - va_start(params, fmt); - die_routine(fmt_with_err(buf, sizeof(buf), fmt), params); + va_start(params, err); + die_routine(fmt_with_err(buf, sizeof(buf), err), params); va_end(params); } base-commit: a7caae2729742fc80147bca1c02ae848cb55921a
-- gitgitgadget