X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=edit.c;h=93fcfa1ae62f9fef18931cd280d3962a831aeb39;hp=893732e23569c03f6b84e7c3f6d0bc09ecaec17d;hb=f7f0722b06934cf83c08e60d805238478ada2699;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/edit.c b/edit.c
index 893732e..93fcfa1 100644
--- a/edit.c
+++ b/edit.c
@@ -230,7 +230,7 @@ static void be_edit_header (ENVELOPE * e, int force)
   rfc822_write_address (tmp, sizeof (tmp), e->to, 0);
   if (!e->to || force) {
     if (mutt_enter_string (tmp, sizeof (tmp), LINES - 1, 4, 0) == 0) {
-      rfc822_free_address (&e->to);
+      address_delete (&e->to);
       e->to = mutt_parse_adrlist (e->to, tmp);
       e->to = mutt_expand_aliases (e->to);
       mutt_addrlist_to_idna (e->to, NULL);      /* XXX - IDNA error reporting? */
@@ -249,7 +249,7 @@ static void be_edit_header (ENVELOPE * e, int force)
     addstr ("Subject: ");
     m_strcpy(tmp, sizeof(tmp), NONULL(e->subject));
     if (mutt_enter_string (tmp, sizeof (tmp), LINES - 1, 9, 0) == 0)
-      str_replace (&e->subject, tmp);
+      m_strreplace(&e->subject, tmp);
     addch ('\n');
   }
 
@@ -259,7 +259,7 @@ static void be_edit_header (ENVELOPE * e, int force)
     mutt_addrlist_to_local (e->cc);
     rfc822_write_address (tmp, sizeof (tmp), e->cc, 0);
     if (mutt_enter_string (tmp, sizeof (tmp), LINES - 1, 4, 0) == 0) {
-      rfc822_free_address (&e->cc);
+      address_delete (&e->cc);
       e->cc = mutt_parse_adrlist (e->cc, tmp);
       e->cc = mutt_expand_aliases (e->cc);
       tmp[0] = 0;
@@ -278,7 +278,7 @@ static void be_edit_header (ENVELOPE * e, int force)
     mutt_addrlist_to_local (e->bcc);
     rfc822_write_address (tmp, sizeof (tmp), e->bcc, 0);
     if (mutt_enter_string (tmp, sizeof (tmp), LINES - 1, 5, 0) == 0) {
-      rfc822_free_address (&e->bcc);
+      address_delete (&e->bcc);
       e->bcc = mutt_parse_adrlist (e->bcc, tmp);
       e->bcc = mutt_expand_aliases (e->bcc);
       mutt_addrlist_to_idna (e->bcc, NULL);
@@ -297,7 +297,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
   char **buf = NULL;
   int bufmax = 0, buflen = 0;
   char tmp[LONG_STRING];
-  int abort = 0;
+  int aborted = 0;
   int done = 0;
   int i;
   char *p;
@@ -324,8 +324,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
       while (p >= tmp && ISSPACE (*p))
         *p-- = 0;
 
-      p = tmp + 2;
-      SKIPWS (p);
+      p = vskipspaces(tmp + 2);
 
       switch (tmp[1]) {
       case '?':
@@ -383,7 +382,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
           addstr (_("missing filename.\n"));
         break;
       case 's':
-        str_replace (&msg->env->subject, p);
+        m_strreplace(&msg->env->subject, p);
         break;
       case 't':
         msg->env->to = rfc822_parse_adrlist (msg->env->to, p);
@@ -429,7 +428,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
         be_barf_file (*p ? p : path, buf, buflen);
         break;
       case 'x':
-        abort = 1;
+        aborted = 1;
         done = 1;
         break;
       default:
@@ -449,9 +448,9 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
     tmp[0] = 0;
   }
 
-  if (!abort)
+  if (!aborted)
     be_barf_file (path, buf, buflen);
   be_free_memory (buf, buflen);
 
-  return (abort ? -1 : 0);
+  return (aborted ? -1 : 0);
 }