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

strbuf: simplify strbuf_expand_literal_cb()

Browse Source 
Now that strbuf_expand_literal_cb() is no longer used as a callback,
drop its "_cb" name suffix and unused context parameter.

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
2023-06-17 22:44:00 +02:00
committed by Junio C Hamano
parent 6f1e2d5279
commit 4416b86c6b
5 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/ls-files.c
View File

@ -274,7 +274,7 @@ static void show_ce_fmt(struct repository *repo, const struct cache_entry *ce,
if (skip_prefix(format, "%", &format)) if (skip_prefix(format, "%", &format))
strbuf_addch(&sb, '%'); strbuf_addch(&sb, '%');
else if ((len = strbuf_expand_literal_cb(&sb, format, NULL))) else if ((len = strbuf_expand_literal(&sb, format)))
format += len; format += len;
else if (*format != '(') else if (*format != '(')
die(_("bad ls-files format: element '%s' " die(_("bad ls-files format: element '%s' "

2
builtin/ls-tree.c
View File

@ -108,7 +108,7 @@ static int show_tree_fmt(const struct object_id *oid, struct strbuf *base,
if (skip_prefix(format, "%", &format)) if (skip_prefix(format, "%", &format))
strbuf_addch(&sb, '%'); strbuf_addch(&sb, '%');
else if ((len = strbuf_expand_literal_cb(&sb, format, NULL))) else if ((len = strbuf_expand_literal(&sb, format)))
format += len; format += len;
else if (*format != '(') else if (*format != '(')
die(_("bad ls-tree format: element '%s' " die(_("bad ls-tree format: element '%s' "

4
pretty.c
View File

@ -1262,7 +1262,7 @@ static struct strbuf *expand_separator(struct strbuf *sb,
if (skip_prefix(format, "%", &format)) if (skip_prefix(format, "%", &format))
strbuf_addch(sb, '%'); strbuf_addch(sb, '%');
else if ((len = strbuf_expand_literal_cb(sb, format, NULL))) else if ((len = strbuf_expand_literal(sb, format)))
format += len; format += len;
else else
strbuf_addch(sb, '%'); strbuf_addch(sb, '%');
@ -1395,7 +1395,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
char **slot; char **slot;
/* these are independent of the commit */ /* these are independent of the commit */
res = strbuf_expand_literal_cb(sb, placeholder, NULL); res = strbuf_expand_literal(sb, placeholder);
if (res) if (res)
return res; return res;

4
strbuf.c
View File

@ -427,9 +427,7 @@ int strbuf_expand_step(struct strbuf *sb, const char **formatp)
return 1; return 1;
} }
size_t strbuf_expand_literal_cb(struct strbuf *sb, size_t strbuf_expand_literal(struct strbuf *sb, const char *placeholder)
const char *placeholder,
void *context UNUSED)
{ {
int ch; int ch;

6
strbuf.h
View File

@ -320,11 +320,9 @@ const char *strbuf_join_argv(struct strbuf *buf, int argc,
/** /**
* Used with `strbuf_expand_step` to expand the literals %n and %x * Used with `strbuf_expand_step` to expand the literals %n and %x
* followed by two hexadecimal digits. Returns the number of recognized * followed by two hexadecimal digits. Returns the number of recognized
* characters. The context argument is ignored. * characters.
*/ */
size_t strbuf_expand_literal_cb(struct strbuf *sb, size_t strbuf_expand_literal(struct strbuf *sb, const char *placeholder);
const char *placeholder,
void *context);
/** /**
* If the string pointed to by `formatp` contains a percent sign ("%"), * If the string pointed to by `formatp` contains a percent sign ("%"),