*.c static functions: add missing __attribute__((format))

avar · gitster · commit 48ca53cac4a5 · 2021-07-13T15:20:20.000-07:00
Add missing __attribute__((format)) function attributes to various
"static" functions that take printf arguments.

Signed-off-by: Ævar Arnfjörð Bjarmason &lt;avarab@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/add-patch.c b/add-patch.c
@@ -280,6 +280,7 @@ static void add_p_state_clear(struct add_p_state *s)
 	clear_add_i_state(&s->s);
 }
 
+__attribute__((format (printf, 2, 3)))
 static void err(struct add_p_state *s, const char *fmt, ...)
 {
 	va_list args;
diff --git a/builtin/am.c b/builtin/am.c
@@ -210,6 +210,7 @@ static void write_state_bool(const struct am_state *state,
  * If state->quiet is false, calls fprintf(fp, fmt, ...), and appends a newline
  * at the end.
  */
+__attribute__((format (printf, 3, 4)))
 static void say(const struct am_state *state, FILE *fp, const char *fmt, ...)
 {
 	va_list ap;
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
@@ -117,6 +117,7 @@ static int write_in_file(const char *path, const char *mode, const char *format,
 	return fclose(fp);
 }
 
+__attribute__((format (printf, 2, 3)))
 static int write_to_file(const char *path, const char *format, ...)
 {
 	int res;
@@ -129,6 +130,7 @@ static int write_to_file(const char *path, const char *format, ...)
 	return res;
 }
 
+__attribute__((format (printf, 2, 3)))
 static int append_to_file(const char *path, const char *format, ...)
 {
 	int res;
diff --git a/commit-graph.c b/commit-graph.c
@@ -2408,6 +2408,7 @@ int write_commit_graph(struct object_directory *odb,
 #define VERIFY_COMMIT_GRAPH_ERROR_HASH 2
 static int verify_commit_graph_error;
 
+__attribute__((format (printf, 1, 2)))
 static void graph_report(const char *fmt, ...)
 {
 	va_list ap;
diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
@@ -10,6 +10,7 @@ static char *username;
 static char *password;
 static UInt16 port;
 
+__attribute__((format (printf, 1, 2)))
 static void die(const char *err, ...)
 {
 	char msg[4096];
diff --git a/contrib/credential/wincred/git-credential-wincred.c b/contrib/credential/wincred/git-credential-wincred.c
@@ -11,6 +11,7 @@
 
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 
+__attribute__((format (printf, 1, 2)))
 static void die(const char *err, ...)
 {
 	char msg[4096];
diff --git a/gettext.c b/gettext.c
@@ -66,6 +66,7 @@ const char *get_preferred_languages(void)
 }
 
 #ifndef NO_GETTEXT
+__attribute__((format (printf, 1, 2)))
 static int test_vsnprintf(const char *fmt, ...)
 {
 	char buf[26];
diff --git a/imap-send.c b/imap-send.c
@@ -451,6 +451,7 @@ static int buffer_gets(struct imap_buffer *b, char **s)
 	/* not reached */
 }
 
+__attribute__((format (printf, 1, 2)))
 static void imap_info(const char *msg, ...)
 {
 	va_list va;
@@ -463,6 +464,7 @@ static void imap_info(const char *msg, ...)
 	}
 }
 
+__attribute__((format (printf, 1, 2)))
 static void imap_warn(const char *msg, ...)
 {
 	va_list va;
@@ -504,6 +506,7 @@ static char *next_arg(char **s)
 	return ret;
 }
 
+__attribute__((format (printf, 3, 4)))
 static int nfsnprintf(char *buf, int blen, const char *fmt, ...)
 {
 	int ret;
diff --git a/mailmap.c b/mailmap.c
@@ -8,6 +8,7 @@
 #define debug_mm(...) fprintf(stderr, __VA_ARGS__)
 #define debug_str(X) ((X) ? (X) : "(none)")
 #else
+__attribute__((format (printf, 1, 2)))
 static inline void debug_mm(const char *format, ...) {}
 static inline const char *debug_str(const char *s) { return s; }
 #endif
diff --git a/merge-ort.c b/merge-ort.c
@@ -529,6 +529,7 @@ static void clear_or_reinit_internal_opts(struct merge_options_internal *opti,
 	renames->callback_data_nr = renames->callback_data_alloc = 0;
 }
 
+__attribute__((format (printf, 2, 3)))
 static int err(struct merge_options *opt, const char *err, ...)
 {
 	va_list params;
diff --git a/merge-recursive.c b/merge-recursive.c
@@ -167,6 +167,7 @@ static void flush_output(struct merge_options *opt)
 	}
 }
 
+__attribute__((format (printf, 2, 3)))
 static int err(struct merge_options *opt, const char *err, ...)
 {
 	va_list params;
diff --git a/midx.c b/midx.c
@@ -1162,6 +1162,7 @@ void clear_midx_file(struct repository *r)
 
 static int verify_midx_error;
 
+__attribute__((format (printf, 1, 2)))
 static void midx_report(const char *fmt, ...)
 {
 	va_list ap;
diff --git a/ref-filter.c b/ref-filter.c
@@ -213,6 +213,7 @@ static int used_atom_cnt, need_tagged, need_symref;
  * Expand string, append it to strbuf *sb, then return error code ret.
  * Allow to save few lines of code.
  */
+__attribute__((format (printf, 3, 4)))
 static int strbuf_addf_ret(struct strbuf *sb, int ret, const char *fmt, ...)
 {
 	va_list ap;
diff --git a/sequencer.c b/sequencer.c
@@ -3521,6 +3521,7 @@ static int do_exec(struct repository *r, const char *command_line)
 	return status;
 }
 
+__attribute__((format (printf, 2, 3)))
 static int safe_append(const char *filename, const char *fmt, ...)
 {
 	va_list ap;
@@ -3598,6 +3599,7 @@ static int do_label(struct repository *r, const char *name, int len)
 	return ret;
 }
 
+__attribute__((format (printf, 3, 4)))
 static const char *reflog_message(struct replay_opts *opts,
 	const char *sub_action, const char *fmt, ...)
 {
diff --git a/server-info.c b/server-info.c
@@ -27,6 +27,7 @@ static int uic_is_stale(const struct update_info_ctx *uic)
 	return uic->old_fp == NULL;
 }
 
+__attribute__((format (printf, 2, 3)))
 static int uic_printf(struct update_info_ctx *uic, const char *fmt, ...)
 {
 	va_list ap;
diff --git a/worktree.c b/worktree.c
@@ -265,6 +265,7 @@ const char *worktree_prune_reason(struct worktree *wt, timestamp_t expire)
 }
 
 /* convenient wrapper to deal with NULL strbuf */
+__attribute__((format (printf, 2, 3)))
 static void strbuf_addf_gently(struct strbuf *buf, const char *fmt, ...)
 {
 	va_list params;

Original file line number	Diff line number	Diff line change
`@@ -280,6 +280,7 @@ static void add_p_state_clear(struct add_p_state *s)`
`280`	`280`	`clear_add_i_state(&s->s);`
`281`	`281`	`}`
`282`	`282`
	`283`	`+__attribute__((format (printf, 2, 3)))`
`283`	`284`	`static void err(struct add_p_state s, const char fmt, ...)`
`284`	`285`	`{`
`285`	`286`	`va_list args;`
Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,7 @@ static void write_state_bool(const struct am_state *state,`
`210`	`210`	`* If state->quiet is false, calls fprintf(fp, fmt, ...), and appends a newline`
`211`	`211`	`* at the end.`
`212`	`212`	`*/`
	`213`	`+__attribute__((format (printf, 3, 4)))`
`213`	`214`	`static void say(const struct am_state state, FILE fp, const char *fmt, ...)`
`214`	`215`	`{`
`215`	`216`	`va_list ap;`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ static int write_in_file(const char path, const char mode, const char *format,`
`117`	`117`	`return fclose(fp);`
`118`	`118`	`}`
`119`	`119`
	`120`	`+__attribute__((format (printf, 2, 3)))`
`120`	`121`	`static int write_to_file(const char path, const char format, ...)`
`121`	`122`	`{`
`122`	`123`	`int res;`
`@@ -129,6 +130,7 @@ static int write_to_file(const char path, const char format, ...)`
`129`	`130`	`return res;`
`130`	`131`	`}`
`131`	`132`
	`133`	`+__attribute__((format (printf, 2, 3)))`
`132`	`134`	`static int append_to_file(const char path, const char format, ...)`
`133`	`135`	`{`
`134`	`136`	`int res;`
Original file line number	Diff line number	Diff line change
`@@ -2408,6 +2408,7 @@ int write_commit_graph(struct object_directory *odb,`
`2408`	`2408`	`#define VERIFY_COMMIT_GRAPH_ERROR_HASH 2`
`2409`	`2409`	`static int verify_commit_graph_error;`
`2410`	`2410`
	`2411`	`+__attribute__((format (printf, 1, 2)))`
`2411`	`2412`	`static void graph_report(const char *fmt, ...)`
`2412`	`2413`	`{`
`2413`	`2414`	`va_list ap;`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ static char *username;`
`10`	`10`	`static char *password;`
`11`	`11`	`static UInt16 port;`
`12`	`12`
	`13`	`+__attribute__((format (printf, 1, 2)))`
`13`	`14`	`static void die(const char *err, ...)`
`14`	`15`	`{`
`15`	`16`	`char msg[4096];`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))`
`13`	`13`
	`14`	`+__attribute__((format (printf, 1, 2)))`
`14`	`15`	`static void die(const char *err, ...)`
`15`	`16`	`{`
`16`	`17`	`char msg[4096];`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ const char *get_preferred_languages(void)`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`#ifndef NO_GETTEXT`
	`69`	`+__attribute__((format (printf, 1, 2)))`
`69`	`70`	`static int test_vsnprintf(const char *fmt, ...)`
`70`	`71`	`{`
`71`	`72`	`char buf[26];`
Original file line number	Diff line number	Diff line change
`@@ -451,6 +451,7 @@ static int buffer_gets(struct imap_buffer b, char *s)`
`451`	`451`	`/* not reached */`
`452`	`452`	`}`
`453`	`453`
	`454`	`+__attribute__((format (printf, 1, 2)))`
`454`	`455`	`static void imap_info(const char *msg, ...)`
`455`	`456`	`{`
`456`	`457`	`va_list va;`
`@@ -463,6 +464,7 @@ static void imap_info(const char *msg, ...)`
`463`	`464`	`}`
`464`	`465`	`}`
`465`	`466`
	`467`	`+__attribute__((format (printf, 1, 2)))`
`466`	`468`	`static void imap_warn(const char *msg, ...)`
`467`	`469`	`{`
`468`	`470`	`va_list va;`
`@@ -504,6 +506,7 @@ static char next_arg(char *s)`
`504`	`506`	`return ret;`
`505`	`507`	`}`
`506`	`508`
	`509`	`+__attribute__((format (printf, 3, 4)))`
`507`	`510`	`static int nfsnprintf(char buf, int blen, const char fmt, ...)`
`508`	`511`	`{`
`509`	`512`	`int ret;`
Original file line number	Diff line number	Diff line change
`@@ -529,6 +529,7 @@ static void clear_or_reinit_internal_opts(struct merge_options_internal *opti,`
`529`	`529`	`renames->callback_data_nr = renames->callback_data_alloc = 0;`
`530`	`530`	`}`
`531`	`531`
	`532`	`+__attribute__((format (printf, 2, 3)))`
`532`	`533`	`static int err(struct merge_options opt, const char err, ...)`
`533`	`534`	`{`
`534`	`535`	`va_list params;`