From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 14 Feb 2023 12:40:40 +0000 (+0100)
Subject: mempool: introduce new helper pool_ptr()
X-Git-Tag: v254-rc1~1243^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72381db942dd00f4d69b2d9a50156a62f2c350da;p=thirdparty%2Fsystemd.git

mempool: introduce new helper pool_ptr()

This new helper returns the beginning of the usable area of the pool
object.

For now this is only used once, a later commit will use it more.
---

diff --git a/src/basic/mempool.c b/src/basic/mempool.c
index 29f72a81712..d934aa95475 100644
--- a/src/basic/mempool.c
+++ b/src/basic/mempool.c
@@ -13,6 +13,10 @@ struct pool {
         size_t n_used;
 };
 
+static void* pool_ptr(struct pool *p) {
+        return ((uint8_t*) ASSERT_PTR(p)) + ALIGN(sizeof(struct pool));
+}
+
 void* mempool_alloc_tile(struct mempool *mp) {
         size_t i;
 
@@ -54,7 +58,7 @@ void* mempool_alloc_tile(struct mempool *mp) {
 
         i = mp->first_pool->n_used++;
 
-        return ((uint8_t*) mp->first_pool) + ALIGN(sizeof(struct pool)) + i*mp->tile_size;
+        return (uint8_t*) pool_ptr(mp->first_pool) + i*mp->tile_size;
 }
 
 void* mempool_alloc0_tile(struct mempool *mp) {