All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] graph: use strbuf_addchars() to add spaces
@ 2017-10-01 14:45 René Scharfe
  2017-10-02  5:11 ` Jeff King
  0 siblings, 1 reply; 2+ messages in thread
From: René Scharfe @ 2017-10-01 14:45 UTC (permalink / raw)
  To: Git List; +Cc: Junio C Hamano

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(-)

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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] graph: use strbuf_addchars() to add spaces
  2017-10-01 14:45 [PATCH] graph: use strbuf_addchars() to add spaces René Scharfe
@ 2017-10-02  5:11 ` Jeff King
  0 siblings, 0 replies; 2+ messages in thread
From: Jeff King @ 2017-10-02  5:11 UTC (permalink / raw)
  To: René Scharfe; +Cc: Git List, Junio C Hamano

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-10-02  5:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-01 14:45 [PATCH] graph: use strbuf_addchars() to add spaces René Scharfe
2017-10-02  5:11 ` Jeff King

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.