Sing, "we are apr"... and make all hash functions accept apr_ssize_t

  if we are going to bury -1 flags (I'd prefer the flag cast to apr_size_t
  and use that value throughout the hash api, however.)


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61649 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 8 insertions, 7 deletions

diff --git a/tables/apr_hash.c b/tables/apr_hash.c
index 4da402016..36409e354 100644
--- a/tables/apr_hash.c
+++ b/tables/apr_hash.c
@@ -86,7 +86,7 @@ struct apr_hash_entry_t {
     apr_hash_entry_t	*next;
     int			 hash;
     const void		*key;
-    apr_size_t		 klen;
+    apr_ssize_t		 klen;
     const void		*val;
 };
 
@@ -168,7 +168,7 @@ APR_DECLARE(apr_hash_index_t *) apr_hash_first(apr_hash_t *ht)
 
 APR_DECLARE(void) apr_hash_this(apr_hash_index_t *hi,
 			       const void **key,
-			       apr_size_t *klen,
+			       apr_ssize_t *klen,
 			       void **val)
 {
     if (key)  *key  = hi->this->key;
@@ -209,14 +209,14 @@ static void expand_array(apr_hash_t *ht)
  */
 
 static apr_hash_entry_t **find_entry(apr_hash_t *ht,
-				    const void *key,
-				    apr_ssize_t klen,
-				    const void *val)
+				     const void *key,
+				     apr_ssize_t klen,
+				     const void *val)
 {
     apr_hash_entry_t **hep, *he;
     const unsigned char *p;
     int hash;
-    int i;
+    apr_ssize_t i;
 
     if (klen == APR_HASH_KEY_STRING)
 	klen = strlen(key);
diff --git a/tables/apr_tables.c b/tables/apr_tables.c
index ef6bc17e2..b2cf518db 100644
--- a/tables/apr_tables.c
+++ b/tables/apr_tables.c
@@ -221,7 +221,8 @@ APR_DECLARE(char *) apr_array_pstrcat(apr_pool_t *p,
 				     const char sep)
 {
     char *cp, *res, **strpp;
-    int i, len;
+    apr_size_t len;
+    int i;
 
     if (arr->nelts <= 0 || arr->elts == NULL) {    /* Empty table? */
         return (char *) apr_pcalloc(p, 1);