Check the format of more printf-type functions

We already have these checks in many printf-type functions that have
prototypes which are in header files.  Add these same checks to some
more prototypes in header functions and to static functions in .c
files.

cc: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Tarmigan Casebolt <tarmigan+git@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-fsck.c b/builtin-fsck.c
index 2d88e4570f8217beaf7f5400dc3c3a328222ebe8..0e5faae381ed94c26671fcae04ea96d3656d7627 100644 (file)
--- a/builtin-fsck.c
+++ b/builtin-fsck.c
@@ -47,6 +47,7 @@ static void objreport(struct object *obj, const char *severity,
        fputs("\n", stderr);
 }
 
        fputs("\n", stderr);
 }
 

+__attribute__((format (printf, 2, 3)))

 static int objerror(struct object *obj, const char *err, ...)
 {
        va_list params;
 static int objerror(struct object *obj, const char *err, ...)
 {
        va_list params;


@@ -57,6 +58,7 @@ static int objerror(struct object *obj, const char *err, ...)
        return -1;
 }
 
        return -1;
 }
 

+__attribute__((format (printf, 3, 4)))

 static int fsck_error_func(struct object *obj, int type, const char *err, ...)
 {
        va_list params;
 static int fsck_error_func(struct object *obj, int type, const char *err, ...)
 {
        va_list params;

diff --git a/builtin-update-index.c b/builtin-update-index.c
index 92beaaf4b3ca5520a9af27bde7f15dda46d80197..a6b7f2d6361fc1e8ea9713082affc72362f08d76 100644 (file)
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@ -27,6 +27,7 @@ static int mark_valid_only;
 #define MARK_VALID 1
 #define UNMARK_VALID 2
 
 #define MARK_VALID 1
 #define UNMARK_VALID 2
 

+__attribute__((format (printf, 1, 2)))

 static void report(const char *fmt, ...)
 {
        va_list vp;
 static void report(const char *fmt, ...)
 {
        va_list vp;

diff --git a/builtin-upload-archive.c b/builtin-upload-archive.c
index c4cd1e1327f18ae27b74fac6dfd41938cd9dfe5d..b2d12592a3320fc1763dc1496a188e887ca8c7ce 100644 (file)
--- a/builtin-upload-archive.c
+++ b/builtin-upload-archive.c
@@ -67,6 +67,7 @@ static int run_upload_archive(int argc, const char **argv, const char *prefix)
        return write_archive(sent_argc, sent_argv, prefix, 0);
 }
 
        return write_archive(sent_argc, sent_argv, prefix, 0);
 }
 

+__attribute__((format (printf, 1, 2)))

 static void error_clnt(const char *fmt, ...)
 {
        char buf[1024];
 static void error_clnt(const char *fmt, ...)
 {
        char buf[1024];

diff --git a/cache.h b/cache.h
index 71a731dbc988a8a22d0a2e1f8f3a5223f4c5d67a..ff45269d295c61797d55ca27e44cd218980d6505 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -961,7 +961,9 @@ extern void *alloc_object_node(void);
 extern void alloc_report(void);
 
 /* trace.c */
 extern void alloc_report(void);
 
 /* trace.c */

+__attribute__((format (printf, 1, 2)))

 extern void trace_printf(const char *format, ...);
 extern void trace_printf(const char *format, ...);

+__attribute__((format (printf, 2, 3)))

 extern void trace_argv_printf(const char **argv, const char *format, ...);
 
 /* convert.c */
 extern void trace_argv_printf(const char **argv, const char *format, ...);
 
 /* convert.c */

diff --git a/color.h b/color.h
index 18abeb7c7dd47794d4f5fea4049b5719f03383fe..7d8da6fe2207ae4adb7ab888edd57ab571665458 100644 (file)
--- a/color.h
+++ b/color.h
@@ -29,7 +29,9 @@ int git_color_default_config(const char *var, const char *value, void *cb);
 int git_config_colorbool(const char *var, const char *value, int stdout_is_tty);
 void color_parse(const char *value, const char *var, char *dst);
 void color_parse_mem(const char *value, int len, const char *var, char *dst);
 int git_config_colorbool(const char *var, const char *value, int stdout_is_tty);
 void color_parse(const char *value, const char *var, char *dst);
 void color_parse_mem(const char *value, int len, const char *var, char *dst);

+__attribute__((format (printf, 3, 4)))

 int color_fprintf(FILE *fp, const char *color, const char *fmt, ...);
 int color_fprintf(FILE *fp, const char *color, const char *fmt, ...);

+__attribute__((format (printf, 3, 4)))

 int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...);
 int color_fwrite_lines(FILE *fp, const char *color, size_t count, const char *buf);
 
 int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...);
 int color_fwrite_lines(FILE *fp, const char *color, size_t count, const char *buf);
 

diff --git a/daemon.c b/daemon.c
index 1b5ada6648da66d14dec6c399898916920582852..641ebe16dd3ee07e3e2a4ed6d6b646764391333b 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -77,6 +77,7 @@ static void logreport(int priority, const char *err, va_list params)
        }
 }
 
        }
 }
 

