Skip to contentSkip to conversation

die: fix inconsistencies with header

PATCH Superseded Rose via GitGitGadget 1 participant 3 messages Jan 19, 2023 – Dec 18, 2024

lore
Share & tools
lore

Rose via GitGitGadget

author
#0 lore raw

PATCH 1/1 die: fix inconsistencies with header

From: Seija Kijin <[email protected]>

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

Signed-off-by Seija Kijin <[email protected]>

---
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 [email protected]

Published-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(-)
contrib/credential/osxkeychain/git-credential-osxkeychain.c +1 -1
index e29cc28779d..fa88d621865 100644
@@ -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;
contrib/credential/wincred/git-credential-wincred.c +1 -1
index ead6e267c78..c0610d7648c 100644
@@ -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;
usage.c +3 -3
index 5a7c6c346c1..5f5510ceeeb 100644
@@ -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

Signature · 1 line
gitgitgadget
author
#1 lore raw

PATCH v2 1/1 die: fix inconsistencies with usage header

From: Seija Kijin <[email protected]>

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

Signed-off-by Seija Kijin <[email protected]>

---
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 [email protected]

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

Range-diff vs v1:

1: 74e90f0fa5c ! 1: c3b436cea9d die: fix inconsistencies with header
@@ Metadata
Author: Seija Kijin <[email protected]>

## Commit message ##
- die: fix inconsistencies with header
+ die: fix inconsistencies with usage header

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

 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(-)
contrib/credential/osxkeychain/git-credential-osxkeychain.c +1 -1
index e29cc28779d..fa88d621865 100644
@@ -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;
contrib/credential/wincred/git-credential-wincred.c +1 -1
index ead6e267c78..c0610d7648c 100644
@@ -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;
usage.c +3 -3
index 5a7c6c346c1..5f5510ceeeb 100644
@@ -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

Signature · 1 line
gitgitgadget
author
#2 lore raw

PATCH v3 1/1 die: fix inconsistencies with usage header

From: Seija Kijin <[email protected]>

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

Signed-off-by Seija Kijin <[email protected]>

---
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 protected]>

- ## 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(-)
contrib/credential/wincred/git-credential-wincred.c +2 -2
index 4be0d58cd89..9e1b590d27b 100644
@@ -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;
usage.c +3 -3
index 29a9725784a..991efe25a54 100644
@@ -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

Signature · 1 line
gitgitgadget