Convert imap_rename and pgp_invoke_list_keys to use buffer pool.

diff --git a/imap/imap.c b/imap/imap.c
index 90758736f9818a74b2371902155e56ef693e5871..f2c89f245217c30a57af5c2e790b58a0f959488d 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -695,13 +695,13 @@ int imap_rename_mailbox(struct ImapAccountData *adata, struct ImapMbox *mx, cons
   imap_munge_mbox_name(adata, oldmbox, sizeof(oldmbox), mx->mbox);
   imap_munge_mbox_name(adata, newmbox, sizeof(newmbox), newname);
 
-  struct Buffer *b = mutt_buffer_alloc(LONG_STRING);
+  struct Buffer *b = mutt_buffer_pool_get();
   mutt_buffer_printf(b, "RENAME %s %s", oldmbox, newmbox);
 
-  if (imap_exec(adata, b->data, 0) != 0)
+  if (imap_exec(adata, mutt_b2s(b), 0) != 0)
     rc = -1;
 
-  mutt_buffer_free(&b);
+  mutt_buffer_pool_release(&b);
 
   return rc;
 }

diff --git a/ncrypt/pgpinvoke.c b/ncrypt/pgpinvoke.c
index 3c87e8ca8d79846569e8f31c5abb3af694ed02fa..c3223a4bfa494878eb21561d39b6e4b7db777a80 100644 (file)
--- a/ncrypt/pgpinvoke.c
+++ b/ncrypt/pgpinvoke.c
@@ -526,8 +526,7 @@ pid_t pgp_invoke_list_keys(FILE **pgpin, FILE **pgpout, FILE **pgperr,
 {
   char quoted[HUGE_STRING];
 
-  struct Buffer *uids = mutt_buffer_new();
-  mutt_buffer_increase_size(uids, HUGE_STRING);
+  struct Buffer *uids = mutt_buffer_pool_get();
 
   struct ListNode *np = NULL;
   STAILQ_FOREACH(np, hints, entries)
@@ -538,10 +537,10 @@ pid_t pgp_invoke_list_keys(FILE **pgpin, FILE **pgpout, FILE **pgperr,
       mutt_buffer_addch(uids, ' ');
   }
 
-  pid_t rc = pgp_invoke(
-      pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, 0, NULL, NULL, uids->data,
-      keyring == PGP_SECRING ? PgpListSecringCommand : PgpListPubringCommand);
+  pid_t rc = pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, 0,
+                        NULL, NULL, mutt_b2s(uids),
+                        keyring == PGP_SECRING ? PgpListSecringCommand : PgpListPubringCommand);
 
-  mutt_buffer_free(&uids);
+  mutt_buffer_pool_release(&uids);
   return rc;
 }