+__attribute__((format (printf, 1, 2)))

 static void logerror(const char *err, ...)
 {
        va_list params;
 static void logerror(const char *err, ...)
 {
        va_list params;


@@ -85,6 +86,7 @@ static void logerror(const char *err, ...)
        va_end(params);
 }
 
        va_end(params);
 }
 

+__attribute__((format (printf, 1, 2)))

 static void loginfo(const char *err, ...)
 {
        va_list params;
 static void loginfo(const char *err, ...)
 {
        va_list params;

diff --git a/fsck.h b/fsck.h
index 008456b675b6e5c8a5a07e0b8628a41e3acc733a..1e4f527318ea4b4d701a27e08d68f3551173f176 100644 (file)
--- a/fsck.h
+++ b/fsck.h
@@ -17,6 +17,7 @@ typedef int (*fsck_walk_func)(struct object *obj, int type, void *data);
 /* callback for fsck_object, type is FSCK_ERROR or FSCK_WARN */
 typedef int (*fsck_error)(struct object *obj, int type, const char *err, ...);
 
 /* callback for fsck_object, type is FSCK_ERROR or FSCK_WARN */
 typedef int (*fsck_error)(struct object *obj, int type, const char *err, ...);
 

+__attribute__((format (printf, 3, 4)))

 int fsck_error_function(struct object *obj, int type, const char *fmt, ...);
 
 /* descend in all linked child objects
 int fsck_error_function(struct object *obj, int type, const char *fmt, ...);
 
 /* descend in all linked child objects

diff --git a/imap-send.c b/imap-send.c
index f805c6ed813bbc6130bcd2d9f89bdb44ad9625e1..57a3c65dda00ac5b04386978988b668be0815543 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -100,13 +100,16 @@ struct msg_data {
 
 static int Verbose, Quiet;
 
 
 static int Verbose, Quiet;
 

+__attribute__((format (printf, 1, 2)))

 static void imap_info(const char *, ...);
 static void imap_info(const char *, ...);

+__attribute__((format (printf, 1, 2)))

 static void imap_warn(const char *, ...);
 
 static char *next_arg(char **);
 
 static void free_generic_messages(struct message *);
 
 static void imap_warn(const char *, ...);
 
 static char *next_arg(char **);
 
 static void free_generic_messages(struct message *);
 

+__attribute__((format (printf, 3, 4)))

 static int nfsnprintf(char *buf, int blen, const char *fmt, ...);
 
 static int nfvasprintf(char **strp, const char *fmt, va_list ap)
 static int nfsnprintf(char *buf, int blen, const char *fmt, ...);
 
 static int nfvasprintf(char **strp, const char *fmt, va_list ap)


@@ -600,6 +603,7 @@ static struct imap_cmd *v_issue_imap_cmd(struct imap_store *ctx,
        return cmd;
 }
 
        return cmd;
 }
 

+__attribute__((format (printf, 3, 4)))

 static struct imap_cmd *issue_imap_cmd(struct imap_store *ctx,
                                       struct imap_cmd_cb *cb,
                                       const char *fmt, ...)
 static struct imap_cmd *issue_imap_cmd(struct imap_store *ctx,
                                       struct imap_cmd_cb *cb,
                                       const char *fmt, ...)


@@ -613,6 +617,7 @@ static struct imap_cmd *issue_imap_cmd(struct imap_store *ctx,
        return ret;
 }
 
        return ret;
 }
 

+__attribute__((format (printf, 3, 4)))

 static int imap_exec(struct imap_store *ctx, struct imap_cmd_cb *cb,
                     const char *fmt, ...)
 {
 static int imap_exec(struct imap_store *ctx, struct imap_cmd_cb *cb,
                     const char *fmt, ...)
 {


@@ -628,6 +633,7 @@ static int imap_exec(struct imap_store *ctx, struct imap_cmd_cb *cb,
        return get_cmd_result(ctx, cmdp);
 }
 
        return get_cmd_result(ctx, cmdp);
 }
 

+__attribute__((format (printf, 3, 4)))

 static int imap_exec_m(struct imap_store *ctx, struct imap_cmd_cb *cb,
                       const char *fmt, ...)
 {
 static int imap_exec_m(struct imap_store *ctx, struct imap_cmd_cb *cb,
                       const char *fmt, ...)
 {


@@ -918,7 +924,7 @@ static int get_cmd_result(struct imap_store *ctx, struct imap_cmd *tcmd)
                                if (!strcmp("NO", arg)) {
                                        if (cmdp->cb.create && cmd && (cmdp->cb.trycreate || !memcmp(cmd, "[TRYCREATE]", 11))) { /* SELECT, APPEND or UID COPY */
                                                p = strchr(cmdp->cmd, '"');
                                if (!strcmp("NO", arg)) {
                                        if (cmdp->cb.create && cmd && (cmdp->cb.trycreate || !memcmp(cmd, "[TRYCREATE]", 11))) { /* SELECT, APPEND or UID COPY */
                                                p = strchr(cmdp->cmd, '"');

-                                               if (!issue_imap_cmd(ctx, NULL, "CREATE \"%.*s\"", strchr(p + 1, '"') - p + 1, p)) {
+                                               if (!issue_imap_cmd(ctx, NULL, "CREATE \"%.*s\"", (int)(strchr(p + 1, '"') - p + 1), p)) {

                                                        resp = RESP_BAD;
                                                        goto normal;
                                                }
                                                        resp = RESP_BAD;
                                                        goto normal;
                                                }

diff --git a/merge-recursive.c b/merge-recursive.c
index f55b7ebe11bbd54f00a84dd1eb9d34f60d74a1c3..baabe2c35647d65716d1b82473846e80cc02957b 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -86,6 +86,7 @@ static void flush_output(struct merge_options *o)
        }
 }
 
        }
 }
 

