apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Joe Orton <jor...@redhat.com>
Subject Re: cvs commit: apr/test testhash.c
Date Mon, 19 Apr 2004 08:58:24 GMT
This broke apr_hash_{merge,overlay}; I've checked in a minimal fix to
stop httpd segfaulting everywhere, but presumable it needs a doc string
update as below, unless behaviour for merging two hash tables with
different hash functions can be defined:

--- include/apr_hash.h	18 Apr 2004 12:12:49 -0000	1.42
+++ include/apr_hash.h	19 Apr 2004 08:56:02 -0000
@@ -173,7 +173,8 @@
 
 /**
  * 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.
+ * hash override the values of the base if both have the same key.  Both
+ * hash tables must use the same hash function.
  * @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
@@ -186,7 +187,8 @@
 /**
  * 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.
+ * produce a merged value for the key in the new table.  Both
+ * hash tables must use the same hash function.
  * @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