rename el_free()

Rename to mutt_emaillist_free() to match other functions.

diff --git a/context.h b/context.h
index 15bdd05521a7fa4d150023cc41d5a7a193c87e6f..6be1bec25556a70f750d3926a25cd12fad740324 100644 (file)
--- a/context.h
+++ b/context.h
@@ -62,6 +62,6 @@ bool message_is_visible(struct Context *ctx, int index);
 
 int  el_add_email(struct EmailList *el, struct Email *e);
 int  el_add_tagged(struct EmailList *el, struct Context *ctx, struct Email *e, bool use_tagged);
-void el_free(struct EmailList *el);
+void mutt_emaillist_free(struct EmailList *el);
 
 #endif /* MUTT_CONTEXT_H */

diff --git a/email/email.c b/email/email.c
index 4dfe17affee6df3323fc52c578f0e2864453b4f3..dac8bb328457056bdbce2dc1222202ffd4cde0ff 100644 (file)
--- a/email/email.c
+++ b/email/email.c
@@ -114,12 +114,12 @@ size_t mutt_email_size(const struct Email *e)
 }
 
 /**
- * el_free - Drop a private list of Emails
+ * mutt_emaillist_free - Drop a private list of Emails
  * @param el EmailList to empty
  *
  * The Emails are not freed.
  */
-void el_free(struct EmailList *el)
+void mutt_emaillist_free(struct EmailList *el)
 {
   if (!el)
     return;

diff --git a/email/email.h b/email/email.h
index c6af64ce8ae5ce8e9662c008676bed724404e7c5..6f31989c613276ffc8ff5b1824a06531691a5773 100644 (file)
--- a/email/email.h
+++ b/email/email.h
@@ -130,6 +130,6 @@ void          mutt_email_free(struct Email **e);
 struct Email *mutt_email_new(void);
 size_t        mutt_email_size(const struct Email *e);
 
-void el_free(struct EmailList *el);
+void mutt_emaillist_free(struct EmailList *el);
 
 #endif /* MUTT_EMAIL_EMAIL_H */

diff --git a/index.c b/index.c
index be8513b916f3ee4ccbff8a4e40acd4974f250fc0..2ca8a204113cb81bfadb38ce2aee89d6fadffbda 100644 (file)
--- a/index.c
+++ b/index.c
@@ -1832,7 +1832,7 @@ int mutt_index_menu(void)
         struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
         el_add_tagged(&el, Context, CUR_EMAIL, tag);
         ci_send_message(SEND_TO_SENDER, NULL, NULL, Context, &el);
-        el_free(&el);
+        mutt_emaillist_free(&el);
         menu->redraw = REDRAW_FULL;
         break;
       }
@@ -2342,7 +2342,7 @@ int mutt_index_menu(void)
           struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
           el_add_tagged(&el, Context, CUR_EMAIL, tag);
           mutt_check_traditional_pgp(&el, &menu->redraw);
-          el_free(&el);
+          mutt_emaillist_free(&el);
         }
         int hint =
             Context->mailbox->emails[Context->mailbox->v2r[menu->current]]->index;
@@ -2456,7 +2456,7 @@ int mutt_index_menu(void)
           else
             mutt_error(_("No thread linked"));
 
-          el_free(&el);
+          mutt_emaillist_free(&el);
         }
 
         if (menu->menu == MENU_PAGER)
@@ -2607,7 +2607,7 @@ int mutt_index_menu(void)
           else
             menu->redraw |= REDRAW_CURRENT;
         }
-        el_free(&el);
+        mutt_emaillist_free(&el);
         break;
       }
 
@@ -2919,7 +2919,7 @@ int mutt_index_menu(void)
           else
             menu->redraw |= REDRAW_CURRENT;
         }
-        el_free(&el);
+        mutt_emaillist_free(&el);
         break;
       }
 
