kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 11:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Blow away usage of libjansson's foreach macro

Browse Source 
While very handy, this macro didn't occur until a later version of libjansson.
We'd prefer to be compatible with older versions still - as such, iteration
over key/value pairs in a JSON object have to be done with a little bit more
manual work.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@391675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2013-06-13 18:14:38 +00:00
parent b51b437bf3
commit 1cb25deeba
3 changed files with 5 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/asterisk/json.h
View File

@@ -603,15 +603,6 @@ struct ast_json_iter *ast_json_object_iter_next(struct ast_json *object, struct
*/
const char *ast_json_object_iter_key(struct ast_json_iter *iter);
/*!
* \brief Retrieve the iterator object for a particular key
* \since 12.0.0
*
* \param key Key of the field the \c ast_json_iter points to
* \return \ref ast_json_iter object that points to \a key
*/
struct ast_json_iter *ast_json_object_key_to_iter(const char *key);
/*!
* \brief Get the value from an iterator.
* \since 12.0.0
@@ -639,23 +630,6 @@ struct ast_json *ast_json_object_iter_value(struct ast_json_iter *iter);
*/
int ast_json_object_iter_set(struct ast_json *object, struct ast_json_iter *iter, struct ast_json *value);
/*!
* \brief Iterate over key/value pairs
*
* \note This is a reproduction of the jansson library's \ref json_object_foreach
* using the equivalent ast_* wrapper functions. This creates a for loop using the various
* iteration function calls.
*
* \param object The \ref ast_json object that contains key/value tuples to iterate over
* \param key A \c const char pointer key for the key/value tuple
* \param value A \ref ast_json object for the key/value tuple
*/
#define ast_json_object_foreach(object, key, value) \
for (key = ast_json_object_iter_key(ast_json_object_iter(object)); \
key && (value = ast_json_object_iter_value(ast_json_object_key_to_iter(key))); \
key = ast_json_object_iter_key(ast_json_object_iter_next(object, ast_json_object_key_to_iter(key))))
/*!@}*/
/*!@{*/

4
main/json.c
View File

@@ -330,10 +330,6 @@ const char *ast_json_object_iter_key(struct ast_json_iter *iter)
{
return json_object_iter_key(iter);
}
struct ast_json_iter *ast_json_object_key_to_iter(const char *key)
{
return (struct ast_json_iter *)json_object_key_to_iter(key);
}
struct ast_json *ast_json_object_iter_value(struct ast_json_iter *iter)
{
return (struct ast_json *)json_object_iter_value(iter);

6
main/manager.c
View File

@@ -1278,12 +1278,16 @@ struct ast_str *ast_manager_str_from_json_object(struct ast_json *blob, key_excl
{
struct ast_str *output_str = ast_str_create(32);
struct ast_json *value;
struct ast_json_iter *iter;
const char *key;
if (!output_str) {
return NULL;
}
ast_json_object_foreach(blob, key, value) {
for (iter = ast_json_object_iter(blob); iter; iter = ast_json_object_iter_next(blob, iter)) {
key = ast_json_object_iter_key(iter);
value = ast_json_object_iter_value(iter);
if (exclusion_cb && exclusion_cb(key)) {
continue;
}