X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=2cfb5e86e2f9de23721fb62e15be35d46f9051b7;hp=52fe118aab2d64960c3904152e96fa9ff5e84289;hb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd

diff --git a/commands.c b/commands.c
index 52fe118..2cfb5e8 100644
--- a/commands.c
+++ b/commands.c
@@ -13,13 +13,13 @@
 #endif
 
 #include <lib-lib/mem.h>
-
+#include <lib-lib/file.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
 
 #include "mutt.h"
 #include "enter.h"
 #include "recvattach.h"
-#include "ascii.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mime.h"
@@ -96,7 +96,7 @@ int mutt_display_message (HEADER * cur)
     }
   }
 
-  if (!Pager || str_cmp (Pager, "builtin") == 0)
+  if (!Pager || m_strcmp(Pager, "builtin") == 0)
     builtin = 1;
   else {
     mutt_make_string (buf, sizeof (buf), NONULL (PagerFmt), Context, cur);
@@ -214,7 +214,7 @@ int mutt_display_message (HEADER * cur)
     }
 
     /* Invoke the builtin pager */
-    memset (&info, 0, sizeof (pager_t));
+    p_clear(&info, 1);
     info.hdr = cur;
     info.ctx = Context;
     rc = mutt_pager (NULL, tempfile, M_PAGER_MESSAGE, &info);
@@ -580,7 +580,7 @@ void mutt_enter_command (void)
     return;
   err.data = errbuf;
   err.dsize = sizeof (errbuf);
-  memset (&token, 0, sizeof (token));
+  p_clear(&token, 1);
   r = mutt_parse_rc_line (buffer, &token, &err);
   p_delete(&token.data);
   if (errbuf[0]) {
@@ -750,7 +750,7 @@ int mutt_save_message (HEADER * h, int delete,
   /* This is an undocumented feature of ELM pointed out to me by Felix von
    * Leitner <leitner@prz.fu-berlin.de>
    */
-  if (str_cmp (buf, ".") == 0)
+  if (m_strcmp(buf, ".") == 0)
     strfcpy (buf, LastSaveFolder, sizeof (buf));
   else
     strfcpy (LastSaveFolder, buf, sizeof (LastSaveFolder));