Add table cloning (deep copy) convenience function named apr_table_clone().

The function copies all fields of the table, and makes copies of dynamically
allocated memory pointed to by the fields.


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

3 files changed, 28 insertions, 0 deletions

diff --git a/CHANGES b/CHANGES
index 33024acbd..7ada1238b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes for APR 1.3.0
 
+  *) Add table cloning (deep copy) convenience function.
+     [Davi Arnaut]
+
   *) Rework the WIN32 CV code to signal the condition only if one or
      more threads are blocked on the condition variable. If no threads
      are waiting on the condition variable, nothing happens. The change
diff --git a/include/apr_tables.h b/include/apr_tables.h
index 11213a549..a2f450ea8 100644
--- a/include/apr_tables.h
+++ b/include/apr_tables.h
@@ -232,6 +232,17 @@ APR_DECLARE(apr_table_t *) apr_table_copy(apr_pool_t *p,
                                           const apr_table_t *t);
 
 /**
+ * Create a new table whose contents are deep copied from the given
+ * table. A deep copy operation copies all fields, and makes copies
+ * of dynamically allocated memory pointed to by the fields.
+ * @param p The pool to allocate the new table out of
+ * @param t The table to clone
+ * @return A deep copy of the table passed in
+ */
+APR_DECLARE(apr_table_t *) apr_table_clone(apr_pool_t *p,
+                                           const apr_table_t *t);
+
+/**
  * Delete all of the elements from a table
  * @param t The table to clear
  */
diff --git a/tables/apr_tables.c b/tables/apr_tables.c
index 9a25e366e..51b23407c 100644
--- a/tables/apr_tables.c
+++ b/tables/apr_tables.c
@@ -423,6 +423,20 @@ APR_DECLARE(apr_table_t *) apr_table_copy(apr_pool_t *p, const apr_table_t *t)
     return new;
 }
 
+APR_DECLARE(apr_table_t *) apr_table_clone(apr_pool_t *p, const apr_table_t *t)
+{
+    const apr_array_header_t *array = apr_table_elts(t);
+    apr_table_entry_t *elts = (apr_table_entry_t *) array->elts;
+    apr_table_t *new = apr_table_make(p, array->nelts);
+    int i;
+
+    for (i = 0; i < array->nelts; i++) {
+        apr_table_add(new, elts[i].key, elts[i].val);
+    }
+
+    return new;
+}
+
 static void table_reindex(apr_table_t *t)
 {
     int i;