--- a/src/auth/auth-digest-md5.c	Sat Dec 21 14:42:36 2002 +0200
+++ b/src/auth/auth-digest-md5.c	Sat Dec 21 15:08:49 2002 +0200
@@ -585,7 +585,7 @@
 	Pool pool;
 	const char *challenge;
 
-	pool = pool_create("Digest-MD5", 256, FALSE);
+	pool = pool_alloconly_create("Digest-MD5", 256);
 	auth = p_new(pool, AuthData, 1);
 	auth->pool = pool;
 

--- a/src/auth/userinfo-passwd-file.c	Sat Dec 21 14:42:36 2002 +0200
+++ b/src/auth/userinfo-passwd-file.c	Sat Dec 21 15:08:49 2002 +0200
@@ -353,7 +353,7 @@
 	if (fstat(fd, &st) != 0)
 		i_fatal("fstat() failed for passwd-file %s: %m", path);
 
-	pool = pool_create("PasswdFile", 10240, FALSE);
+	pool = pool_alloconly_create("PasswdFile", 10240);
 	pw = p_new(pool, PasswdFile, 1);
 	pw->pool = pool;
 	pw->path = p_strdup(pool, path);

--- a/src/imap/cmd-list.c	Sat Dec 21 14:42:36 2002 +0200
+++ b/src/imap/cmd-list.c	Sat Dec 21 15:08:49 2002 +0200
@@ -160,7 +160,7 @@
 			pattern = t_strconcat(ref, pattern, NULL);
 		}
 
-		ctx.pool = pool_create("ListContext", 10240, FALSE);
+		ctx.pool = pool_alloconly_create("ListContext", 10240);
 		ctx.nodes = NULL;
 		ctx.storage = client->storage;
 

--- a/src/imap/cmd-search.c	Sat Dec 21 14:42:36 2002 +0200
+++ b/src/imap/cmd-search.c	Sat Dec 21 15:08:49 2002 +0200
@@ -42,7 +42,7 @@
 		charset = NULL;
 	}
 
