[PATCH 5/6] bugreport.c: tweak cmd_bugreport() to use __attribute__((printf))
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Jul 10, 2021, 08:47 UTC
- Message-ID
- <patch-5.6-daca344a165-20210710T084445Z-avarab@gmail.com>
- In-Reply-To
- <cover-0.6-00000000000-20210710T084445Z-avarab@gmail.com>
As noted in the preceding commit we had no __attribute__((format)) check for strbuf_addftime(), and furthermore had no in-tree user that passed it a fixed string.
Let's tweak this codepath added in 238b439d698 (bugreport: add tool to generate debugging info, 2020-04-16) to make use of the compile-time check.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/bugreport.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/builtin/bugreport.c b/builtin/bugreport.c index 9915a5841de..02edfb9a047 100644 --- a/builtin/bugreport.c +++ b/builtin/bugreport.c @@ -127,7 +127,7 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix) time_t now = time(NULL); struct tm tm; char *option_output = NULL; - char *option_suffix = "%Y-%m-%d-%H%M"; + char *option_suffix = NULL; const char *user_relative_path = NULL; char *prefixed_filename; @@ -149,7 +149,14 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix) strbuf_complete(&report_path, '/'); strbuf_addstr(&report_path, "git-bugreport-"); - strbuf_addftime(&report_path, option_suffix, localtime_r(&now, &tm), 0, 0); + /* + * This is an if/else for the benefit of the compile-time + * strftime() format checking we have for strbuf_addftime(). + */ + if (option_suffix) + strbuf_addftime(&report_path, option_suffix, localtime_r(&now, &tm), 0, 0); + else + strbuf_addftime(&report_path, "%Y-%m-%d-%H%M", localtime_r(&now, &tm), 0, 0); strbuf_addstr(&report_path, ".txt"); switch (safe_create_leading_directories(report_path.buf)) {
-- 2.32.0.636.g43e71d69cff