mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

log-tree: use decimal_width()

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2024-08-03 14:33:24 +02:00
committed by Junio C Hamano
parent 337b4d4000
commit 0c4d5aa22d
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
log-tree.c
View File

@ -29,6 +29,7 @@
#include "tree.h" #include "tree.h"
#include "wildmatch.h" #include "wildmatch.h"
#include "write-or-die.h" #include "write-or-die.h"
#include "pager.h"
static struct decoration name_decoration = { "object names" }; static struct decoration name_decoration = { "object names" };
static int decoration_loaded; static int decoration_loaded;
@ -406,16 +407,6 @@ void show_decorations(struct rev_info *opt, struct commit *commit)
strbuf_release(&sb); 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, void fmt_output_subject(struct strbuf *filename,
const char *subject, const char *subject,
struct rev_info *info) struct rev_info *info)
@ -459,7 +450,7 @@ void fmt_output_email_subject(struct strbuf *sb, struct rev_info *opt)
strbuf_addf(sb, "Subject: [%s%s%0*d/%d] ", strbuf_addf(sb, "Subject: [%s%s%0*d/%d] ",
opt->subject_prefix, opt->subject_prefix,
*opt->subject_prefix ? " " : "", *opt->subject_prefix ? " " : "",
digits_in_number(opt->total), decimal_width(opt->total),
opt->nr, opt->total); opt->nr, opt->total);
} else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) { } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
strbuf_addf(sb, "Subject: [%s] ", strbuf_addf(sb, "Subject: [%s] ",