@@ -2979,7 +2979,7 @@ int mutt_index_menu(void)
         struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
         el_add_tagged(&el, Context, CUR_EMAIL, tag);
         ci_bounce_message(Context->mailbox, &el);
-        el_free(&el);
+        mutt_emaillist_free(&el);
         break;
       }
 
@@ -3010,7 +3010,7 @@ int mutt_index_menu(void)
         mutt_emails_set_flag(Context->mailbox, &el, MUTT_PURGE, (op == OP_PURGE_MESSAGE));
         if (C_DeleteUntag)
           mutt_emails_set_flag(Context->mailbox, &el, MUTT_TAG, 0);
-        el_free(&el);
+        mutt_emaillist_free(&el);
 
         if (tag)
         {
@@ -3129,12 +3129,12 @@ int mutt_index_menu(void)
           struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
           el_add_tagged(&el, Context, CUR_EMAIL, tag);
           mutt_check_traditional_pgp(&el, &menu->redraw);
-          el_free(&el);
+          mutt_emaillist_free(&el);
         }
         struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
         el_add_tagged(&el, Context, CUR_EMAIL, tag);
         mutt_ev_message(Context->mailbox, &el, edit ? EVM_EDIT : EVM_VIEW);
-        el_free(&el);
+        mutt_emaillist_free(&el);
         menu->redraw = REDRAW_FULL;
 
         break;
@@ -3151,7 +3151,7 @@ int mutt_index_menu(void)
           mutt_check_traditional_pgp(&el, &menu->redraw);
         }
         ci_send_message(SEND_FORWARD, NULL, NULL, Context, &el);
-        el_free(&el);
+        mutt_emaillist_free(&el);
         menu->redraw = REDRAW_FULL;
         break;
       }
@@ -3177,7 +3177,7 @@ int mutt_index_menu(void)
           mutt_check_traditional_pgp(&el, &menu->redraw);
         }
         ci_send_message(replyflags, NULL, NULL, Context, &el);
-        el_free(&el);
+        mutt_emaillist_free(&el);
         menu->redraw = REDRAW_FULL;
         break;
       }
@@ -3190,7 +3190,7 @@ int mutt_index_menu(void)
         struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
         el_add_tagged(&el, Context, CUR_EMAIL, tag);
         int num_changed = mutt_label_message(Context->mailbox, &el);
-        el_free(&el);
+        mutt_emaillist_free(&el);
 
         if (num_changed > 0)
         {
@@ -3222,7 +3222,7 @@ int mutt_index_menu(void)
           mutt_check_traditional_pgp(&el, &menu->redraw);
         }
         ci_send_message(SEND_REPLY | SEND_LIST_REPLY, NULL, NULL, Context, &el);
-        el_free(&el);
+        mutt_emaillist_free(&el);
         menu->redraw = REDRAW_FULL;
         break;
       }
@@ -3252,7 +3252,7 @@ int mutt_index_menu(void)
         struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
         el_add_tagged(&el, Context, CUR_EMAIL, tag);
         crypt_extract_keys_from_messages(&el);
-        el_free(&el);
+        mutt_emaillist_free(&el);
         menu->redraw = REDRAW_FULL;
         break;
       }
@@ -3268,7 +3268,7 @@ int mutt_index_menu(void)
           struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
           el_add_tagged(&el, Context, CUR_EMAIL, tag);
           mutt_check_traditional_pgp(&el, &menu->redraw);
-          el_free(&el);
+          mutt_emaillist_free(&el);
         }
 
         if (menu->menu == MENU_PAGER)
@@ -3286,7 +3286,7 @@ int mutt_index_menu(void)
         struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
         el_add_tagged(&el, Context, CUR_EMAIL, tag);
         mutt_pipe_message(Context->mailbox, &el);
