From c99b3e32416c971783b6e7adfa9a680a8cedc155 Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Tue, 14 May 2019 19:09:51 +0100
Subject: [PATCH] don't use pool in libraries

---
 address/address.c   |  4 ++--
 config/cfgaccount.c |  4 ++--
 config/set.c        |  4 ++--
 email/parse.c       |  4 ++--
 mutt/file.c         | 24 ++++++++++++------------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/address/address.c b/address/address.c
index e62a0a70c..7982347d6 100644
--- a/address/address.c
+++ b/address/address.c
@@ -647,7 +647,7 @@ struct Address *mutt_addr_parse_list2(struct Address *p, const char *s)
   const char *q = strpbrk(s, "\"<>():;,\\");
   if (!q)
   {
-    struct Buffer *tmp = mutt_buffer_pool_get();
+    struct Buffer *tmp = mutt_buffer_alloc(1024);
     mutt_buffer_strcpy(tmp, s);
     char *r = tmp->data;
     while ((r = strtok(r, " \t")))
@@ -655,7 +655,7 @@ struct Address *mutt_addr_parse_list2(struct Address *p, const char *s)
       p = mutt_addr_parse_list(p, r);
       r = NULL;
     }
-    mutt_buffer_pool_release(&tmp);
+    mutt_buffer_free(&tmp);
   }
   else
     p = mutt_addr_parse_list(p, s);
diff --git a/config/cfgaccount.c b/config/cfgaccount.c
index 99516fb54..39b5eaf94 100644
--- a/config/cfgaccount.c
+++ b/config/cfgaccount.c
@@ -100,7 +100,7 @@ void ac_free(const struct ConfigSet *cs, struct CfgAccount **ac)
     return;
 
   char child[128];
-  struct Buffer *err = mutt_buffer_pool_get();
+  struct Buffer *err = mutt_buffer_new();
 
   for (size_t i = 0; i < (*ac)->num_vars; i++)
   {
@@ -112,7 +112,7 @@ void ac_free(const struct ConfigSet *cs, struct CfgAccount **ac)
     mutt_hash_delete(cs->hash, child, NULL);
   }
 
-  mutt_buffer_pool_release(&err);
+  mutt_buffer_free(&err);
   FREE(&(*ac)->name);
   FREE(&(*ac)->vars);
   FREE(ac);
diff --git a/config/set.c b/config/set.c
index 7a6f042e1..051c435fe 100644
--- a/config/set.c
+++ b/config/set.c
@@ -263,7 +263,7 @@ bool cs_register_variables(const struct ConfigSet *cs, struct ConfigDef vars[],
   if (!cs || !vars)
     return false;
 
-  struct Buffer *err = mutt_buffer_pool_get();
+  struct Buffer *err = mutt_buffer_new();
 
   bool rc = true;
 
@@ -276,7 +276,7 @@ bool cs_register_variables(const struct ConfigSet *cs, struct ConfigDef vars[],
     }
   }
 
-  mutt_buffer_pool_release(&err);
+  mutt_buffer_free(&err);
   return rc;
 }
 
diff --git a/email/parse.c b/email/parse.c
index 1c54e3483..9bd56d13c 100644
--- a/email/parse.c
+++ b/email/parse.c
@@ -76,12 +76,12 @@ void mutt_auto_subscribe(const char *mailto)
       !mutt_regexlist_match(&UnMailLists, lpenv->to->mailbox) &&
       !mutt_regexlist_match(&UnSubscribedLists, lpenv->to->mailbox))
   {
-    struct Buffer *err = mutt_buffer_pool_get();
+    struct Buffer *err = mutt_buffer_new();
     /* mutt_regexlist_add() detects duplicates, so it is safe to
      * try to add here without any checks. */
     mutt_regexlist_add(&MailLists, lpenv->to->mailbox, REG_ICASE, err);
     mutt_regexlist_add(&SubscribedLists, lpenv->to->mailbox, REG_ICASE, err);
-    mutt_buffer_pool_release(&err);
+    mutt_buffer_free(&err);
   }
 
   mutt_env_free(&lpenv);
