Merge branch 'rs/cleanup-strbuf-users'

gitster · gitster · commit e46ebc27547e · 2017-10-05T13:48:19.000+09:00
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
 

Original file line number	Diff line number	Diff line change
`@@ -1233,8 +1233,8 @@ static int write_with_updates(struct packed_ref_store *refs,`
`1233`	`1233`	`}`
`1234`	`1234`
`1235`	`1235`	`if (ok != ITER_DONE) {`
`1236`		`- strbuf_addf(err, "unable to write packed-refs file: "`
`1237`		`- "error iterating over old contents");`
	`1236`	`+ strbuf_addstr(err, "unable to write packed-refs file: "`
	`1237`	`+ "error iterating over old contents");`
`1238`	`1238`	`goto error;`
`1239`	`1239`	`}`
`1240`	`1240`