Mercurial > dovecot > core-2.2
changeset 21941:bb81856fe3c1
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
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Tue, 11 Apr 2017 10:11:00 +0300 |
| parents | 63b1d742208e |
| children | 66a1a4338260 |
| files | src/auth/userdb-vpopmail.c src/lib/var-expand.h |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auth/userdb-vpopmail.c Mon Apr 10 17:07:28 2017 +0300 +++ b/src/auth/userdb-vpopmail.c Tue Apr 11 10:11:00 2017 +0300 @@ -61,7 +61,10 @@ 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);
--- a/src/lib/var-expand.h Mon Apr 10 17:07:28 2017 +0300 +++ b/src/lib/var-expand.h Tue Apr 11 10:11:00 2017 +0300 @@ -36,7 +36,4 @@ 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