threads / patch / 61896

patchlog-tree: use decimal_width()

Subject: [PATCH] log-tree: use decimal_width()

## tl;dr

3 messages between Aug 3, 2024 and Aug 5, 2024. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

René Scharfe· Aug 3, 2024, 12:33 UTC · lore

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

Show changes to log-tree.c +2 −12

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

Taylor Blau· Aug 4, 2024, 16:10 UTC · re: René Scharfe · lore

Re: [PATCH] log-tree: use decimal_width()

On Sat, Aug 03, 2024 at 02:33:24PM +0200, René Scharfe wrote:

> ---
>  log-tree.c | 13 ++-----------
>  1 file changed, 2 insertions(+), 11 deletions(-)

This looks all very reasonable to me.

Some history (if interesting): lineno_width(), which was the precursor to decimal_width() was introduced way back in cee7f245dc (git-pickaxe: blame rewritten., 2006-10-19). The piece this patch removes was added in e00de24b10 (format-patch -n: make sorting easier by padding number, 2007-02-09), but lineno_width() did not become part of pager.h until ec7ff5ba27 (make lineno_width() from blame reusable for others, 2012-02-12), hence why it wasn't already used here.

Thanks, Taylor

Junio C Hamano· Aug 5, 2024, 16:03 UTC · re: Taylor Blau · lore

Re: [PATCH] log-tree: use decimal_width()

Taylor Blau <me@ttaylorr.com> writes:

Show 14 quoted lines

> On Sat, Aug 03, 2024 at 02:33:24PM +0200, René Scharfe wrote:
>> ---
>>  log-tree.c | 13 ++-----------
>>  1 file changed, 2 insertions(+), 11 deletions(-)
>
> This looks all very reasonable to me.
>
> Some history (if interesting): lineno_width(), which was the precursor
> to decimal_width() was introduced way back in cee7f245dc (git-pickaxe:
> blame rewritten., 2006-10-19). The piece this patch removes was added in
> e00de24b10 (format-patch -n: make sorting easier by padding number,
> 2007-02-09), but lineno_width() did not become part of pager.h until
> ec7ff5ba27 (make lineno_width() from blame reusable for others,
> 2012-02-12), hence why it wasn't already used here.

Thanks.

I was wondering why the decimal_width() helper is in pager.c in the first place, as there is no logical reason to tie it to the pager infrastructure.