use strbuf_addstr() for adding strings to strbufs

Use strbuf_addstr() instead of strbuf_addf() for adding strings.  That's
simpler and makes the intent clearer.

Patch generated by Coccinelle and contrib/coccinelle/strbuf.cocci;
adjusted indentation in refs/packed-backend.c manually.

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

diff --git a/builtin/branch.c b/builtin/branch.c
index 355f9ef5da164d4d3e88872984fced9e9a744a84..a2b7c554275e871b2d175353459bbfa0744327f2 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -352,7 +352,7 @@ static char *build_format(struct ref_filter *filter, int maxwidth, const char *r
                        strbuf_addf(&obname, "%%(objectname:short=%d)", filter->abbrev);
 
                strbuf_addf(&local, "%%(align:%d,left)%%(refname:lstrip=2)%%(end)", maxwidth);
                        strbuf_addf(&obname, "%%(objectname:short=%d)", filter->abbrev);
 
                strbuf_addf(&local, "%%(align:%d,left)%%(refname:lstrip=2)%%(end)", maxwidth);

-               strbuf_addf(&local, "%s", branch_get_color(BRANCH_COLOR_RESET));
+               strbuf_addstr(&local, branch_get_color(BRANCH_COLOR_RESET));

                strbuf_addf(&local, " %s ", obname.buf);
 
                if (filter->verbose > 1)
                strbuf_addf(&local, " %s ", obname.buf);
 
                if (filter->verbose > 1)

diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index 3bc47ffd5ea4e82f2505a8649b162d18ebf11a21..2951514f251bcb9274932789a0535caefbf03c2d 100644 (file)
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -729,8 +729,8 @@ static int write_with_updates(struct packed_ref_store *refs,
        }
 
        if (ok != ITER_DONE) {
        }
 
        if (ok != ITER_DONE) {

-               strbuf_addf(err, "unable to write packed-refs file: "
-                           "error iterating over old contents");
+               strbuf_addstr(err, "unable to write packed-refs file: "
+                             "error iterating over old contents");

                goto error;
        }
 
                goto error;
        }
 

diff --git a/sequencer.c b/sequencer.c
index 60636ce54b615e19a22dc2396211d56540b4e920..ba95cefc7d22d849163d28795d644995641606ef 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -203,7 +203,7 @@ int sequencer_remove_state(struct replay_opts *opts)
                free(opts->xopts[i]);
        free(opts->xopts);
 
                free(opts->xopts[i]);
        free(opts->xopts);
 

-       strbuf_addf(&dir, "%s", get_dir(opts));
+       strbuf_addstr(&dir, get_dir(opts));

        remove_dir_recursively(&dir, 0);
        strbuf_release(&dir);
 
        remove_dir_recursively(&dir, 0);
        strbuf_release(&dir);