Some code simplifications.

1 files changed, 7 insertions, 9 deletions

diff --git a/headers.c b/headers.c
index 6b7c084b..1900c836 100644
--- a/headers.c
+++ b/headers.c
@@ -40,7 +40,7 @@ void mutt_edit_headers (const char *editor,
   ENVELOPE *n;
   time_t mtime;
   struct stat st;
-  LIST *cur, *last = NULL, *tmp;
+  LIST *cur, **last = NULL, *tmp;
 
   mutt_mktemp (path);
   if ((ofp = safe_fopen (path, "w")) == NULL)
@@ -123,6 +123,7 @@ void mutt_edit_headers (const char *editor,
    */
 
   cur = msg->env->userhdrs;
+  last = &msg->env->userhdrs;
   while (cur)
   {
     keep = 1;
@@ -188,17 +189,14 @@ void mutt_edit_headers (const char *editor,
 
     if (keep)
     {
-      last = cur;
-      cur = cur->next;
+      last = &cur->next;
+      cur  = cur->next;
     }
     else
     {
-      if (last)
-	last->next = cur->next;
-      else
-	msg->env->userhdrs = cur->next;
-      tmp = cur;
-      cur = cur->next;
+      tmp       = cur;
+      *last     = cur->next;
+      cur       = cur->next;
       tmp->next = NULL;
       mutt_free_list (&tmp);
     }