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

factor out strbuf_expand_bad_format()

Browse Source 
Extract a function for reporting placeholders that are not enclosed in a
parenthesis or are unknown.  This reduces the number of strings to
translate and improves consistency across commands.  Call it at the end
of the if/else chain, after exhausting all accepted possibilities.

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-03-24 12:19:40 +01:00
committed by Junio C Hamano
parent 3c2a3fdc38
commit e36091aa1d
4 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
strbuf.c
View File

@ -442,6 +442,26 @@ size_t strbuf_expand_literal(struct strbuf *sb, const char *placeholder)
return 0;
}
void strbuf_expand_bad_format(const char *format, const char *command)
{
const char *end;
if (*format != '(')
/* TRANSLATORS: The first %s is a command like "ls-tree". */
die(_("bad %s format: element '%s' does not start with '('"),
command, format);
end = strchr(format + 1, ')');
if (!end)
/* TRANSLATORS: The first %s is a command like "ls-tree". */
die(_("bad %s format: element '%s' does not end in ')'"),
command, format);
/* TRANSLATORS: %s is a command like "ls-tree". */
die(_("bad %s format: %%%.*s"),
command, (int)(end - format + 1), format);
}
void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src)
{
size_t i, len = src->len;