mirror of https://github.com/git/git.git
*.c static functions: add missing __attribute__((format))
Add missing __attribute__((format)) function attributes to various "static" functions that take printf arguments. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d4ac305073
commit
48ca53cac4
|
@ -280,6 +280,7 @@ static void add_p_state_clear(struct add_p_state *s)
|
||||||
clear_add_i_state(&s->s);
|
clear_add_i_state(&s->s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__attribute__((format (printf, 2, 3)))
|
||||||
static void err(struct add_p_state *s, const char *fmt, ...)
|
static void err(struct add_p_state *s, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list args;
|
va_list args;
|
||||||
|
|
|
@ -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
|
* If state->quiet is false, calls fprintf(fp, fmt, ...), and appends a newline
|
||||||
* at the end.
|
* at the end.
|
||||||
*/
|
*/
|
||||||
|
__attribute__((format (printf, 3, 4)))
|
||||||
static void say(const struct am_state *state, FILE *fp, const char *fmt, ...)
|
static void say(const struct am_state *state, FILE *fp, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
|
|
@ -117,6 +117,7 @@ static int write_in_file(const char *path, const char *mode, const char *format,
|
||||||
return fclose(fp);
|
return fclose(fp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__attribute__((format (printf, 2, 3)))
|
||||||
static int write_to_file(const char *path, const char *format, ...)
|
static int write_to_file(const char *path, const char *format, ...)
|
||||||
{
|
{
|
||||||
int res;
|
int res;
|
||||||
|
@ -129,6 +130,7 @@ static int write_to_file(const char *path, const char *format, ...)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__attribute__((format (printf, 2, 3)))
|
||||||
static int append_to_file(const char *path, const char *format, ...)
|
static int append_to_file(const char *path, const char *format, ...)
|
||||||
{
|
{
|
||||||
int res;
|
int res;
|
||||||
|
|
|
@ -2408,6 +2408,7 @@ cleanup:
|
||||||
#define VERIFY_COMMIT_GRAPH_ERROR_HASH 2
|
#define VERIFY_COMMIT_GRAPH_ERROR_HASH 2
|
||||||
static int verify_commit_graph_error;
|
static int verify_commit_graph_error;
|
||||||
|
|
||||||
|
__attribute__((format (printf, 1, 2)))
|
||||||
static void graph_report(const char *fmt, ...)
|
static void graph_report(const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
|
|
@ -10,6 +10,7 @@ static char *username;
|
||||||
static char *password;
|
static char *password;
|
||||||
static UInt16 port;
|
static UInt16 port;
|
||||||
|
|
||||||
|
__attribute__((format (printf, 1, 2)))
|
||||||
static void die(const char *err, ...)
|
static void die(const char *err, ...)
|
||||||
{
|
{
|
||||||
char msg[4096];
|
char msg[4096];
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
|
|
||||||
#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
|
#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
|
||||||
|
|
||||||
|
__attribute__((format (printf, 1, 2)))
|
||||||
static void die(const char *err, ...)
|
static void die(const char *err, ...)
|
||||||
{
|
{
|
||||||
char msg[4096];
|
char msg[4096];
|
||||||
|
|
|
@ -66,6 +66,7 @@ const char *get_preferred_languages(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef NO_GETTEXT
|
#ifndef NO_GETTEXT
|
||||||
|
__attribute__((format (printf, 1, 2)))
|
||||||
static int test_vsnprintf(const char *fmt, ...)
|
static int test_vsnprintf(const char *fmt, ...)
|
||||||
{
|
{
|
||||||
char buf[26];
|
char buf[26];
|
||||||
|
|
|
@ -451,6 +451,7 @@ static int buffer_gets(struct imap_buffer *b, char **s)
|
||||||
/* not reached */
|
/* not reached */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__attribute__((format (printf, 1, 2)))
|
||||||
static void imap_info(const char *msg, ...)
|
static void imap_info(const char *msg, ...)
|
||||||
{
|
{
|
||||||
va_list va;
|
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, ...)
|
static void imap_warn(const char *msg, ...)
|
||||||
{
|
{
|
||||||
va_list va;
|
va_list va;
|
||||||
|
@ -504,6 +506,7 @@ static char *next_arg(char **s)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__attribute__((format (printf, 3, 4)))
|
||||||
static int nfsnprintf(char *buf, int blen, const char *fmt, ...)
|
static int nfsnprintf(char *buf, int blen, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#define debug_mm(...) fprintf(stderr, __VA_ARGS__)
|
#define debug_mm(...) fprintf(stderr, __VA_ARGS__)
|
||||||
#define debug_str(X) ((X) ? (X) : "(none)")
|
#define debug_str(X) ((X) ? (X) : "(none)")
|
||||||
#else
|
#else
|
||||||
|
__attribute__((format (printf, 1, 2)))
|
||||||
static inline void debug_mm(const char *format, ...) {}
|
static inline void debug_mm(const char *format, ...) {}
|
||||||
static inline const char *debug_str(const char *s) { return s; }
|
static inline const char *debug_str(const char *s) { return s; }
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -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;
|
renames->callback_data_nr = renames->callback_data_alloc = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__attribute__((format (printf, 2, 3)))
|
||||||
static int err(struct merge_options *opt, const char *err, ...)
|
static int err(struct merge_options *opt, const char *err, ...)
|
||||||
{
|
{
|
||||||
va_list params;
|
va_list params;
|
||||||
|
|
|
@ -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, ...)
|
static int err(struct merge_options *opt, const char *err, ...)
|
||||||
{
|
{
|
||||||
va_list params;
|
va_list params;
|
||||||
|
|
1
midx.c
1
midx.c
|
@ -1162,6 +1162,7 @@ void clear_midx_file(struct repository *r)
|
||||||
|
|
||||||
static int verify_midx_error;
|
static int verify_midx_error;
|
||||||
|
|
||||||
|
__attribute__((format (printf, 1, 2)))
|
||||||
static void midx_report(const char *fmt, ...)
|
static void midx_report(const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
|
|
@ -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.
|
* Expand string, append it to strbuf *sb, then return error code ret.
|
||||||
* Allow to save few lines of code.
|
* 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, ...)
|
static int strbuf_addf_ret(struct strbuf *sb, int ret, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
|
|
@ -3521,6 +3521,7 @@ static int do_exec(struct repository *r, const char *command_line)
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__attribute__((format (printf, 2, 3)))
|
||||||
static int safe_append(const char *filename, const char *fmt, ...)
|
static int safe_append(const char *filename, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
@ -3598,6 +3599,7 @@ static int do_label(struct repository *r, const char *name, int len)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__attribute__((format (printf, 3, 4)))
|
||||||
static const char *reflog_message(struct replay_opts *opts,
|
static const char *reflog_message(struct replay_opts *opts,
|
||||||
const char *sub_action, const char *fmt, ...)
|
const char *sub_action, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
|
|
|
@ -27,6 +27,7 @@ static int uic_is_stale(const struct update_info_ctx *uic)
|
||||||
return uic->old_fp == NULL;
|
return uic->old_fp == NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__attribute__((format (printf, 2, 3)))
|
||||||
static int uic_printf(struct update_info_ctx *uic, const char *fmt, ...)
|
static int uic_printf(struct update_info_ctx *uic, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
|
|
@ -265,6 +265,7 @@ const char *worktree_prune_reason(struct worktree *wt, timestamp_t expire)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* convenient wrapper to deal with NULL strbuf */
|
/* convenient wrapper to deal with NULL strbuf */
|
||||||
|
__attribute__((format (printf, 2, 3)))
|
||||||
static void strbuf_addf_gently(struct strbuf *buf, const char *fmt, ...)
|
static void strbuf_addf_gently(struct strbuf *buf, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list params;
|
va_list params;
|
||||||
|
|
Loading…
Reference in New Issue