Fix non-literal format in printf-style calls

These were found using gcc 4.3.2-1ubuntu11 with the warning:

warning: format not a string literal and no format arguments

Incorporated suggestions from Brandon Casey <casey@nrlssc.navy.mil>.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-remote.c b/builtin-remote.c
index 584280fbf5bbbd485a1388adb15104a1ad1cf19c..5af4e643eb9dceccc62a5ce44069e0164bc12311 100644 (file)
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -323,7 +323,7 @@ static int add_branch_for_removal(const char *refname,
 
        /* make sure that symrefs are deleted */
        if (flags & REF_ISSYMREF)
 
        /* make sure that symrefs are deleted */
        if (flags & REF_ISSYMREF)

-               return unlink(git_path(refname));
+               return unlink(git_path("%s", refname));

 
        item = string_list_append(refname, branches->branches);
        item->util = xmalloc(20);
 
        item = string_list_append(refname, branches->branches);
        item->util = xmalloc(20);

diff --git a/bundle.c b/bundle.c
index 7d17a1fde16204859849aaf28945739aaa685f91..daecd8e1cad4a301e2faa3888c561746d029f09d 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -114,7 +114,7 @@ int verify_bundle(struct bundle_header *header, int verbose)
                        continue;
                }
                if (++ret == 1)
                        continue;
                }
                if (++ret == 1)

-                       error(message);
+                       error("%s", message);

                error("%s %s", sha1_to_hex(e->sha1), e->name);
        }
        if (revs.pending.nr != p->nr)
                error("%s %s", sha1_to_hex(e->sha1), e->name);
        }
        if (revs.pending.nr != p->nr)


@@ -139,7 +139,7 @@ int verify_bundle(struct bundle_header *header, int verbose)
        for (i = 0; i < req_nr; i++)
                if (!(refs.objects[i].item->flags & SHOWN)) {
                        if (++ret == 1)
        for (i = 0; i < req_nr; i++)
                if (!(refs.objects[i].item->flags & SHOWN)) {
                        if (++ret == 1)

-                               error(message);
+                               error("%s", message);

                        error("%s %s", sha1_to_hex(refs.objects[i].item->sha1),
                                refs.objects[i].name);
                }
                        error("%s %s", sha1_to_hex(refs.objects[i].item->sha1),
                                refs.objects[i].name);
                }

diff --git a/environment.c b/environment.c
index df4f03a95f0b2098e97d0410bbb0589ff887e9cb..9ebf485a738740fe6ad0ebaa5c5bf4695ee527ef 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -113,7 +113,7 @@ const char *get_git_work_tree(void)
                        work_tree = git_work_tree_cfg;
                        /* make_absolute_path also normalizes the path */
                        if (work_tree && !is_absolute_path(work_tree))
                        work_tree = git_work_tree_cfg;
                        /* make_absolute_path also normalizes the path */
                        if (work_tree && !is_absolute_path(work_tree))

-                               work_tree = xstrdup(make_absolute_path(git_path(work_tree)));
+                               work_tree = xstrdup(make_absolute_path(git_path("%s", work_tree)));

                } else if (work_tree)
                        work_tree = xstrdup(make_absolute_path(work_tree));
                git_work_tree_initialized = 1;
                } else if (work_tree)
                        work_tree = xstrdup(make_absolute_path(work_tree));
                git_work_tree_initialized = 1;

diff --git a/fsck.c b/fsck.c
index 797e3178ae279f444d2efa7e3758652ad0898dd7..ab64c18a2baf5e88de8e98d9d8526ba3a7dfed14 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -327,7 +327,7 @@ int fsck_error_function(struct object *obj, int type, const char *fmt, ...)
                        die("this should not happen, your snprintf is broken");
        }
 
                        die("this should not happen, your snprintf is broken");
        }
 

-       error(sb.buf);
+       error("%s", sb.buf);

        strbuf_release(&sb);
        return 1;
 }
        strbuf_release(&sb);
        return 1;
 }

