exit str_cmp enters m_strcmp

[apps/madmutt.git] / hook.c

diff --git a/hook.c b/hook.c
index 4222f52..1f8fc1e 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -125,14 +125,14 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
   /* check to make sure that a matching hook doesn't already exist */
   for (ptr = Hooks; ptr; ptr = ptr->next) {
     if (ptr->type == data &&
   /* check to make sure that a matching hook doesn't already exist */
   for (ptr = Hooks; ptr; ptr = ptr->next) {
     if (ptr->type == data &&

-        ptr->rx.not == not && !str_cmp (pattern.data, ptr->rx.pattern)) {
+        ptr->rx.not == not && !m_strcmp(pattern.data, ptr->rx.pattern)) {

       if (data &
           (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK |
            M_ACCOUNTHOOK | M_REPLYHOOK)) {
         /* these hooks allow multiple commands with the same
          * pattern, so if we've already seen this pattern/command pair, just
          * ignore it instead of creating a duplicate */
       if (data &
           (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK |
            M_ACCOUNTHOOK | M_REPLYHOOK)) {
         /* these hooks allow multiple commands with the same
          * pattern, so if we've already seen this pattern/command pair, just
          * ignore it instead of creating a duplicate */

-        if (!str_cmp (ptr->command, command.data)) {
+        if (!m_strcmp(ptr->command, command.data)) {

           p_delete(&command.data);
           p_delete(&pattern.data);
           return 0;
           p_delete(&command.data);
           p_delete(&pattern.data);
           return 0;


@@ -244,7 +244,7 @@ int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data,
 {
   while (MoreArgs (s)) {
     mutt_extract_token (buf, s, 0);
 {
   while (MoreArgs (s)) {
     mutt_extract_token (buf, s, 0);

-    if (str_cmp ("*", buf->data) == 0) {
+    if (m_strcmp("*", buf->data) == 0) {

       if (current_hook_type) {
         snprintf (err->data, err->dsize,
                   _("unhook: Can't do unhook * from within a hook."));
       if (current_hook_type) {
         snprintf (err->data, err->dsize,
                   _("unhook: Can't do unhook * from within a hook."));