Merge branch 'rs/cleanup-strbuf-users'

Code clean-up.

* rs/cleanup-strbuf-users:
graph: use strbuf_addchars() to add spaces
use strbuf_addstr() for adding strings to strbufs
path: use strbuf_add_real_path()

diff --git a/builtin/branch.c b/builtin/branch.c
index b998e16d0c24b300ce1469749e290c7879af14a7..89e34e9ceb171412b9d36c6d2e01b929f1518e29 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -353,7 +353,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(&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)

diff --git a/graph.c b/graph.c
index e7e20650da6983ada7c94c22aea7ecaec41c5c17..e1f6d3bddb38aadd4e439aea30f542d286ecb98e 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -696,12 +696,8 @@ static void graph_pad_horizontally(struct git_graph *graph, struct strbuf *sb,
         * This way, fields printed to the right of the graph will remain
         * aligned for the entire commit.
         */
-       int extra;
-       if (chars_written >= graph->width)
-               return;
-
-       extra = graph->width - chars_written;
-       strbuf_addf(sb, "%*s", (int) extra, "");
+       if (chars_written < graph->width)
+               strbuf_addchars(sb, ' ', graph->width - chars_written);
 }
 
 static void graph_output_padding_line(struct git_graph *graph,
@@ -787,7 +783,7 @@ static void graph_output_pre_commit_line(struct git_graph *graph,
                if (col->commit == graph->commit) {
                        seen_this = 1;
                        strbuf_write_column(sb, col, '|');
-                       strbuf_addf(sb, "%*s", graph->expansion_row, "");
+                       strbuf_addchars(sb, ' ', graph->expansion_row);
                        chars_written += 1 + graph->expansion_row;
                } else if (seen_this && (graph->expansion_row == 0)) {
                        /*

diff --git a/path.c b/path.c
index 5aa9244eb24d95717f2b20e207266c289c925757..00ec04e7a5f9e90b758855a16f420324ee158739 100644 (file)
--- a/path.c
+++ b/path.c
@@ -718,7 +718,7 @@ char *expand_user_path(const char *path, int real_home)
                        if (!home)
                                goto return_null;
                        if (real_home)
-                               strbuf_addstr(&user_path, real_path(home));
+                               strbuf_add_real_path(&user_path, home);
                        else
                                strbuf_addstr(&user_path, home);
 #ifdef GIT_WINDOWS_NATIVE

diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index 6e85b0bf0bd5efad7617698a4c2f740a9a28fb05..3279d42c5a696434bbcdb85d6244cded1ddbc758 100644 (file)
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -1233,8 +1233,8 @@ static int write_with_updates(struct packed_ref_store *refs,
        }
 
        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;
        }
 

diff --git a/sequencer.c b/sequencer.c
index b8c1e876fa7b57986e6ae93873e23f87c45b9e49..7886e2269eb7813cdf9f908002ec70a9561a153c 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -204,7 +204,7 @@ int sequencer_remove_state(struct replay_opts *opts)
                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);