-	pool = pool_create("MailSearchArgs", 2048, FALSE);
+	pool = pool_alloconly_create("MailSearchArgs", 2048);
 
 	sargs = mail_search_args_build(pool, args, &error);
 	if (sargs == NULL) {

--- a/src/imap/cmd-sort.c	Sat Dec 21 14:42:36 2002 +0200
+++ b/src/imap/cmd-sort.c	Sat Dec 21 15:08:49 2002 +0200
@@ -104,7 +104,7 @@
 	charset = args->data.str;
 	args++;
 
-	pool = pool_create("MailSortArgs", 2048, FALSE);
+	pool = pool_alloconly_create("MailSortArgs", 2048);
 
 	sargs = mail_search_args_build(pool, args, &error);
 	if (sargs == NULL) {

--- a/src/lib-imap/imap-message-cache.c	Sat Dec 21 14:42:36 2002 +0200
+++ b/src/lib-imap/imap-message-cache.c	Sat Dec 21 15:08:49 2002 +0200
@@ -105,7 +105,8 @@
 		*msgp = NULL;
 	}
 
-	pool = pool_create("CachedMessage", DEFAULT_MESSAGE_POOL_SIZE, FALSE);
+	pool = pool_alloconly_create("CachedMessage",
+				     DEFAULT_MESSAGE_POOL_SIZE);
 
 	msg = p_new(pool, CachedMessage, 1);
 	msg->pool = pool;

--- a/src/lib-imap/imap-parser.c	Sat Dec 21 14:42:36 2002 +0200
+++ b/src/lib-imap/imap-parser.c	Sat Dec 21 15:08:49 2002 +0200
@@ -66,7 +66,7 @@
 	ImapParser *parser;
 
 	parser = i_new(ImapParser, 1);
-        parser->pool = pool_create("IMAP parser", 8192, FALSE);
+        parser->pool = pool_alloconly_create("IMAP parser", 8192);
 	parser->input = input;
 	parser->output = output;
 	parser->max_literal_size = max_literal_size;

--- a/src/lib-index/mail-index-update.c	Sat Dec 21 14:42:36 2002 +0200
+++ b/src/lib-index/mail-index-update.c	Sat Dec 21 15:08:49 2002 +0200
@@ -36,7 +36,7 @@
 
 	i_assert(index->lock_type == MAIL_LOCK_EXCLUSIVE);
 
-	pool = pool_create("MailIndexUpdate", 1024, FALSE);
+	pool = pool_alloconly_create("MailIndexUpdate", 1024);
 
 	update = p_new(pool, MailIndexUpdate, 1);
 	update->pool = pool;
@@ -386,7 +386,7 @@
 	if (ctx->update->index->header->cache_fields & DATA_FIELD_ENVELOPE) {
 		if (ctx->envelope_pool == NULL) {
 			ctx->envelope_pool =
-				pool_create("index envelope", 2048, FALSE);
+				pool_alloconly_create("index envelope", 2048);
 		}
 		t_push();
 		imap_envelope_parse_header(ctx->envelope_pool,
@@ -428,7 +428,7 @@
 		/* for body / bodystructure, we need need to
 		   fully parse the message. unless it's already parsed
 		   and cached. */
-		pool = pool_create("index message parser", 2048, FALSE);
+		pool = pool_alloconly_create("index message parser", 2048);
 
 		value = update->index->lookup_field_raw(update->index,
 							update->rec,

--- a/src/lib-index/maildir/maildir-sync.c	Sat Dec 21 14:42:36 2002 +0200
+++ b/src/lib-index/maildir/maildir-sync.c	Sat Dec 21 15:08:49 2002 +0200
@@ -219,7 +219,7 @@
 		return index_file_set_syscall_error(index, dir, "opendir()");
 
 	count = index->header->messages_count + 16;
-	pool = pool_create("Maildir sync", nearest_power(count*30), FALSE);
+	pool = pool_alloconly_create("Maildir sync", nearest_power(count*30));
 	files = hash_create(pool, index->header->messages_count*2, str_hash,
 			    (HashCompareFunc) strcmp);
 

--- a/src/lib-storage/index/index-search.c	Sat Dec 21 14:42:36 2002 +0200
+++ b/src/lib-storage/index/index-search.c	Sat Dec 21 15:08:49 2002 +0200
@@ -316,8 +316,8 @@
 	}
 
 	if (ctx->hdr_pool == NULL) {
-		ctx->hdr_pool = pool_create("message_header_search",
-					    8192, FALSE);
+		ctx->hdr_pool =
+			pool_alloconly_create("message_header_search", 8192);
 	}
 
 	arg->context = message_header_search_init(ctx->hdr_pool, arg->value.str,

--- a/src/lib-storage/mail-sort.c	Sat Dec 21 14:42:36 2002 +0200
+++ b/src/lib-storage/mail-sort.c	Sat Dec 21 15:08:49 2002 +0200
@@ -108,7 +108,7 @@
 						 128 * sizeof(unsigned int),
 						 (size_t)-1);
 
-	ctx->temp_pool = pool_create("Sort", 8192, FALSE);
+	ctx->temp_pool = pool_alloconly_create("Sort", 8192);
 	ctx->funcs = funcs;
 	ctx->func_context = context;
 	return ctx;

--- a/src/lib/Makefile.am	Sat Dec 21 14:42:36 2002 +0200
+++ b/src/lib/Makefile.am	Sat Dec 21 15:08:49 2002 +0200
@@ -27,7 +27,6 @@
 	lib.c \
 	lib-signals.c \
 	md5.c \
-	mempool.c \
 	mempool-alloconly.c \
 	mempool-datastack.c \
 	mempool-system.c \

--- a/src/lib/env-util.c	Sat Dec 21 14:42:36 2002 +0200
+++ b/src/lib/env-util.c	Sat Dec 21 15:08:49 2002 +0200
@@ -33,7 +33,7 @@
 void env_put(const char *env)
 {
 	if (pool == NULL)
-		pool = pool_create("Environment", 1024, FALSE);
+		pool = pool_alloconly_create("Environment", 1024);
 
 	if (putenv(p_strdup(pool, env)) != 0)
 		i_fatal("Environment full, can't add: %s", env);

--- a/src/lib/imem.c	Sat Dec 21 14:42:36 2002 +0200
+++ b/src/lib/imem.c	Sat Dec 21 15:08:49 2002 +0200
@@ -103,10 +103,9 @@
 
 void imem_init(void)
 {
-	default_pool = pool_create("Default pool", 4096, TRUE);
+	default_pool = system_pool;
 }
 
 void imem_deinit(void)
 {
-        pool_unref(default_pool);
 }

--- a/src/lib/mempool-alloconly.c	Sat Dec 21 14:42:36 2002 +0200
+++ b/src/lib/mempool-alloconly.c	Sat Dec 21 15:08:49 2002 +0200
@@ -91,7 +91,7 @@
 	pool_alloconly_clear
 };
 
-Pool _pool_alloconly_create(const char *name, size_t size)
+Pool pool_alloconly_create(const char *name, size_t size)
 {
 	AlloconlyPool *apool;
 	int len;

--- a/src/lib/mempool.c	Sat Dec 21 14:42:36 2002 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- mempool.c : Memory pool initialization
-
-    Copyright (c) 2001-2002 Timo Sirainen
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include "lib.h"
-#include "mempool.h"
-
-Pool pool_create(const char *name, size_t size, int allocfree)
-{
-	if (allocfree)
-		return system_pool;
-
-	return _pool_alloconly_create(name, size);
-}

--- a/src/lib/mempool.h	Sat Dec 21 14:42:36 2002 +0200
+++ b/src/lib/mempool.h	Sat Dec 21 15:08:49 2002 +0200
@@ -34,9 +34,9 @@
 /* memory allocated from data_stack is valid only until next t_pop() call. */
 extern Pool data_stack_pool;
 
-/* If allocfree is FALSE, p_free() has no effect. Note that `size' specifies
-   the initial malloc()ed block size, part of it is used internally. */
-Pool pool_create(const char *name, size_t size, int allocfree);
+/* Create a new alloc-only pool. Note that `size' specifies the initial
+   malloc()ed block size, part of it is used internally. */
+Pool pool_alloconly_create(const char *name, size_t size);
 
 /* Pools should be used through these macros: */
 #define pool_ref(pool) (pool)->ref(pool)
@@ -66,6 +66,4 @@
 #  define p_free_clean(pool, mem)
 #endif
 
-Pool _pool_alloconly_create(const char *name, size_t size);
-
 #endif