lib, userdb-vpopmail: Fully remove var_expand_table_build()

It was accidentally removed in master-2.2 as part of the changes in
122014ad84488d6309dc7d1572dfc988fedc18c4

This finishes up the removal as it was done in master in
79fe1b28df44ba22b230326bee895583c1df5a28

diff --git a/src/auth/userdb-vpopmail.c b/src/auth/userdb-vpopmail.c
index 9fad9a033d3b53ccc6fdff2541fef58100f78e04..5042dcf87d5d268e5c42494419523c6c0b6b5d38 100644 (file)
--- a/src/auth/userdb-vpopmail.c
+++ b/src/auth/userdb-vpopmail.c
@@ -61,7 +61,10 @@ userdb_vpopmail_get_quota(const char *template, const char *vpop_str)
            strcmp(vpop_str, "NOQUOTA") == 0)
                return "";
 
-       tab = var_expand_table_build('q', format_maildirquota(vpop_str), '\0');
+       tab = t_new(struct var_expand_table, 2);
+       tab[0].key = 'q';
+       tab[0].value = format_maildirquota(vpop_str);
+
        quota = t_str_new(128);
        var_expand(quota, template, tab);
        return str_c(quota);

diff --git a/src/lib/var-expand.h b/src/lib/var-expand.h
index ccaaeac9f33a9745c426f8fa3093cd095a30cb2f..aea8d77b33cc41c6f5b9415f2b3851693d8d8912 100644 (file)
--- a/src/lib/var-expand.h
+++ b/src/lib/var-expand.h
@@ -36,7 +36,4 @@ void var_get_key_range(const char *str, unsigned int *idx_r,
    If key is '\0', it's ignored. If long_key is NULL, it's ignored. */
 bool var_has_key(const char *str, char key, const char *long_key) ATTR_PURE;
 
-const struct var_expand_table *
-var_expand_table_build(char key, const char *value, char key2, ...);
-
 #endif