diff options
author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2002-09-29 16:21:52 +0000 |
---|---|---|
committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2002-09-29 16:21:52 +0000 |
commit | 6cc3a070f33cf2444afae604c296afcba5f5f3f9 (patch) | |
tree | 9b341ea41a2662b0d38f8b82fef9cdb33c45ac9f /memory | |
parent | cf79e4cf0ae5b127521e8f9425e6729259ed6dfd (diff) | |
download | libapr-6cc3a070f33cf2444afae604c296afcba5f5f3f9.tar.gz |
Patch a compilation signedness emit... the difference of the memory ptrs
resulted in a ssize_t rather than the size_t we are comparing to. Change
to addition and all is well.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63887 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'memory')
-rw-r--r-- | memory/unix/apr_pools.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c index 059af143a..9fe5bcc17 100644 --- a/memory/unix/apr_pools.c +++ b/memory/unix/apr_pools.c @@ -612,7 +612,7 @@ APR_DECLARE(void *) apr_palloc(apr_pool_t *pool, apr_size_t size) active = pool->active; /* If the active node has enough bytes left, use it. */ - if (size < active->endp - active->first_avail) { + if (active->first_avail + size < active->endp) { mem = active->first_avail; active->first_avail += size; @@ -620,7 +620,7 @@ APR_DECLARE(void *) apr_palloc(apr_pool_t *pool, apr_size_t size) } node = active->next; - if (size < node->endp - node->first_avail) { + if (node->first_avail + size < node->endp) { *node->ref = node->next; node->next->ref = node->ref; } @@ -925,7 +925,7 @@ static int psprintf_flush(apr_vformatter_buff_t *vbuff) size = APR_PSPRINTF_MIN_STRINGSIZE; node = active->next; - if (!ps->got_a_new_node && size < node->endp - node->first_avail) { + if (!ps->got_a_new_node && (node->first_avail + size < node->endp)) { *node->ref = node->next; node->next->ref = node->ref; |