diff options
author | peter <peter@FreeBSD.org> | 2014-05-27 07:15:14 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2014-05-27 07:15:14 +0000 |
commit | 073d039ce1755179ade6d76571f16045ade34213 (patch) | |
tree | 0e023fb89b7a7e9a4fa11cfb7d9118a7510d2640 /contrib/apr/tables/apr_hash.c | |
parent | c5be37fb1f34d0c40f8f70140824b785f414c4da (diff) | |
parent | ca02a2bfd2f08739388e00fb3bbe93fa3fa5efb0 (diff) | |
download | FreeBSD-src-073d039ce1755179ade6d76571f16045ade34213.zip FreeBSD-src-073d039ce1755179ade6d76571f16045ade34213.tar.gz |
Merge apr-1.4.8 -> apr-1.5.1 and update.
Diffstat (limited to 'contrib/apr/tables/apr_hash.c')
-rw-r--r-- | contrib/apr/tables/apr_hash.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/contrib/apr/tables/apr_hash.c b/contrib/apr/tables/apr_hash.c index a6e8a64..0bf4d28c 100644 --- a/contrib/apr/tables/apr_hash.c +++ b/contrib/apr/tables/apr_hash.c @@ -162,6 +162,29 @@ APR_DECLARE(void) apr_hash_this(apr_hash_index_t *hi, if (val) *val = (void *)hi->this->val; } +APR_DECLARE(const void *) apr_hash_this_key(apr_hash_index_t *hi) +{ + const void *key; + + apr_hash_this(hi, &key, NULL, NULL); + return key; +} + +APR_DECLARE(apr_ssize_t) apr_hash_this_key_len(apr_hash_index_t *hi) +{ + apr_ssize_t klen; + + apr_hash_this(hi, NULL, &klen, NULL); + return klen; +} + +APR_DECLARE(void *) apr_hash_this_val(apr_hash_index_t *hi) +{ + void *val; + + apr_hash_this(hi, NULL, NULL, &val); + return val; +} /* * Expanding a hash table |