rename mutt_menu_destroy()

All the other free functions are called *_free().

diff --git a/addrbook.c b/addrbook.c
index 3635620cf5e13a0b89069f4d69a653f5735246bf..38518c7293f4bffaf496a445fdc0b27c96368280 100644 (file)
--- a/addrbook.c
+++ b/addrbook.c
@@ -308,6 +308,6 @@ new_aliases:
   }
 
   mutt_menu_pop_current(menu);
-  mutt_menu_destroy(&menu);
+  mutt_menu_free(&menu);
   FREE(&alias_table);
 }

diff --git a/autocrypt/autocrypt_acct_menu.c b/autocrypt/autocrypt_acct_menu.c
index 289a911a0daae21cbf5c19930d89b9b8f83ab23e..fa827c349fea331988d5a9f5ad0fe0772452787f 100644 (file)
--- a/autocrypt/autocrypt_acct_menu.c
+++ b/autocrypt/autocrypt_acct_menu.c
@@ -224,7 +224,7 @@ static void free_menu(struct Menu **menu)
 
   mutt_menu_pop_current(*menu);
   FREE(&(*menu)->help);
-  mutt_menu_destroy(menu);
+  mutt_menu_free(menu);
 }
 
 /**

diff --git a/browser.c b/browser.c
index db6602b5295b57e3c3c071ed96c061238eff110f..cac8dfb342dc201532c50c534a9b363fb832bb75 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -2161,7 +2161,7 @@ bail:
   if (menu)
   {
     mutt_menu_pop_current(menu);
-    mutt_menu_destroy(&menu);
+    mutt_menu_free(&menu);
   }
 
   if (goto_swapper[0] != '\0')

diff --git a/compose.c b/compose.c
index fc6bd823085a81daba2a698d0f5c4d259e7e266e..97cb8e0b32d83d7daed89b7df6e533e0ec40eae3 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -2187,7 +2187,7 @@ int mutt_compose_menu(struct Email *e, char *fcc, size_t fcclen, struct Email *e
 #endif
 
   mutt_menu_pop_current(menu);
-  mutt_menu_destroy(&menu);
+  mutt_menu_free(&menu);
 
   if (actx->idxlen)
     e->content = actx->idx[0]->content;

diff --git a/conn/ssl.c b/conn/ssl.c
index cb465926dcb79e45298bc51b781290e0781e8fa9..3af1887017f24a614a6e65689c87cd7506f9dbb6 100644 (file)
--- a/conn/ssl.c
+++ b/conn/ssl.c
@@ -1040,7 +1040,7 @@ static bool interactive_check_cert(X509 *cert, int idx, size_t len, SSL *ssl, bo
 
   mutt_buffer_pool_release(&drow);
   mutt_menu_pop_current(menu);
-  mutt_menu_destroy(&menu);
+  mutt_menu_free(&menu);
   mutt_debug(LL_DEBUG2, "done=%d\n", done);
   return done == 2;
 }

diff --git a/conn/ssl_gnutls.c b/conn/ssl_gnutls.c
index 6effa72ba38a20b88adde7394026fbc8dcf58c37..fa0846b90ab5094fc25be5a33e02aa71cd99d857 100644 (file)
--- a/conn/ssl_gnutls.c
+++ b/conn/ssl_gnutls.c
@@ -743,7 +743,7 @@ static int tls_check_one_certificate(const gnutls_datum_t *certdata,
 
   mutt_buffer_pool_release(&drow);
   mutt_menu_pop_current(menu);
-  mutt_menu_destroy(&menu);
+  mutt_menu_free(&menu);
   gnutls_x509_crt_deinit(cert);
 
   return done == 2;

diff --git a/index.c b/index.c
index 96e39f330280823117a6ce8c64d9c64cec9aeacb..f306b4cbfc72e0a495183a1992d22eefe8c54a41 100644 (file)
--- a/index.c
+++ b/index.c
@@ -3660,7 +3660,7 @@ int mutt_index_menu(void)
   }
 
   mutt_menu_pop_current(menu);
-  mutt_menu_destroy(&menu);
+  mutt_menu_free(&menu);
   return close;
 }
 

diff --git a/menu.c b/menu.c
index 717fd8071af87df4538a40e319bc2951af947232..ebebb37f5738eaaba77c912688f0aa587470ed49 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -997,20 +997,24 @@ struct Menu *mutt_menu_new(enum MenuType type)
 }
 
 /**
- * mutt_menu_destroy - Destroy a menu
+ * mutt_menu_free - Destroy a menu
  * @param[out] p Menu to destroy
  */
