Author: rmudgett Date: Mon Aug 11 16:04:21 2014 New Revision: 420838 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=420838 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 ........ Merged revisions 420837 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/res/stasis/command.c Propchange: trunk/ ------------------------------------------------------------------------------ --- branch-13-merged (original) +++ branch-13-merged Mon Aug 11 16:04:21 2014 @@ -1,1 +1,1 @@ -/branches/13:1-420494,420514,420534,420536,420538,420562,420577,420592,420609,420624,420639,420657,420717,420742,420758,420779,420796,420803,420808 +/branches/13:1-420494,420514,420534,420536,420538,420562,420577,420592,420609,420624,420639,420657,420717,420742,420758,420779,420796,420803,420808,420837 Modified: trunk/res/stasis/command.c URL: http://svnview.digium.com/svn/asterisk/trunk/res/stasis/command.c?view=diff&rev=420838&r1=420837&r2=420838 ============================================================================== --- trunk/res/stasis/command.c (original) +++ trunk/res/stasis/command.c Mon Aug 11 16:04:21 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; } -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
