X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=69ecf02a66167b8598822ea8f69e7f43c0b2fe9f;hp=1d3d349a2d786f961e0f03de99fee8c7cd551b96;hb=ba5e3af4ea19e1d20c80941c077039871ec84258;hpb=afa60149c4d2bb71c8195091d3658b3bdc12d59d;ds=sidebyside

diff --git a/main.c b/main.c
index 1d3d349..69ecf02 100644
--- a/main.c
+++ b/main.c
@@ -799,7 +799,7 @@ int main (int argc, char **argv)
       }
 
       if (subject)
-        msg->env->subject = safe_strdup (subject);
+        msg->env->subject = str_dup (subject);
 
       if (includeFile)
         infile = includeFile;
@@ -807,7 +807,7 @@ int main (int argc, char **argv)
 
     if (infile || bodytext) {
       if (infile) {
-        if (mutt_strcmp ("-", infile) == 0)
+        if (str_cmp ("-", infile) == 0)
           fin = stdin;
         else {
           char path[_POSIX_PATH_MAX];
@@ -826,7 +826,7 @@ int main (int argc, char **argv)
         fin = NULL;
 
       mutt_mktemp (buf);
-      tempfile = safe_strdup (buf);
+      tempfile = str_dup (buf);
 
       if (draftFile)
         msg->env = mutt_read_rfc822_header (fin, NULL, 1, 0);
@@ -841,7 +841,7 @@ int main (int argc, char **argv)
             mutt_endwin (NULL);
           perror (tempfile);
           fclose (fin);
-          FREE (&tempfile);
+          mem_free (&tempfile);
           exit (1);
         }
         if (fin)
@@ -854,7 +854,7 @@ int main (int argc, char **argv)
       }
     }
 
-    FREE (&bodytext);
+    mem_free (&bodytext);
 
     if (attach) {
       LIST *t = attach;
@@ -956,7 +956,7 @@ int main (int argc, char **argv)
       if (option (OPTXTERMSETTITLES))
         mutt_xterm_set_title (NONULL (XtermLeave));
       if (Context)
-        FREE (&Context);
+        mem_free (&Context);
     }
     mutt_endwin (Errorbuf);
   }