X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fstore.h;h=58561ac2832e6e87344489b55a139cc5b0463eb3;hb=a57492a480bce6d41dec5255d4a55550aa9d4f87;hp=39b0f6ecfad58d4c4e6a047c0b1a8cc4952939f8;hpb=4ec0fcb6737da9bc2603056d56fbf6e41e061967;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/store.h b/src/src/store.h
index 39b0f6ecf..58561ac28 100644
--- a/src/src/store.h
+++ b/src/src/store.h
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) The Exim Maintainers 2020 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Header for Exim's memory allocation functions */
@@ -12,15 +13,26 @@
 
 /* Define symbols for identifying the store pools. */
 
-enum { POOL_MAIN,       POOL_PERM,       POOL_SEARCH,
+#define NPOOLS 10
+enum { POOL_MAIN,
+       POOL_PERM,
+       POOL_CONFIG,
+       POOL_SEARCH,
+       POOL_MESSAGE,
+
        POOL_TAINT_BASE,
-       POOL_TAINT_MAIN = POOL_TAINT_BASE, POOL_TAINT_PERM, POOL_TAINT_SEARCH };
+
+       POOL_TAINT_MAIN = POOL_TAINT_BASE,
+       POOL_TAINT_PERM,
+       POOL_TAINT_CONFIG,
+       POOL_TAINT_SEARCH,
+       POOL_TAINT_MESSAGE };
 
 /* This variable (the one for the current pool) is set by store_get() to its
 yield, and by store_reset() to NULL. This allows string_cat() to optimize its
 store handling. */
 
-extern void *store_last_get[6];
+extern void *store_last_get[NPOOLS];
 
 /* This variable contains the current store pool number. */
 
@@ -44,7 +56,7 @@ tracing information for debugging. */
 #define store_release_above(addr) \
 	store_release_above_3(addr, __FUNCTION__, __LINE__)
 #define store_reset(mark) \
-	store_reset_3(mark, store_pool, __FUNCTION__, __LINE__)
+	store_reset_3(mark, __FUNCTION__, __LINE__)
 
 
 /* The real functions */
@@ -57,7 +69,7 @@ extern void   *store_malloc_3(int, const char *, int)		ALLOC ALLOC_SIZE(1) WARN_
 extern rmark   store_mark_3(const char *, int);
 extern void   *store_newblock_3(void *, BOOL, int, int, const char *, int);
 extern void    store_release_above_3(void *, const char *, int);
-extern rmark   store_reset_3(rmark, int, const char *, int);
+extern rmark   store_reset_3(rmark, const char *, int);
 
 #endif  /* STORE_H */