+__attribute__((format (printf, 3, 4)))

 static void output(struct merge_options *o, int v, const char *fmt, ...)
 {
        int len;
 static void output(struct merge_options *o, int v, const char *fmt, ...)
 {
        int len;


@@ -214,7 +215,8 @@ struct tree *write_tree_from_memory(struct merge_options *o)
                for (i = 0; i < active_nr; i++) {
                        struct cache_entry *ce = active_cache[i];
                        if (ce_stage(ce))
                for (i = 0; i < active_nr; i++) {
                        struct cache_entry *ce = active_cache[i];
                        if (ce_stage(ce))

-                               output(o, 0, "%d %.*s", ce_stage(ce), ce_namelen(ce), ce->name);
+                               output(o, 0, "%d %.*s", ce_stage(ce),
+                                      (int)ce_namelen(ce), ce->name);

                }
                return NULL;
        }
                }
                return NULL;
        }

diff --git a/strbuf.h b/strbuf.h
index d05e056dd3916b64865ac9a0337ecbf31625f436..fa07ecf094bd3ef8997958fde29199f8fb6421b9 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -117,7 +117,7 @@ struct strbuf_expand_dict_entry {
 };
 extern size_t strbuf_expand_dict_cb(struct strbuf *sb, const char *placeholder, void *context);
 
 };
 extern size_t strbuf_expand_dict_cb(struct strbuf *sb, const char *placeholder, void *context);
 

-__attribute__((format(printf,2,3)))
+__attribute__((format (printf,2,3)))

 extern void strbuf_addf(struct strbuf *sb, const char *fmt, ...);
 
 extern size_t strbuf_fread(struct strbuf *, size_t, FILE *);
 extern void strbuf_addf(struct strbuf *sb, const char *fmt, ...);
 
 extern size_t strbuf_fread(struct strbuf *, size_t, FILE *);