convert {charset,iconv}-hooks.

[apps/madmutt.git] / lib-lib / rx.c

diff --git a/lib-lib/rx.c b/lib-lib/rx.c
index 02a01d0..79ec5b8 100644 (file)
--- a/lib-lib/rx.c
+++ b/lib-lib/rx.c
@@ -57,7 +57,7 @@ void rx_set_template(rx_t *rx, const char *tpl)
 {
     const char *p = tpl;
 
-    m_strreplace(&rx->template, tpl);
+    m_strreplace(&rx->tpl, tpl);
     rx->nmatch = 0;
 
     while ((p = strchr(p, '%'))) {
@@ -78,7 +78,7 @@ void rx_wipe(rx_t *rx)
     p_delete(&rx->pattern);
     regfree(rx->rx);
     p_delete(&rx->rx);
-    p_delete(&rx->template);
+    p_delete(&rx->tpl);
 }
 
 int rx_list_match(rx_t *l, const char *s)
@@ -112,7 +112,7 @@ int rx_list_match2(rx_t *l, const char *s, char *dst, int dlen)
 
         if (regexec(l->rx, s, l->nmatch, pmatch, 0) == 0) {
             /* Copy template into dst, with substitutions. */
-            const char *p = l->template, *q;
+            const char *p = l->tpl, *q;
 
             for (q = strchr(p, '%'); q; q = strchr(p + 1, '%')) {
                 int n;