[PATCH] graph: use strbuf_addchars() to add spaces

René Scharfe· Oct 1, 2017, 14:45 UTC · lore

strbuf_addf() can be used to add a specific number of space characters by using the format "%*s" with an empty string and specifying the desired width. Use strbuf_addchars() instead as it's shorter, makes the intent clearer and is a bit more efficient.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
---
 graph.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Show changes to graph.c +3 −7

diff --git a/graph.c b/graph.c
index e7e20650da..e1f6d3bddb 100644
--- 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)) {
 			/*

-- 
2.14.2

Jeff King· Oct 2, 2017, 05:11 UTC · re: René Scharfe · lore

Re: [PATCH] graph: use strbuf_addchars() to add spaces

On Sun, Oct 01, 2017 at 04:45:45PM +0200, René Scharfe wrote:

> strbuf_addf() can be used to add a specific number of space characters
> by using the format "%*s" with an empty string and specifying the
> desired width.  Use strbuf_addchars() instead as it's shorter, makes the
> intent clearer and is a bit more efficient.

Nice. The result looks much clearer to me.

(I won't respond individually to the coccinelle transform patches you posted earlier, but they also all look obviously correct to me).

-Peff

patchgraph: use strbuf_addchars() to add spaces