git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] log-tree: use decimal_width()

From
René Scharfe <l.s.r@web.de>
Date
Aug 3, 2024, 12:33 UTC
Message-ID
<06783722-5184-41d5-8edd-94f97b2f2794@web.de>

Reduce code duplication by calling decimal_width() to count the digits in the number of commits instead of calculating it locally.

It also has the advantage of returning int, which is the exact type expected by the printf()-like function strbuf_addf() for field width arguments.

Additionally, decimal_width() supports numbers bigger than 1410065407, which is (hopefully) just a theoretical advantage.

Signed-off-by: René Scharfe <l.s.r@web.de>
---
 log-tree.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/log-tree.c b/log-tree.c
index 576ef30d90..fdb24cbef2 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -31,6 +31,7 @@
 #include "tree.h"
 #include "wildmatch.h"
 #include "write-or-die.h"
+#include "pager.h"

 static struct decoration name_decoration = { "object names" };
 static int decoration_loaded;
@@ -411,16 +412,6 @@ void show_decorations(struct rev_info *opt, struct commit *commit)
 	strbuf_release(&sb);
 }

-static unsigned int digits_in_number(unsigned int number)
-{
-	unsigned int i = 10, result = 1;
-	while (i <= number) {
-		i *= 10;
-		result++;
-	}
-	return result;
-}
-
 void fmt_output_subject(struct strbuf *filename,
 			const char *subject,
 			struct rev_info *info)
@@ -464,7 +455,7 @@ void fmt_output_email_subject(struct strbuf *sb, struct rev_info *opt)
 		strbuf_addf(sb, "Subject: [%s%s%0*d/%d] ",
 			    opt->subject_prefix,
 			    *opt->subject_prefix ? " " : "",
-			    digits_in_number(opt->total),
+			    decimal_width(opt->total),
 			    opt->nr, opt->total);
 	} else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
 		strbuf_addf(sb, "Subject: [%s] ",
--
2.46.0
Next: Taylor Blau
Message 1 of 3 in “log-tree: use decimal_width()”
  1. log-tree: use decimal_width()René Scharfe, Aug 3, 2024
  2. Taylor BlauAug 4, 2024
  3. Junio C HamanoAug 5, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.