apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Fuhrmann <stef...@apache.org>
Subject [PATCH] APR hash documentation
Date Thu, 10 Dec 2015 22:58:47 GMT
Hi there,

since 1.4.6, the hash implementation allows for
mismatching and custom hash functions when merging
hashes.  But the docstrings have not been updated.

-- Stefan^2.

[[[
Since 1.4.6, apr_hash_overlay and apr_hash_merge work with any combination
of hash functions.  Reflect that change in the documentation.

* include/apr_hash.h
   (apr_hash_overlay,
    apr_hash_merge): Update the docstrings.
]]]

[[[
Index: include/apr_hash.h
===================================================================
--- include/apr_hash.h	(revision 1577762)
+++ include/apr_hash.h	(working copy)
@@ -181,8 +181,7 @@ APR_DECLARE(void) apr_hash_clear(apr_has

  /**
   * Merge two hash tables into one new hash table. The values of the 
overlay
- * hash override the values of the base if both have the same key.  Both
- * hash tables must use the same hash function.
+ * hash override the values of the base if both have the same key.
   * @param p The pool to use for the new hash table
   * @param overlay The table to add to the initial table
   * @param base The table that represents the initial values of the new 
table
@@ -195,8 +194,7 @@ APR_DECLARE(apr_hash_t *) apr_hash_overl
  /**
   * Merge two hash tables into one new hash table. If the same key
   * is present in both tables, call the supplied merge function to
- * produce a merged value for the key in the new table.  Both
- * hash tables must use the same hash function.
+ * produce a merged value for the key in the new table.
   * @param p The pool to use for the new hash table
   * @param h1 The first of the tables to merge
   * @param h2 The second of the tables to merge
]]]

Mime
View raw message