[svn-commits] rmudgett: branch 13 r420837 - in /branches/13: ./ res/stasis/command.c
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Aug 11 15:53:50 CDT 2014
Author: rmudgett
Date: Mon Aug 11 15:53:44 2014
New Revision: 420837
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=420837
Log:
res/stasis/command.c: Fix recent commit using spaces instead of tabs.
........
Merged revisions 420836 from http://svn.asterisk.org/svn/asterisk/branches/12
Modified:
branches/13/ (props changed)
branches/13/res/stasis/command.c
Propchange: branches/13/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.
Modified: branches/13/res/stasis/command.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/res/stasis/command.c?view=diff&rev=420837&r1=420836&r2=420837
==============================================================================
--- branches/13/res/stasis/command.c (original)
+++ branches/13/res/stasis/command.c Mon Aug 11 15:53:44 2014
@@ -100,8 +100,8 @@
}
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 @@
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 @@
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;
}
More information about the svn-commits
mailing list