X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=init.c;h=3b57790ab72b9d72d67b8e90c89c79bdf04701ac;hb=6aac4a85332ec3647c29a7b996cade972895a8b8;hp=775cb213b64b06adc0224f0d989f14347e1e3e11;hpb=11a177822f648694f442b3038fdc60a4e50e6edb;p=apps%2Fmadmutt.git diff --git a/init.c b/init.c index 775cb21..3b57790 100644 --- a/init.c +++ b/init.c @@ -582,7 +582,7 @@ static int remove_from_rx_list(rx_t **l, const char *str) } l = rx_lookup(l, str); - if (l) { + if (*l) { rx_t *r = rx_list_pop(l); rx_delete(&r); return 0; @@ -640,42 +640,6 @@ static void _alternates_clean (void) } } -static int parse_alternates (BUFFER * buf, BUFFER * s, - unsigned long data __attribute__ ((unused)), - BUFFER * err __attribute__ ((unused))) -{ - _alternates_clean (); - do { - mutt_extract_token (buf, s, 0); - remove_from_rx_list (&UnAlternates, buf->data); - - if (add_to_rx_list (&Alternates, buf->data, REG_ICASE, err) != 0) - return -1; - } - while (MoreArgs (s)); - - return 0; -} - -static int parse_unalternates (BUFFER * buf, BUFFER * s, - unsigned long data __attribute__ ((unused)), - BUFFER * err __attribute__ ((unused))) -{ - _alternates_clean (); - do { - mutt_extract_token (buf, s, 0); - remove_from_rx_list (&Alternates, buf->data); - - if (m_strcmp(buf->data, "*") && - add_to_rx_list (&UnAlternates, buf->data, REG_ICASE, err) != 0) - return -1; - - } - while (MoreArgs (s)); - - return 0; -} - static int parse_unlist (BUFFER * buf, BUFFER * s, unsigned long data, BUFFER * err __attribute__ ((unused))) {