{"thread":{"id":"59122","subject":"[PATCH] die: fix inconsistencies with header","startedAt":"2023-01-19T19:34:45Z","lastAt":"2024-12-18T03:28:06Z","messageCount":3,"participants":["Rose via GitGitGadget","AreaZR via GitGitGadget"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"470729","messageId":"pull.1439.git.git.1674156875354.gitgitgadget@gmail.com","threadId":"59122","inReplyTo":null,"subject":"[PATCH] die: fix inconsistencies with header","fromName":"Rose via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-01-19T19:34:35Z","receivedAt":"2023-01-19T19:34:45Z","isPatch":true,"sender":{"key":"ckelsch@jgrcpa.com","avatar":null},"body":"From: Seija Kijin <doremylover123@gmail.com>\n\nThe headers for the die and usage functions\nhave different parameter names or are missing\nthe \"NORETURN\" attribute\n\nSigned-off-by: Seija Kijin <doremylover123@gmail.com>\n---\n    die: fix inconsistencies with header\n    \n    The headers for the die and usage functions have different parameter\n    names or are missing the \"NORETURN\" attribute\n    \n    Signed-off-by: Seija Kijin doremylover123@gmail.com\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1439%2FAtariDreams%2Fperror-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1439/AtariDreams/perror-v1\nPull-Request: https://github.com/git/git/pull/1439\n\n contrib/credential/osxkeychain/git-credential-osxkeychain.c | 2 +-\n contrib/credential/wincred/git-credential-wincred.c         | 2 +-\n usage.c                                                     | 6 +++---\n 3 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c\nindex e29cc28779d..fa88d621865 100644\n--- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c\n+++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c\n@@ -11,7 +11,7 @@ static char *password;\n static UInt16 port;\n \n __attribute__((format (printf, 1, 2)))\n-static void die(const char *err, ...)\n+static void NORETURN die(const char *err, ...)\n {\n \tchar msg[4096];\n \tva_list params;\ndiff --git a/contrib/credential/wincred/git-credential-wincred.c b/contrib/credential/wincred/git-credential-wincred.c\nindex ead6e267c78..c0610d7648c 100644\n--- a/contrib/credential/wincred/git-credential-wincred.c\n+++ b/contrib/credential/wincred/git-credential-wincred.c\n@@ -12,7 +12,7 @@\n #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))\n \n __attribute__((format (printf, 1, 2)))\n-static void die(const char *err, ...)\n+static void NORETURN die(const char *err, ...)\n {\n \tchar msg[4096];\n \tva_list params;\ndiff --git a/usage.c b/usage.c\nindex 5a7c6c346c1..5f5510ceeeb 100644\n--- a/usage.c\n+++ b/usage.c\n@@ -206,7 +206,7 @@ static const char *fmt_with_err(char *buf, int n, const char *fmt)\n \treturn buf;\n }\n \n-void NORETURN die_errno(const char *fmt, ...)\n+void NORETURN die_errno(const char *err, ...)\n {\n \tchar buf[1024];\n \tva_list params;\n@@ -217,8 +217,8 @@ void NORETURN die_errno(const char *fmt, ...)\n \t\texit(128);\n \t}\n \n-\tva_start(params, fmt);\n-\tdie_routine(fmt_with_err(buf, sizeof(buf), fmt), params);\n+\tva_start(params, err);\n+\tdie_routine(fmt_with_err(buf, sizeof(buf), err), params);\n \tva_end(params);\n }\n \n\nbase-commit: a7caae2729742fc80147bca1c02ae848cb55921a\n-- \ngitgitgadget\n"},{"id":"470732","messageId":"pull.1439.v2.git.git.1674160131967.gitgitgadget@gmail.com","threadId":"59122","inReplyTo":"pull.1439.git.git.1674156875354.gitgitgadget@gmail.com","subject":"[PATCH v2] die: fix inconsistencies with usage header","fromName":"Rose via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-01-19T20:28:51Z","receivedAt":"2023-01-19T20:29:03Z","isPatch":true,"sender":{"key":"ckelsch@jgrcpa.com","avatar":null},"body":"From: Seija Kijin <doremylover123@gmail.com>\n\nThe headers for the die and usage functions\nhave different parameter names or are missing\nthe \"NORETURN\" attribute\n\nSigned-off-by: Seija Kijin <doremylover123@gmail.com>\n---\n    die: fix inconsistencies with header\n    \n    The headers for the die and usage functions have different parameter\n    names or are missing the \"NORETURN\" attribute\n    \n    Signed-off-by: Seija Kijin doremylover123@gmail.com\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1439%2FAtariDreams%2Fperror-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1439/AtariDreams/perror-v2\nPull-Request: https://github.com/git/git/pull/1439\n\nRange-diff vs v1:\n\n 1:  74e90f0fa5c ! 1:  c3b436cea9d die: fix inconsistencies with header\n     @@ Metadata\n      Author: Seija Kijin <doremylover123@gmail.com>\n      \n       ## Commit message ##\n     -    die: fix inconsistencies with header\n     +    die: fix inconsistencies with usage header\n      \n          The headers for the die and usage functions\n          have different parameter names or are missing\n\n\n contrib/credential/osxkeychain/git-credential-osxkeychain.c | 2 +-\n contrib/credential/wincred/git-credential-wincred.c         | 2 +-\n usage.c                                                     | 6 +++---\n 3 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c\nindex e29cc28779d..fa88d621865 100644\n--- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c\n+++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c\n@@ -11,7 +11,7 @@ static char *password;\n static UInt16 port;\n \n __attribute__((format (printf, 1, 2)))\n-static void die(const char *err, ...)\n+static void NORETURN die(const char *err, ...)\n {\n \tchar msg[4096];\n \tva_list params;\ndiff --git a/contrib/credential/wincred/git-credential-wincred.c b/contrib/credential/wincred/git-credential-wincred.c\nindex ead6e267c78..c0610d7648c 100644\n--- a/contrib/credential/wincred/git-credential-wincred.c\n+++ b/contrib/credential/wincred/git-credential-wincred.c\n@@ -12,7 +12,7 @@\n #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))\n \n __attribute__((format (printf, 1, 2)))\n-static void die(const char *err, ...)\n+static void NORETURN die(const char *err, ...)\n {\n \tchar msg[4096];\n \tva_list params;\ndiff --git a/usage.c b/usage.c\nindex 5a7c6c346c1..5f5510ceeeb 100644\n--- a/usage.c\n+++ b/usage.c\n@@ -206,7 +206,7 @@ static const char *fmt_with_err(char *buf, int n, const char *fmt)\n \treturn buf;\n }\n \n-void NORETURN die_errno(const char *fmt, ...)\n+void NORETURN die_errno(const char *err, ...)\n {\n \tchar buf[1024];\n \tva_list params;\n@@ -217,8 +217,8 @@ void NORETURN die_errno(const char *fmt, ...)\n \t\texit(128);\n \t}\n \n-\tva_start(params, fmt);\n-\tdie_routine(fmt_with_err(buf, sizeof(buf), fmt), params);\n+\tva_start(params, err);\n+\tdie_routine(fmt_with_err(buf, sizeof(buf), err), params);\n \tva_end(params);\n }\n \n\nbase-commit: a7caae2729742fc80147bca1c02ae848cb55921a\n-- \ngitgitgadget\n"},{"id":"509271","messageId":"pull.1439.v3.git.git.1734492483383.gitgitgadget@gmail.com","threadId":"59122","inReplyTo":"pull.1439.v2.git.git.1674160131967.gitgitgadget@gmail.com","subject":"[PATCH v3] die: fix inconsistencies with usage header","fromName":"AreaZR via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2024-12-18T03:28:03Z","receivedAt":"2024-12-18T03:28:06Z","isPatch":true,"sender":{"key":"name:AreaZR","avatar":null},"body":"From: Seija Kijin <doremylover123@gmail.com>\n\nThe headers for the die and usage functions\nhave different parameter names or are missing\nthe \"NORETURN\" attribute\n\nSigned-off-by: Seija Kijin <doremylover123@gmail.com>\n---\n    die: fix inconsistencies with header\n    \n    The headers for the die and usage functions have different parameter\n    names or are missing the \"NORETURN\" attribute\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1439%2FAreaZR%2Fperror-v3\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1439/AreaZR/perror-v3\nPull-Request: https://github.com/git/git/pull/1439\n\nRange-diff vs v2:\n\n 1:  c3b436cea9d ! 1:  e02d5982a4f die: fix inconsistencies with usage header\n     @@ Commit message\n      \n          Signed-off-by: Seija Kijin <doremylover123@gmail.com>\n      \n     - ## contrib/credential/osxkeychain/git-credential-osxkeychain.c ##\n     -@@ contrib/credential/osxkeychain/git-credential-osxkeychain.c: static char *password;\n     - static UInt16 port;\n     - \n     - __attribute__((format (printf, 1, 2)))\n     --static void die(const char *err, ...)\n     -+static void NORETURN die(const char *err, ...)\n     - {\n     - \tchar msg[4096];\n     - \tva_list params;\n     -\n       ## contrib/credential/wincred/git-credential-wincred.c ##\n      @@\n     + \n       #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))\n       \n     - __attribute__((format (printf, 1, 2)))\n     +-__attribute__((format (printf, 1, 2)))\n      -static void die(const char *err, ...)\n     ++__attribute__((format (printf, 1, 2), __noreturn__))\n      +static void NORETURN die(const char *err, ...)\n       {\n       \tchar msg[4096];\n\n\n contrib/credential/wincred/git-credential-wincred.c | 4 ++--\n usage.c                                             | 6 +++---\n 2 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/contrib/credential/wincred/git-credential-wincred.c b/contrib/credential/wincred/git-credential-wincred.c\nindex 4be0d58cd89..9e1b590d27b 100644\n--- a/contrib/credential/wincred/git-credential-wincred.c\n+++ b/contrib/credential/wincred/git-credential-wincred.c\n@@ -12,8 +12,8 @@\n \n #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))\n \n-__attribute__((format (printf, 1, 2)))\n-static void die(const char *err, ...)\n+__attribute__((format (printf, 1, 2), __noreturn__))\n+static void NORETURN die(const char *err, ...)\n {\n \tchar msg[4096];\n \tva_list params;\ndiff --git a/usage.c b/usage.c\nindex 29a9725784a..991efe25a54 100644\n--- a/usage.c\n+++ b/usage.c\n@@ -210,7 +210,7 @@ static const char *fmt_with_err(char *buf, int n, const char *fmt)\n \treturn buf;\n }\n \n-void NORETURN die_errno(const char *fmt, ...)\n+void NORETURN die_errno(const char *err, ...)\n {\n \tchar buf[1024];\n \tva_list params;\n@@ -221,8 +221,8 @@ void NORETURN die_errno(const char *fmt, ...)\n \t\texit(128);\n \t}\n \n-\tva_start(params, fmt);\n-\tdie_routine(fmt_with_err(buf, sizeof(buf), fmt), params);\n+\tva_start(params, err);\n+\tdie_routine(fmt_with_err(buf, sizeof(buf), err), params);\n \tva_end(params);\n }\n \n\nbase-commit: d882f382b3d939d90cfa58d17b17802338f05d66\n-- \ngitgitgadget\n"}]}