diff options
| author | Wayne Davison <wayned@samba.org> | 2007-05-29 02:47:23 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2007-05-29 02:47:23 +0000 |
| commit | 3fac8ca8d19177095763dfad82258b972fadedb8 (patch) | |
| tree | 5703ba71dd088dcdf211bf611b92d1361717f26e /lib/pool_alloc.c | |
| parent | 33766a8daa6bbd1812c03fd13f93856a14ff4f3c (diff) | |
| download | rsync-3fac8ca8d19177095763dfad82258b972fadedb8.tar.gz | |
Tweaked a variable and a label to make them less confusing.
Diffstat (limited to 'lib/pool_alloc.c')
| -rw-r--r-- | lib/pool_alloc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/pool_alloc.c b/lib/pool_alloc.c index fd9c239b..bc33003c 100644 --- a/lib/pool_alloc.c +++ b/lib/pool_alloc.c @@ -90,7 +90,7 @@ pool_destroy(alloc_pool_t p) } void * -pool_alloc(alloc_pool_t p, size_t len, const char *bomb) +pool_alloc(alloc_pool_t p, size_t len, const char *bomb_msg) { struct alloc_pool *pool = (struct alloc_pool *) p; if (!pool) @@ -102,7 +102,7 @@ pool_alloc(alloc_pool_t p, size_t len, const char *bomb) len += pool->quantum - len % pool->quantum; if (len > pool->size) - goto bomb; + goto bomb_out; if (!pool->live || len > pool->live->free) { void *start; @@ -125,7 +125,7 @@ pool_alloc(alloc_pool_t p, size_t len, const char *bomb) asize += sizeof (struct pool_extent); if (!(start = new_array(char, asize))) - goto bomb; + goto bomb_out; if (pool->flags & POOL_CLEAR) memset(start, 0, free); @@ -133,7 +133,7 @@ pool_alloc(alloc_pool_t p, size_t len, const char *bomb) if (pool->flags & POOL_APPEND) ext = PTR_ADD(start, free); else if (!(ext = new(struct pool_extent))) - goto bomb; + goto bomb_out; if (pool->flags & POOL_QALIGN && pool->quantum > 1 && (skew = (size_t)PTR_ADD(start, free) % pool->quantum)) { bound += skew; @@ -155,9 +155,9 @@ pool_alloc(alloc_pool_t p, size_t len, const char *bomb) return PTR_ADD(pool->live->start, pool->live->free); -bomb: + bomb_out: if (pool->bomb) - (*pool->bomb)(bomb); + (*pool->bomb)(bomb_msg); return NULL; } |