gstein 01/01/11 00:37:52
Modified: include apr_hash.h
tables apr_hash.c
Log:
heh. there is a simpler way to do this...
Revision Changes Path
1.19 +3 -3 apr/include/apr_hash.h
Index: apr_hash.h
===================================================================
RCS file: /home/cvs/apr/include/apr_hash.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -u -r1.18 -r1.19
--- apr_hash.h 2001/01/11 00:13:22 1.18
+++ apr_hash.h 2001/01/11 08:37:45 1.19
@@ -174,12 +174,12 @@
apr_size_t *klen, void **val);
/**
- * Get the number of keys in the hash table.
+ * Get the number of key/value pairs in the hash table.
* @param ht The hash table
- * @param count Return pointer for the number of keys
+ * @return The number of key/value pairs in the hash table.
* @deffunc void apr_hash_count(apr_hash_t *ht, apr_size_t *count);
*/
-APR_DECLARE(void) apr_hash_count(apr_hash_t *ht, apr_size_t *count);
+APR_DECLARE(apr_size_t) apr_hash_count(apr_hash_t *ht);
#ifdef __cplusplus
1.11 +2 -2 apr/tables/apr_hash.c
Index: apr_hash.c
===================================================================
RCS file: /home/cvs/apr/tables/apr_hash.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- apr_hash.c 2001/01/11 00:13:23 1.10
+++ apr_hash.c 2001/01/11 08:37:50 1.11
@@ -315,7 +315,7 @@
/* else key not present and val==NULL */
}
-APR_DECLARE(void) apr_hash_count(apr_hash_t *ht, apr_size_t *count)
+APR_DECLARE(apr_size_t) apr_hash_count(apr_hash_t *ht)
{
- *count = ht->count;
+ return ht->count;
}