diff --git a/grep.c b/grep.c
index 706351197fc26efa10c4666d38433f8fbdf1d6b5..13c18ff6529f437e6aea2671ab0003d4fd047ac7 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -507,7 +507,7 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
                                if (from <= last_shown)
                                        from = last_shown + 1;
                                if (last_shown && from != last_shown + 1)
                                if (from <= last_shown)
                                        from = last_shown + 1;
                                if (last_shown && from != last_shown + 1)

-                                       printf(hunk_mark);
+                                       fputs(hunk_mark, stdout);

                                while (from < lno) {
                                        pcl = &prev[lno-from-1];
                                        show_line(opt, pcl->bol, pcl->eol,
                                while (from < lno) {
                                        pcl = &prev[lno-from-1];
                                        show_line(opt, pcl->bol, pcl->eol,


@@ -517,7 +517,7 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
                                last_shown = lno-1;
                        }
                        if (last_shown && lno != last_shown + 1)
                                last_shown = lno-1;
                        }
                        if (last_shown && lno != last_shown + 1)

-                               printf(hunk_mark);
+                               fputs(hunk_mark, stdout);

                        if (!opt->count)
                                show_line(opt, bol, eol, name, lno, ':');
                        last_shown = last_hit = lno;
                        if (!opt->count)
                                show_line(opt, bol, eol, name, lno, ':');
                        last_shown = last_hit = lno;


@@ -528,7 +528,7 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
                         * we need to show this line.
                         */
                        if (last_shown && lno != last_shown + 1)
                         * we need to show this line.
                         */
                        if (last_shown && lno != last_shown + 1)

-                               printf(hunk_mark);
+                               fputs(hunk_mark, stdout);

                        show_line(opt, bol, eol, name, lno, '-');
                        last_shown = lno;
                }
                        show_line(opt, bol, eol, name, lno, '-');
                        last_shown = lno;
                }

diff --git a/path.c b/path.c
index eb24017535f944a2c5dbc46663c02937cff69cd3..a074aea64921eb1fb90f079ede9087e6b8109f6a 100644 (file)
--- a/path.c
+++ b/path.c
@@ -41,7 +41,7 @@ char *mksnpath(char *buf, size_t n, const char *fmt, ...)
        len = vsnprintf(buf, n, fmt, args);
        va_end(args);
        if (len >= n) {
        len = vsnprintf(buf, n, fmt, args);
        va_end(args);
        if (len >= n) {

-               snprintf(buf, n, bad_path);
+               strlcpy(buf, bad_path, n);

                return buf;
        }
        return cleanup_path(buf);
                return buf;
        }
        return cleanup_path(buf);


@@ -63,7 +63,7 @@ static char *git_vsnpath(char *buf, size_t n, const char *fmt, va_list args)
                goto bad;
        return cleanup_path(buf);
 bad:
                goto bad;
        return cleanup_path(buf);
 bad:

-       snprintf(buf, n, bad_path);
+       strlcpy(buf, bad_path, n);

        return buf;
 }
 
        return buf;
 }
 

diff --git a/refs.c b/refs.c
index 293389e7641a8d4ec948f21407de3f69eacbdddd..be095cb07d23ca9f0e20d2cc46df33827a123274 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -934,7 +934,7 @@ int delete_ref(const char *refname, const unsigned char *sha1, int delopt)
                        lock->lk->filename[i] = 0;
                        path = lock->lk->filename;
                } else {
                        lock->lk->filename[i] = 0;
                        path = lock->lk->filename;
                } else {

-                       path = git_path(refname);
+                       path = git_path("%s", refname);

                }
                err = unlink(path);
                if (err && errno != ENOENT) {
                }
                err = unlink(path);
                if (err && errno != ENOENT) {

diff --git a/unpack-trees.c b/unpack-trees.c
index e5749ef638b4a9a490894d9d4fc5876d904ab9ac..54f301da67be879c80426bc21776427fdd38c02e 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -352,7 +352,7 @@ static int unpack_failed(struct unpack_trees_options *o, const char *message)
        discard_index(&o->result);
        if (!o->gently) {
                if (message)
        discard_index(&o->result);
        if (!o->gently) {
                if (message)

-                       return error(message);
+                       return error("%s", message);

                return -1;
        }
        return -1;
                return -1;
        }
        return -1;