diff options
author | René Scharfe <l.s.r@web.de> | 2023-06-17 23:44:00 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-06-18 22:55:30 +0300 |
commit | 4416b86c6b34dad64b556bb1eb6711d5e6595a48 (patch) | |
tree | d8eae1b68c8afc7556cf2506789e255d4c9817ab | |
parent | 6f1e2d52797161c7effe4d1388765de3dbd80bbf (diff) |
strbuf: simplify strbuf_expand_literal_cb()
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>
-rw-r--r-- | builtin/ls-files.c | 2 | ||||
-rw-r--r-- | builtin/ls-tree.c | 2 | ||||
-rw-r--r-- | pretty.c | 4 | ||||
-rw-r--r-- | strbuf.c | 4 | ||||
-rw-r--r-- | strbuf.h | 6 |
5 files changed, 7 insertions, 11 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 03bf5771b4..0b00bd5d0f 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -274,7 +274,7 @@ static void show_ce_fmt(struct repository *repo, const struct cache_entry *ce, if (skip_prefix(format, "%", &format)) strbuf_addch(&sb, '%'); - else if ((len = strbuf_expand_literal_cb(&sb, format, NULL))) + else if ((len = strbuf_expand_literal(&sb, format))) format += len; else if (*format != '(') die(_("bad ls-files format: element '%s' " diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index 8460d20257..a90f3c81a0 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -108,7 +108,7 @@ static int show_tree_fmt(const struct object_id *oid, struct strbuf *base, if (skip_prefix(format, "%", &format)) strbuf_addch(&sb, '%'); - else if ((len = strbuf_expand_literal_cb(&sb, format, NULL))) + else if ((len = strbuf_expand_literal(&sb, format))) format += len; else if (*format != '(') die(_("bad ls-tree format: element '%s' " @@ -1262,7 +1262,7 @@ static struct strbuf *expand_separator(struct strbuf *sb, if (skip_prefix(format, "%", &format)) strbuf_addch(sb, '%'); - else if ((len = strbuf_expand_literal_cb(sb, format, NULL))) + else if ((len = strbuf_expand_literal(sb, format))) format += len; else strbuf_addch(sb, '%'); @@ -1395,7 +1395,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */ char **slot; /* these are independent of the commit */ - res = strbuf_expand_literal_cb(sb, placeholder, NULL); + res = strbuf_expand_literal(sb, placeholder); if (res) return res; @@ -427,9 +427,7 @@ int strbuf_expand_step(struct strbuf *sb, const char **formatp) return 1; } -size_t strbuf_expand_literal_cb(struct strbuf *sb, - const char *placeholder, - void *context UNUSED) +size_t strbuf_expand_literal(struct strbuf *sb, const char *placeholder) { int ch; @@ -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 * 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, - const char *placeholder, - void *context); +size_t strbuf_expand_literal(struct strbuf *sb, const char *placeholder); /** * If the string pointed to by `formatp` contains a percent sign ("%"), |