Subject: [PATCH v3] die: fix inconsistencies with usage header

From: "AreaZR via GitGitGadget" <[email-masked]>
Date: Wed, 18 Dec 2024 03:28:03 +0000

From: Seija Kijin <[email-masked]>

The headers for the die and usage functions
have different parameter names or are missing
the "NORETURN" attribute

Signed-off-by: Seija Kijin <[email-masked]>
---
    die: fix inconsistencies with header
    
    The headers for the die and usage functions have different parameter
    names or are missing the "NORETURN" attribute

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1439%2FAreaZR%2Fperror-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1439/AreaZR/perror-v3
Pull-Request: https://github.com/git/git/pull/1439

Range-diff vs v2:

 1:  c3b436cea9d ! 1:  e02d5982a4f die: fix inconsistencies with usage header
     @@ Commit message
      
          Signed-off-by: Seija Kijin <[email-masked]>
      
     - ## contrib/credential/osxkeychain/git-credential-osxkeychain.c ##
     -@@ contrib/credential/osxkeychain/git-credential-osxkeychain.c: 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;
     -
       ## contrib/credential/wincred/git-credential-wincred.c ##
      @@
     + 
       #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
       
     - __attribute__((format (printf, 1, 2)))
     +-__attribute__((format (printf, 1, 2)))
      -static void die(const char *err, ...)
     ++__attribute__((format (printf, 1, 2), __noreturn__))
      +static void NORETURN die(const char *err, ...)
       {
       	char msg[4096];

 contrib/credential/wincred/git-credential-wincred.c | 4 ++--
 usage.c                                             | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/credential/wincred/git-credential-wincred.c b/contrib/credential/wincred/git-credential-wincred.c
index 4be0d58cd89..9e1b590d27b 100644
--- a/contrib/credential/wincred/git-credential-wincred.c
+++ b/contrib/credential/wincred/git-credential-wincred.c
@@ -12,8 +12,8 @@
 
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 
-__attribute__((format (printf, 1, 2)))
-static void die(const char *err, ...)
+__attribute__((format (printf, 1, 2), __noreturn__))
+static void NORETURN die(const char *err, ...)
 {
 	char msg[4096];
 	va_list params;
diff --git a/usage.c b/usage.c
index 29a9725784a..991efe25a54 100644
--- a/usage.c
+++ b/usage.c
@@ -210,7 +210,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;
@@ -221,8 +221,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: d882f382b3d939d90cfa58d17b17802338f05d66
-- 
gitgitgadget