X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=34359415cdb15ab0f8fc5da8022061055b2d7c6b;hp=d0c4b0cbfddcc277d6b7d64317171cf5a47bcd93;hb=c6b9d35ed9361e4defab9762a7480d5126405ae9;hpb=617e7d83d14e14e6a520a48e75437211b16c8834

diff --git a/main.c b/main.c
index d0c4b0c..3435941 100644
--- a/main.c
+++ b/main.c
@@ -20,6 +20,9 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
 #include "mutt_curses.h"
@@ -29,8 +32,6 @@
 #include "mutt_idna.h"
 #include "xterm.h"
 
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <string.h>
@@ -602,8 +603,8 @@ int main (int argc, char **argv)
   SRAND (time (NULL));
   umask (077);
 
-  memset (Options, 0, sizeof (Options));
-  memset (QuadOptions, 0, sizeof (QuadOptions));
+  p_clear(Options, sizeof(Options));
+  p_clear(QuadOptions, sizeof(QuadOptions));
 
 #ifdef USE_NNTP
   while ((i =
@@ -872,7 +873,7 @@ int main (int argc, char **argv)
       }
 
       if (subject)
-        msg->env->subject = str_dup (subject);
+        msg->env->subject = m_strdup(subject);
 
       if (includeFile)
         infile = includeFile;
@@ -880,7 +881,7 @@ int main (int argc, char **argv)
 
     if (infile || bodytext) {
       if (infile) {
-        if (str_cmp ("-", infile) == 0)
+        if (m_strcmp("-", infile) == 0)
           fin = stdin;
         else {
           char path[_POSIX_PATH_MAX];
@@ -899,7 +900,7 @@ int main (int argc, char **argv)
         fin = NULL;
 
       mutt_mktemp (buf);
-      tempfile = str_dup (buf);
+      tempfile = m_strdup(buf);
 
       if (draftFile)
         msg->env = mutt_read_rfc822_header (fin, NULL, 1, 0);