diff --git a/mutt/file.c b/mutt/file.c
index 8a50b0a59..9d260a4bd 100644
--- a/mutt/file.c
+++ b/mutt/file.c
@@ -93,7 +93,7 @@ static int mkwrapdir(const char *path, struct Buffer *newfile, struct Buffer *ne
   const char *basename = NULL;
   int rc = 0;
 
-  struct Buffer *parent = mutt_buffer_pool_get();
+  struct Buffer *parent = mutt_buffer_alloc(PATH_MAX);
   mutt_buffer_strcpy(parent, NONULL(path));
 
   char *p = strrchr(parent->data, '/');
@@ -119,7 +119,7 @@ static int mkwrapdir(const char *path, struct Buffer *newfile, struct Buffer *ne
   mutt_buffer_printf(newfile, "%s/%s", mutt_b2s(newdir), NONULL(basename));
 
 cleanup:
-  mutt_buffer_pool_release(&parent);
+  mutt_buffer_free(&parent);
   return rc;
 }
 
@@ -305,11 +305,11 @@ int mutt_file_symlink(const char *oldpath, const char *newpath)
   }
   else
   {
-    struct Buffer *abs_oldpath = mutt_buffer_pool_get();
+    struct Buffer *abs_oldpath = mutt_buffer_alloc(PATH_MAX);
 
     if (!mutt_path_getcwd(abs_oldpath))
     {
-      mutt_buffer_pool_release(&abs_oldpath);
+      mutt_buffer_free(&abs_oldpath);
       return -1;
     }
 
@@ -317,11 +317,11 @@ int mutt_file_symlink(const char *oldpath, const char *newpath)
     mutt_buffer_addstr(abs_oldpath, oldpath);
     if (symlink(mutt_b2s(abs_oldpath), newpath) == -1)
     {
-      mutt_buffer_pool_release(&abs_oldpath);
+      mutt_buffer_free(&abs_oldpath);
       return -1;
     }
 
-    mutt_buffer_pool_release(&abs_oldpath);
+    mutt_buffer_free(&abs_oldpath);
   }
 
   if ((stat(oldpath, &osb) == -1) || (stat(newpath, &nsb) == -1) ||
@@ -522,8 +522,8 @@ int mutt_file_open(const char *path, int flags)
 
   if (flags & O_EXCL)
   {
-    safe_file = mutt_buffer_pool_get();
-    safe_dir = mutt_buffer_pool_get();
+    safe_file = mutt_buffer_alloc(PATH_MAX);
+    safe_dir = mutt_buffer_alloc(PATH_MAX);
 
     if (mkwrapdir(path, safe_file, safe_dir) == -1)
     {
@@ -560,8 +560,8 @@ int mutt_file_open(const char *path, int flags)
   }
 
 cleanup:
-  mutt_buffer_pool_release(&safe_file);
-  mutt_buffer_pool_release(&safe_dir);
+  mutt_buffer_free(&safe_file);
+  mutt_buffer_free(&safe_dir);
 
   return fd;
 }
@@ -1393,11 +1393,11 @@ int mutt_file_check_empty(const char *path)
  */
 void mutt_buffer_file_expand_fmt_quote(struct Buffer *dest, const char *fmt, const char *src)
 {
-  struct Buffer *tmp = mutt_buffer_pool_get();
+  struct Buffer *tmp = mutt_buffer_alloc(PATH_MAX);
 
   mutt_buffer_quote_filename(tmp, src, true);
   mutt_file_expand_fmt(dest, fmt, mutt_b2s(tmp));
-  mutt_buffer_pool_release(&tmp);
+  mutt_buffer_free(&tmp);
 }
 
 /**
-- 
2.40.0