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>

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 03bf577..0b00bd5 100644 (file)
--- 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 8460d20..a90f3c8 100644 (file)
--- 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' "

diff --git a/pretty.c b/pretty.c
index cffbf32..4c08f98 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -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;
 

diff --git a/strbuf.c b/strbuf.c
index c3d1cee..55a3cfa 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -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;
 

diff --git a/strbuf.h b/strbuf.h
index 95e50e2..b1eab01 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -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 ("%"),