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/08/30 12:19:59 UTC
svn commit: r1839670 - /apr/apr/trunk/include/apr_json.h
Author: minfrin
Date: Thu Aug 30 12:19:59 2018
New Revision: 1839670
URL: http://svn.apache.org/viewvc?rev=1839670&view=rev
Log:
Clarify comments on apr_json functions.
Modified:
apr/apr/trunk/include/apr_json.h
Modified: apr/apr/trunk/include/apr_json.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_json.h?rev=1839670&r1=1839669&r2=1839670&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_json.h (original)
+++ apr/apr/trunk/include/apr_json.h Thu Aug 30 12:19:59 2018
@@ -252,7 +252,8 @@ APR_DECLARE(apr_json_value_t *)
/**
* Associate a value with a key in a JSON object.
* @param obj The JSON object.
- * @param key Pointer to the key string.
+ * @param key Pointer to the key string, including any whitespace
+ * required.
* @param val Value to associate with the key.
* @param pool Pool to use.
* @return APR_SUCCESS on success, APR_EINVAL if the key is
@@ -319,7 +320,7 @@ APR_DECLARE(apr_status_t) apr_json_encod
int flags, apr_pool_t * pool) __attribute__((nonnull(1, 4, 6)));
/**
- * Overlay one JSON object over a second JSON object.
+ * Overlay one JSON value over a second JSON value.
*
* If the values are objects, a new object will be returned containing
* all keys from the overlay superimposed on the base.
@@ -327,7 +328,8 @@ APR_DECLARE(apr_status_t) apr_json_encod
* Keys that appear in the overlay will replace keys in the base, unless
* APR_JSON_FLAGS_STRICT is specified, in which case NULL will be returned.
*
- * If the base is not an object, overlay will be returned.
+ * If either the base or the overlay are not objects, overlay will be
+ * returned.
* @param p pool to use
* @param overlay the JSON object to overlay on top of base. If NULL, the
* base will be returned.