You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mi...@apache.org on 2018/09/01 10:50:58 UTC
svn commit: r1839818 - in /apr/apr-util/branches/1.7.x: include/apr_json.h
json/apr_json.c json/apr_json_decode.c
Author: minfrin
Date: Sat Sep 1 10:50:58 2018
New Revision: 1839818
URL: http://svn.apache.org/viewvc?rev=1839818&view=rev
Log:
Backport r1839817
Axe the 'pool' arg from apr_json_array_add() since it's not needed.
Modified:
apr/apr-util/branches/1.7.x/include/apr_json.h
apr/apr-util/branches/1.7.x/json/apr_json.c
apr/apr-util/branches/1.7.x/json/apr_json_decode.c
Modified: apr/apr-util/branches/1.7.x/include/apr_json.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/include/apr_json.h?rev=1839818&r1=1839817&r2=1839818&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/include/apr_json.h (original)
+++ apr/apr-util/branches/1.7.x/include/apr_json.h Sat Sep 1 10:50:58 2018
@@ -325,13 +325,12 @@ APU_DECLARE(apr_json_kv_t *) apr_json_ob
* 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.
*/
APU_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.
Modified: apr/apr-util/branches/1.7.x/json/apr_json.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/json/apr_json.c?rev=1839818&r1=1839817&r2=1839818&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/json/apr_json.c (original)
+++ apr/apr-util/branches/1.7.x/json/apr_json.c Sat Sep 1 10:50:58 2018
@@ -213,7 +213,7 @@ apr_json_kv_t *apr_json_object_next(apr_
}
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;
Modified: apr/apr-util/branches/1.7.x/json/apr_json_decode.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/json/apr_json_decode.c?rev=1839818&r1=1839817&r2=1839818&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/json/apr_json_decode.c (original)
+++ apr/apr-util/branches/1.7.x/json/apr_json_decode.c Sat Sep 1 10:50:58 2018
@@ -391,7 +391,7 @@ static apr_status_t apr_json_decode_arra
}
if (APR_SUCCESS
- != (status = apr_json_array_add(array, element, self->pool))) {
+ != (status = apr_json_array_add(array, element))) {
return status;
}