-        el_free(&el);
+        mutt_emaillist_free(&el);
 
 #ifdef USE_IMAP
         /* in an IMAP folder index with imap_peek=no, piping could change
@@ -3306,7 +3306,7 @@ int mutt_index_menu(void)
         struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
         el_add_tagged(&el, Context, CUR_EMAIL, tag);
         mutt_print_message(Context->mailbox, &el);
-        el_free(&el);
+        mutt_emaillist_free(&el);
 
 #ifdef USE_IMAP
         /* in an IMAP folder index with imap_peek=no, printing could change
@@ -3446,7 +3446,7 @@ int mutt_index_menu(void)
             el_add_tagged(&el, Context, CUR_EMAIL, tag);
             ci_send_message(((op == OP_FOLLOWUP) ? SEND_REPLY : SEND_FORWARD) | SEND_NEWS,
                             NULL, NULL, Context, &el);
-            el_free(&el);
+            mutt_emaillist_free(&el);
           }
           menu->redraw = REDRAW_FULL;
           break;
@@ -3464,7 +3464,7 @@ int mutt_index_menu(void)
           mutt_check_traditional_pgp(&el, &menu->redraw);
         }
         ci_send_message(SEND_REPLY, NULL, NULL, Context, &el);
-        el_free(&el);
+        mutt_emaillist_free(&el);
         menu->redraw = REDRAW_FULL;
         break;
       }
@@ -3511,7 +3511,7 @@ int mutt_index_menu(void)
 
         mutt_emails_set_flag(Context->mailbox, &el, MUTT_DELETE, 0);
         mutt_emails_set_flag(Context->mailbox, &el, MUTT_PURGE, 0);
-        el_free(&el);
+        mutt_emaillist_free(&el);
 
         if (tag)
         {

diff --git a/pager.c b/pager.c
index 56e192345acb245d6aaa5e1ad8e35a0c3d090bb5..8a681c2ffc68468bfe479dd809ac40196d967e2a 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -2953,7 +2953,7 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P
           struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
           el_add_email(&el, extra->email);
           ci_bounce_message(m, &el);
-          el_free(&el);
+          mutt_emaillist_free(&el);
         }
         break;
       }
@@ -2978,7 +2978,7 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P
           struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
           el_add_email(&el, extra->email);
           ci_send_message(SEND_TO_SENDER, NULL, NULL, extra->ctx, &el);
-          el_free(&el);
+          mutt_emaillist_free(&el);
         }
         pager_menu->redraw = REDRAW_FULL;
         break;
@@ -3037,7 +3037,7 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P
           ch = -1;
           rc = OP_MAIN_NEXT_UNDELETED;
         }
-        el_free(&el);
+        mutt_emaillist_free(&el);
         break;
       }
 
@@ -3143,7 +3143,7 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P
           struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
           el_add_tagged(&el, extra->ctx, extra->email, false);
           mutt_pipe_message(extra->ctx->mailbox, &el);
-          el_free(&el);
+          mutt_emaillist_free(&el);
         }
         break;
 
@@ -3156,7 +3156,7 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P
           struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
           el_add_tagged(&el, extra->ctx, extra->email, false);
           mutt_print_message(extra->ctx->mailbox, &el);
-          el_free(&el);
+          mutt_emaillist_free(&el);
         }
         break;
 
@@ -3195,7 +3195,7 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P
           struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
           el_add_email(&el, extra->email);
           ci_send_message(SEND_NEWS | SEND_FORWARD, NULL, NULL, extra->ctx, &el);
-          el_free(&el);
+          mutt_emaillist_free(&el);
         }
         pager_menu->redraw = REDRAW_FULL;
         break;
@@ -3228,7 +3228,7 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P
             struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
             el_add_email(&el, extra->email);
             ci_send_message(SEND_NEWS | SEND_REPLY, NULL, NULL, extra->ctx, &el);
-            el_free(&el);
+            mutt_emaillist_free(&el);
           }
           pager_menu->redraw = REDRAW_FULL;
           break;
@@ -3258,7 +3258,7 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P
           struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
           el_add_email(&el, extra->email);
           ci_send_message(replyflags, NULL, NULL, extra->ctx, &el);
-          el_free(&el);
+          mutt_emaillist_free(&el);
         }
         pager_menu->redraw = REDRAW_FULL;
         break;
@@ -3271,7 +3271,7 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P
         struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
         el_add_email(&el, extra->email);
         ci_send_message(SEND_POSTPONED, NULL, NULL, extra->ctx, &el);
-        el_free(&el);
+        mutt_emaillist_free(&el);
         pager_menu->redraw = REDRAW_FULL;
         break;
       }
@@ -3286,7 +3286,7 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P
           struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
           el_add_email(&el, extra->email);
           ci_send_message(SEND_FORWARD, NULL, NULL, extra->ctx, &el);
-          el_free(&el);
+          mutt_emaillist_free(&el);
         }
         pager_menu->redraw = REDRAW_FULL;
         break;
@@ -3333,7 +3333,7 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P
           else
             pager_menu->redraw |= REDRAW_STATUS | REDRAW_INDEX;
         }
-        el_free(&el);
+        mutt_emaillist_free(&el);
         break;
       }
 
@@ -3467,7 +3467,7 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P
         struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
         el_add_email(&el, extra->email);
         ci_send_message(SEND_KEY, NULL, NULL, extra->ctx, &el);
-        el_free(&el);
+        mutt_emaillist_free(&el);
         pager_menu->redraw = REDRAW_FULL;
         break;
       }
@@ -3479,7 +3479,7 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P
         struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
         el_add_email(&el, extra->email);
         rc = mutt_label_message(Context->mailbox, &el);
-        el_free(&el);
+        mutt_emaillist_free(&el);
 
         if (rc > 0)
         {
@@ -3509,7 +3509,7 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P
         struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
         el_add_email(&el, extra->email);
         crypt_extract_keys_from_messages(&el);
-        el_free(&el);
+        mutt_emaillist_free(&el);
         pager_menu->redraw = REDRAW_FULL;
         break;
       }

diff --git a/recvcmd.c b/recvcmd.c
index 0faac6bcac507f95d3606236a1591fa973af2e35..fb4c451875a781a5a27b8c5dc87fffcb2e2a23e9 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -597,7 +597,7 @@ static void attach_forward_bodies(FILE *fp, struct Email *e, struct AttachCtx *a
   struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
   el_add_email(&el, e_parent);
   ci_send_message(SEND_NO_FLAGS, e_tmp, tmpbody, NULL, &el);
-  el_free(&el);
+  mutt_emaillist_free(&el);
   return;
 
 bail:
@@ -733,7 +733,7 @@ static void attach_forward_msgs(FILE *fp, struct AttachCtx *actx,
   struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
   el_add_email(&el, e_cur);
   ci_send_message(flags, e_tmp, (tmpbody[0] != '\0') ? tmpbody : NULL, NULL, &el);
-  el_free(&el);
+  mutt_emaillist_free(&el);
 }
 
 /**
@@ -1043,7 +1043,7 @@ void mutt_attach_reply(FILE *fp, struct Email *e, struct AttachCtx *actx,
   {
     mutt_set_flag(Context->mailbox, e, MUTT_REPLIED, true);
   }
-  el_free(&el);
+  mutt_emaillist_free(&el);
 }
 
 /**

diff --git a/send.c b/send.c
index d70aabdff6b159c1c52b78716b12d46a8e83ebaf..1ea9d81cd0605c47c4e191e727569d0ec31e3d59 100644 (file)
--- a/send.c
+++ b/send.c
@@ -1492,7 +1492,7 @@ int mutt_resend_message(FILE *fp, struct Context *ctx, struct Email *cur)
   struct EmailList el = STAILQ_HEAD_INITIALIZER(el);
   el_add_email(&el, cur);
   int rc = ci_send_message(SEND_RESEND, msg, NULL, ctx, &el);
-  el_free(&el);
+  mutt_emaillist_free(&el);
 
   return rc;
 }