use strbuf_addstr() for adding constant strings to a strbuf, part 2

Replace uses of strbuf_addf() for adding strings with more lightweight
strbuf_addstr() calls.  This makes the intent clearer and avoids
potential issues with printf format specifiers.

02962d36845b89145cd69f8bc65e015d78ae3434 already converted six cases,
this patch covers eleven more.

A semantic patch for Coccinelle is included for easier checking for
new cases that might be introduced in the future.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index ac84e99f3a6c073409ab7514aacdad7e722c6255..dc2e9e420d6beb47f0e04184dfb7429b6559a789 100644 (file)
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -395,7 +395,7 @@ static void shortlog(const char *name,
 
        for (i = 0; i < subjects.nr; i++)
                if (i >= limit)
 
        for (i = 0; i < subjects.nr; i++)
                if (i >= limit)

-                       strbuf_addf(out, "  ...\n");
+                       strbuf_addstr(out, "  ...\n");

                else
                        strbuf_addf(out, "  %s\n", subjects.items[i].string);
 
                else
                        strbuf_addf(out, "  %s\n", subjects.items[i].string);
 

diff --git a/builtin/merge.c b/builtin/merge.c
index 0ae099f746680e5c2fcc55dff56624da1619f2f1..a8b57c7d9856518fdcd4c3819f0656544eadf022 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -940,7 +940,7 @@ static void write_merge_state(struct commit_list *remoteheads)
 
        strbuf_reset(&buf);
        if (fast_forward == FF_NO)
 
        strbuf_reset(&buf);
        if (fast_forward == FF_NO)

-               strbuf_addf(&buf, "no-ff");
+               strbuf_addstr(&buf, "no-ff");

        write_file_buf(git_path_merge_mode(), buf.buf, buf.len);
 }
 
        write_file_buf(git_path_merge_mode(), buf.buf, buf.len);
 }
 

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index e79790f0bdc9f19cb9d9773d1a9bdb10044bbb8d..8807539115b0284bb56b5a2d75226fab27b8cb5a 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -749,8 +749,9 @@ static int update_clone_get_next_task(struct child_process *child,
                ce = suc->failed_clones[index];
                if (!prepare_to_clone_next_submodule(ce, child, suc, err)) {
                        suc->current ++;
                ce = suc->failed_clones[index];
                if (!prepare_to_clone_next_submodule(ce, child, suc, err)) {
                        suc->current ++;

-                       strbuf_addf(err, "BUG: submodule considered for cloning,"
-                                   "doesn't need cloning any more?\n");
+                       strbuf_addstr(err, "BUG: submodule considered for "
+                                          "cloning, doesn't need cloning "
+                                          "any more?\n");

                        return 0;
                }
                p = xmalloc(sizeof(*p));
                        return 0;
                }
                p = xmalloc(sizeof(*p));

diff --git a/contrib/coccinelle/strbuf.cocci b/contrib/coccinelle/strbuf.cocci
new file mode 100644 (file)
index 0000000..7932d48
--- /dev/null
+++ b/contrib/coccinelle/strbuf.cocci
@@ -0,0 +1,5 @@
+@@
+expression E1, E2;
+@@
+- strbuf_addf(E1, E2);
++ strbuf_addstr(E1, E2);

diff --git a/merge-recursive.c b/merge-recursive.c
index e34912683ca106524616673f96fff538af8447ed..d2b191b8c6832e2bfd27516ff549d47102510dff 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -206,7 +206,7 @@ static void output_commit_title(struct merge_options *o, struct commit *commit)
                        find_unique_abbrev(commit->object.oid.hash,
                                DEFAULT_ABBREV));
                if (parse_commit(commit) != 0)
                        find_unique_abbrev(commit->object.oid.hash,
                                DEFAULT_ABBREV));
                if (parse_commit(commit) != 0)

-                       strbuf_addf(&o->obuf, _("(bad commit)\n"));
+                       strbuf_addstr(&o->obuf, _("(bad commit)\n"));

                else {
                        const char *title;
                        const char *msg = get_commit_buffer(commit, NULL);
                else {
                        const char *title;
                        const char *msg = get_commit_buffer(commit, NULL);

diff --git a/remote.c b/remote.c
index d29850a81cdb09b41da5dc3e7284106672d85a4c..ad6c5424edab2ae15ac17bfcf12ac4ee93b5aa3f 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -2073,7 +2073,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
                        _("Your branch is based on '%s', but the upstream is gone.\n"),
                        base);
                if (advice_status_hints)
                        _("Your branch is based on '%s', but the upstream is gone.\n"),
                        base);
                if (advice_status_hints)

-                       strbuf_addf(sb,
+                       strbuf_addstr(sb,

                                _("  (use \"git branch --unset-upstream\" to fixup)\n"));
        } else if (!ours && !theirs) {
                strbuf_addf(sb,
                                _("  (use \"git branch --unset-upstream\" to fixup)\n"));
        } else if (!ours && !theirs) {
                strbuf_addf(sb,


@@ -2086,7 +2086,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
                           ours),
                        base, ours);
                if (advice_status_hints)
                           ours),
                        base, ours);
                if (advice_status_hints)

-                       strbuf_addf(sb,
+                       strbuf_addstr(sb,

                                _("  (use \"git push\" to publish your local commits)\n"));
        } else if (!ours) {
                strbuf_addf(sb,
                                _("  (use \"git push\" to publish your local commits)\n"));
        } else if (!ours) {
                strbuf_addf(sb,


@@ -2097,7 +2097,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
                           theirs),
                        base, theirs);
                if (advice_status_hints)
                           theirs),
                        base, theirs);
                if (advice_status_hints)

-                       strbuf_addf(sb,
+                       strbuf_addstr(sb,

                                _("  (use \"git pull\" to update your local branch)\n"));
        } else {
                strbuf_addf(sb,
                                _("  (use \"git pull\" to update your local branch)\n"));
        } else {
                strbuf_addf(sb,


@@ -2110,7 +2110,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
                           ours + theirs),
                        base, ours, theirs);
                if (advice_status_hints)
                           ours + theirs),
                        base, ours, theirs);
                if (advice_status_hints)

-                       strbuf_addf(sb,
+                       strbuf_addstr(sb,

                                _("  (use \"git pull\" to merge the remote branch into yours)\n"));
        }
        free(base);
                                _("  (use \"git pull\" to merge the remote branch into yours)\n"));
        }
        free(base);

diff --git a/wt-status.c b/wt-status.c
index 6225a2d89f2c38bea6ed64295a28e7e07d19522c..39470dadf03ca9420aa9da50849ec9c8b409e2ed 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -367,11 +367,11 @@ static void wt_status_print_change_data(struct wt_status *s,
                if (d->new_submodule_commits || d->dirty_submodule) {
                        strbuf_addstr(&extra, " (");
                        if (d->new_submodule_commits)
                if (d->new_submodule_commits || d->dirty_submodule) {
                        strbuf_addstr(&extra, " (");
                        if (d->new_submodule_commits)

-                               strbuf_addf(&extra, _("new commits, "));
+                               strbuf_addstr(&extra, _("new commits, "));

                        if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
                        if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)

-                               strbuf_addf(&extra, _("modified content, "));
+                               strbuf_addstr(&extra, _("modified content, "));

                        if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
                        if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)

-                               strbuf_addf(&extra, _("untracked content, "));
+                               strbuf_addstr(&extra, _("untracked content, "));

                        strbuf_setlen(&extra, extra.len - 2);
                        strbuf_addch(&extra, ')');
                }
                        strbuf_setlen(&extra, extra.len - 2);
                        strbuf_addch(&extra, ')');
                }