summaryrefslogtreecommitdiff
path: root/tables
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2005-05-16 21:49:49 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2005-05-16 21:49:49 +0000
commitfb265863cfc121d55f15ec84fbeea7e2c9695a4d (patch)
treecdc5b1ac497af80932ddbedac8e8a065c50bb5a7 /tables
parentfa2fde93154ca9e2e5b63fc6b288fef3880a1962 (diff)
downloadapr-fb265863cfc121d55f15ec84fbeea7e2c9695a4d.tar.gz
We play pointer math with local 'i', so it must be apr_size_t.
Until we decide otherwise, cast the pointer math result back to an int for a nelts result. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@170468 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'tables')
-rw-r--r--tables/apr_tables.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tables/apr_tables.c b/tables/apr_tables.c
index da17e2867..c1128c65d 100644
--- a/tables/apr_tables.c
+++ b/tables/apr_tables.c
@@ -970,7 +970,7 @@ static apr_table_entry_t **table_mergesort(apr_pool_t *pool,
*/
apr_table_entry_t **values_tmp =
(apr_table_entry_t **)apr_palloc(pool, n * sizeof(apr_table_entry_t*));
- int i;
+ apr_size_t i;
int blocksize;
/* First pass: sort pairs of elements (blocksize=1) */
@@ -1156,7 +1156,7 @@ APR_DECLARE(void) apr_table_compress(apr_table_t *t, unsigned flags)
*dst++ = *src;
}
} while (++src < last_elt);
- t->a.nelts -= (last_elt - dst);
+ t->a.nelts -= (int)(last_elt - dst);
}
table_reindex(t);