Axe the 'pool' arg from apr_json_array_add() since it's not needed.

(Reinstated from 1839755)


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

3 files changed, 4 insertions, 5 deletions

diff --git a/include/apr_json.h b/include/apr_json.h
index 06ec58ebf..c05f6704c 100644
--- a/include/apr_json.h
+++ b/include/apr_json.h
@@ -325,13 +325,12 @@ APR_DECLARE(apr_json_kv_t *) apr_json_object_next(apr_json_value_t *obj,
  * Add the value to the end of this array.
  * @param arr The JSON array.
  * @param val Value to add to the array.
- * @param pool Pool to use.
  * @return APR_SUCCESS on success, APR_EINVAL if the array value is not
  *   an APR_JSON_ARRAY.
  */
 APR_DECLARE(apr_status_t) apr_json_array_add(apr_json_value_t *arr,
-        apr_json_value_t *val, apr_pool_t *pool)
-        __attribute__((nonnull(1, 2, 3)));
+        apr_json_value_t *val)
+        __attribute__((nonnull(1, 2)));
 
 /**
  * Look up the value associated with a key in a JSON object.
diff --git a/json/apr_json.c b/json/apr_json.c
index b8b55fc9a..ad4281cc2 100644
--- a/json/apr_json.c
+++ b/json/apr_json.c
@@ -213,7 +213,7 @@ apr_json_kv_t *apr_json_object_next(apr_json_value_t *obj, apr_json_kv_t *kv)
 }
 
 apr_status_t apr_json_array_add(apr_json_value_t *arr,
-        apr_json_value_t *val, apr_pool_t *pool)
+        apr_json_value_t *val)
 {
     apr_array_header_t *array;
 
diff --git a/json/apr_json_decode.c b/json/apr_json_decode.c
index e8d44013b..c790d6fdc 100644
--- a/json/apr_json_decode.c
+++ b/json/apr_json_decode.c
@@ -391,7 +391,7 @@ static apr_status_t apr_json_decode_array(apr_json_scanner_t * self,
         }
 
         if (APR_SUCCESS
-                != (status = apr_json_array_add(array, element, self->pool))) {
+                != (status = apr_json_array_add(array, element))) {
             return status;
         }