kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_stasis_device_state.c: Optimize stasis_app_device_states_to_json()

Browse Source 
* Eliminate RAII_VAR()
* Replace looped alloca with a char[] since that is how it is used anyway.

Change-Id: Ia27e64a884afa0f50b9ffdb1cf23da6bfa51ffdf
This commit is contained in:
Richard Mudgett
2017-11-01 18:04:31 -05:00
parent 543d8ee388
commit 4ea61eef94
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/res_stasis_device_state.c
View File

@@ -170,22 +170,22 @@ struct ast_json *stasis_app_device_state_to_json(
struct ast_json *stasis_app_device_states_to_json(void)
{
struct ast_json *array = ast_json_array_create();
RAII_VAR(struct ast_db_entry *, tree,
ast_db_gettree(DEVICE_STATE_FAMILY, NULL), ast_db_freetree);
struct ast_db_entry *tree;
struct ast_db_entry *entry;
tree = ast_db_gettree(DEVICE_STATE_FAMILY, NULL);
for (entry = tree; entry; entry = entry->next) {
const char *name = strrchr(entry->key, '/');
if (!ast_strlen_zero(name)) {
struct ast_str *device = ast_str_alloca(DEVICE_STATE_SIZE);
ast_str_set(&device, 0, "%s%s",
DEVICE_STATE_SCHEME_STASIS, ++name);
ast_json_array_append(
array, stasis_app_device_state_to_json(
ast_str_buffer(device),
ast_device_state(ast_str_buffer(device))));
char device[DEVICE_STATE_SIZE];
snprintf(device, sizeof(device), "%s%s", DEVICE_STATE_SCHEME_STASIS, ++name);
ast_json_array_append(array,
stasis_app_device_state_to_json(device, ast_device_state(device)));
}
}
ast_db_freetree(tree);
return array;
}
@@ -293,7 +293,7 @@ static void populate_cache(void)
static enum ast_device_state stasis_device_state_cb(const char *data)
{
char buf[DEVICE_STATE_SIZE] = "";
char buf[DEVICE_STATE_SIZE];
ast_db_get(DEVICE_STATE_FAMILY, data, buf, sizeof(buf));