X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=889ac8a38defed37ae2e4c03f99b5fb1eccf051b;hp=a6a92e8655f14eb13dabed7a84212ebff0f29520;hb=3e611c4b53a33408955152e1c9336f8643ea096e;hpb=617e7d83d14e14e6a520a48e75437211b16c8834

diff --git a/commands.c b/commands.c
index a6a92e8..889ac8a 100644
--- a/commands.c
+++ b/commands.c
@@ -14,10 +14,12 @@
 
 #include <lib-lib/mem.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"
@@ -40,8 +42,6 @@
 #include "buffy.h"
 #endif
 
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <errno.h>
@@ -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]) {
@@ -859,7 +859,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
     size_t l;
 
     for (p = b->parameter; p; p = p->next) {
-      l = str_len (buf);
+      l = m_strlen(buf);
 
       rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
       snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);