diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2014-08-11 21:04:21 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2014-08-11 21:04:21 +0000 |
| commit | aba07a0f6e1d48d1487d97935638bddb12b92443 (patch) | |
| tree | 7379c504f655ff477eea39354c76b2b3e9ecf4c1 | |
| parent | ffccae8269a738d17da15fb76098298f6e778ced (diff) | |
res/stasis/command.c: Fix recent commit using spaces instead of tabs.
........
Merged revisions 420836 from http://svn.asterisk.org/svn/asterisk/branches/12
........
Merged revisions 420837 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@420838 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | res/stasis/command.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/res/stasis/command.c b/res/stasis/command.c index 867de180a..75a5c5aff 100644 --- a/res/stasis/command.c +++ b/res/stasis/command.c @@ -100,8 +100,8 @@ static void command_queue_prestart_destroy(void *obj) } static const struct ast_datastore_info command_queue_prestart = { - .type = "stasis-command-prestart-queue", - .destroy = command_queue_prestart_destroy, + .type = "stasis-command-prestart-queue", + .destroy = command_queue_prestart_destroy, }; int command_prestart_queue_command(struct ast_channel *chan, @@ -116,15 +116,14 @@ int command_prestart_queue_command(struct ast_channel *chan, return -1; } - datastore = ast_channel_datastore_find(chan, &command_queue_prestart, NULL); - if (datastore) { + datastore = ast_channel_datastore_find(chan, &command_queue_prestart, NULL); + if (datastore) { command_queue = datastore->data; ao2_link(command_queue, command); - return 0; - } + return 0; + } - command_queue = ao2_container_alloc_list( - AO2_ALLOC_OPT_LOCK_MUTEX, 0, NULL, NULL); + command_queue = ao2_container_alloc_list(AO2_ALLOC_OPT_LOCK_MUTEX, 0, NULL, NULL); if (!command_queue) { return -1; } @@ -144,7 +143,8 @@ int command_prestart_queue_command(struct ast_channel *chan, struct ao2_container *command_prestart_get_container(struct ast_channel *chan) { - struct ast_datastore *datastore = ast_channel_datastore_find(chan, &command_queue_prestart, NULL); + struct ast_datastore *datastore = ast_channel_datastore_find(chan, &command_queue_prestart, NULL); + if (!datastore) { return NULL; } |