-void mutt_menu_destroy(struct Menu **p)
+void mutt_menu_free(struct Menu **ptr)
 {
-  if ((*p)->dialog)
+  if (!ptr || !*ptr)
+    return;
+
+  struct Menu *m = *ptr;
+  if (m->dialog)
   {
-    for (int i = 0; i < (*p)->max; i++)
-      FREE(&(*p)->dialog[i]);
+    for (int i = 0; i < m->max; i++)
+      FREE(&m->dialog[i]);
 
-    FREE(&(*p)->dialog);
+    FREE(&m->dialog);
   }
 
-  FREE(p);
+  FREE(ptr);
 }
 
 /**

diff --git a/mutt_history.c b/mutt_history.c
index 51ec6d59a6856dedb65fd0e76682ec74d4a2d107..bb68fac1c1f467a489ba13948fe89c797a4beae7 100644 (file)
--- a/mutt_history.c
+++ b/mutt_history.c
@@ -122,7 +122,7 @@ static void history_menu(char *buf, size_t buflen, char **matches, int match_cou
   }
 
   mutt_menu_pop_current(menu);
-  mutt_menu_destroy(&menu);
+  mutt_menu_free(&menu);
 }
 
 /**

diff --git a/mutt_menu.h b/mutt_menu.h
index afe9f265f83a1cbd99fa05108a1243c9cb1a4e96..cc6ae72b4a2b86b00a00effab0d75dce693ddd23 100644 (file)
--- a/mutt_menu.h
+++ b/mutt_menu.h
@@ -178,7 +178,7 @@ int          menu_redraw(struct Menu *menu);
 void         menu_top_page(struct Menu *menu);
 void         mutt_menu_add_dialog_row(struct Menu *menu, const char *row);
 void         mutt_menu_current_redraw(void);
-void         mutt_menu_destroy(struct Menu **p);
+void         mutt_menu_free(struct Menu **ptr);
 void         mutt_menu_init(void);
 int          mutt_menu_loop(struct Menu *menu);
 struct Menu *mutt_menu_new(enum MenuType type);

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index de5ea695bcc68eb0c5cc1aa333cac0a3434b58c4..a7eec38cff641da39f7fadbca9c55b88d60c82ff 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -4887,7 +4887,7 @@ static struct CryptKeyInfo *crypt_select_key(struct CryptKeyInfo *keys,
   }
 
   mutt_menu_pop_current(menu);
-  mutt_menu_destroy(&menu);
+  mutt_menu_free(&menu);
   FREE(&key_table);
 
   return k;

diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index c108b1d3a64a0b66376204a699c5e45f7065ec2c..60bb21c64c044abebd54ed929de1b469634336d6 100644 (file)
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -802,7 +802,7 @@ static struct PgpKeyInfo *pgp_select_key(struct PgpKeyInfo *keys,
   }
 
   mutt_menu_pop_current(menu);
-  mutt_menu_destroy(&menu);
+  mutt_menu_free(&menu);
   FREE(&key_table);
 
   return kp;

diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index 59004dcfef66d9f70666909de9c99252aebf098e..5c567418ec5492fd1f416ec007f2d9f610a29c73 100644 (file)
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -611,7 +611,7 @@ static struct SmimeKey *smime_select_key(struct SmimeKey *keys, char *query)
   }
 
   mutt_menu_pop_current(menu);
-  mutt_menu_destroy(&menu);
+  mutt_menu_free(&menu);
   FREE(&table);
 
   return selected_key;

diff --git a/pager.c b/pager.c
index a5daf6862e36f28eb41df9f7675c4591987edf55..3f0542ef35975ad7e63c2a7547295ec62f54277c 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -3109,7 +3109,7 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P
         if (old_PagerIndexLines != C_PagerIndexLines)
         {
           if (rd.index)
-            mutt_menu_destroy(&rd.index);
+            mutt_menu_free(&rd.index);
           rd.index = NULL;
         }
 
@@ -3581,9 +3581,9 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P
   }
   FREE(&rd.line_info);
   mutt_menu_pop_current(pager_menu);
-  mutt_menu_destroy(&pager_menu);
+  mutt_menu_free(&pager_menu);
   if (rd.index)
-    mutt_menu_destroy(&rd.index);
+    mutt_menu_free(&rd.index);
 
   mutt_buffer_free(&helpstr);
   mutt_window_free(&rd.index_status_window);

diff --git a/postpone.c b/postpone.c
index 25901f41d3fd51477d73346f8102b9f9de07bc5d..295f1f8922c9e45339f215be5ef394efd7df592e 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -272,7 +272,7 @@ static struct Email *select_msg(struct Context *ctx)
 
   C_Sort = orig_sort;
   mutt_menu_pop_current(menu);
-  mutt_menu_destroy(&menu);
+  mutt_menu_free(&menu);
   return (r > -1) ? ctx->mailbox->emails[r] : NULL;
 }
 

diff --git a/query.c b/query.c
index 9150cd152ca280cc29893046228643b7be013721..2ed340f94061310911b0c25f437c27a4f047f9db 100644 (file)
--- a/query.c
+++ b/query.c
@@ -420,7 +420,7 @@ static void query_menu(char *buf, size_t buflen, struct Query *results, bool ret
 
               menu->current = 0;
               mutt_menu_pop_current(menu);
-              mutt_menu_destroy(&menu);
+              mutt_menu_free(&menu);
               menu = mutt_menu_new(MENU_QUERY);
               menu->menu_make_entry = query_make_entry;
               menu->menu_search = query_search;
@@ -600,7 +600,7 @@ static void query_menu(char *buf, size_t buflen, struct Query *results, bool ret
     free_query(&results);
     FREE(&query_table);
     mutt_menu_pop_current(menu);
-    mutt_menu_destroy(&menu);
+    mutt_menu_free(&menu);
   }
 }
 

diff --git a/recvattach.c b/recvattach.c
index e82be9d7624d276b3338a542ef0f412009e55f79..58ef31940af1b35640c1f3c4d515b8089f182596 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -1696,7 +1696,7 @@ void mutt_view_attachments(struct Email *e)
         mutt_actx_free(&actx);
 
         mutt_menu_pop_current(menu);
-        mutt_menu_destroy(&menu);
+        mutt_menu_free(&menu);
         return;
     }
 

diff --git a/remailer.c b/remailer.c
index cd42058d145800bf07b2aa957f88885828d37f6e..a87290bfbc007910779b4d20cac75035fac5e8e3 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -744,7 +744,7 @@ void mix_make_chain(struct ListHead *chainhead)
   }
 
   mutt_menu_pop_current(menu);
-  mutt_menu_destroy(&menu);
+  mutt_menu_free(&menu);
 
   /* construct the remailer list */