X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/15f85b1f63435a659aeee44784a86bb34c5c43c2..707415d4fcd0f8fd7d5688268b94a17490ecfbc6:/lib/pool_alloc.c

diff --git a/lib/pool_alloc.c b/lib/pool_alloc.c
index 9eff5294..c282db60 100644
--- a/lib/pool_alloc.c
+++ b/lib/pool_alloc.c
@@ -17,10 +17,10 @@ struct alloc_pool
 	/* statistical data */
 	unsigned long		e_created;	/* extents created	*/
 	unsigned long		e_freed;	/* extents detroyed	*/
-	uint64			n_allocated;	/* calls to alloc	*/
-	uint64			n_freed;	/* calls to free	*/
-	uint64			b_allocated;	/* cum. bytes allocated	*/
-	uint64			b_freed;	/* cum. bytes freed	*/
+	int64			n_allocated;	/* calls to alloc	*/
+	int64			n_freed;	/* calls to free	*/
+	int64			b_allocated;	/* cum. bytes allocated	*/
+	int64			b_freed;	/* cum. bytes freed	*/
 };
 
 struct pool_extent
@@ -32,7 +32,16 @@ struct pool_extent
 	struct pool_extent	*next;
 };
 
-#define MINALIGN	(sizeof (void *))
+struct align_test {
+    void *foo;
+    int64 bar;
+};
+
+#define MINALIGN	offsetof(struct align_test, bar)
+
+/* Temporarily cast a void* var into a char* var when adding an offset (to
+ * keep some compilers from complaining about the pointer arithmetic). */
+#define PTR_ADD(b,o)	( (void*) ((char*)(b) + (o)) )
 
 alloc_pool_t
 pool_create(size_t size, size_t quantum,
@@ -129,14 +138,14 @@ pool_alloc(alloc_pool_t p, size_t len, char *bomb)
 
 		if (pool->flags & POOL_APPEND)
 		{
-			pool->live = start + free;
+			pool->live = PTR_ADD(start, free);
 		}
 		else if (!(pool->live = (struct pool_extent *) malloc(sizeof (struct pool_extent))))
 		{
 			goto bomb;
 		}
 		if (pool->flags & POOL_QALIGN && pool->quantum > 1
-		    && (sqew = (size_t)(start + free) % pool->quantum))
+		    && (sqew = (size_t)PTR_ADD(start, free) % pool->quantum))
 		{
 			bound  += sqew;
 			free -= sqew;
@@ -154,7 +163,7 @@ pool_alloc(alloc_pool_t p, size_t len, char *bomb)
 
 	pool->live->free -= len;
 
-	return pool->live->start + pool->live->free;
+	return PTR_ADD(pool->live->start, pool->live->free);
 
 bomb:
 	if (pool->bomb)
@@ -190,9 +199,9 @@ pool_free(alloc_pool_t p, size_t len, void *addr)
 	cur = pool->live;
 	if (cur
 	    && addr >= cur->start
-	    && addr < cur->start + pool->size)
+	    && addr < PTR_ADD(cur->start, pool->size))
 	{
-		if (addr == cur->start + cur->free)
+		if (addr == PTR_ADD(cur->start, cur->free))
 		{
 			if (pool->flags & POOL_CLEAR)
 				memset(addr, 0, len);
@@ -207,7 +216,7 @@ pool_free(alloc_pool_t p, size_t len, void *addr)
 			cur->free = pool->size;
 			cur->bound = 0;
 			if (pool->flags & POOL_QALIGN && pool->quantum > 1
-			    && (sqew = (size_t)(cur->start + cur->free) % pool->quantum))
+			    && (sqew = (size_t)PTR_ADD(cur->start, cur->free) % pool->quantum))
 			{
 				cur->bound += sqew;
 				cur->free -= sqew;
@@ -218,7 +227,7 @@ pool_free(alloc_pool_t p, size_t len, void *addr)
 	for (prev = NULL, cur = pool->free; cur; prev = cur, cur = cur->next)
 	{
 		if (addr >= cur->start
-		    && addr < cur->start + pool->size)
+		    && addr < PTR_ADD(cur->start, pool->size))
 			break;
 	}
 	if (!cur)