[asterisk-commits] russell: trunk r309491 - /trunk/channels/chan_nbs.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Mar 4 11:40:05 CST 2011
Author: russell
Date: Fri Mar 4 11:40:02 2011
New Revision: 309491
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=309491
Log:
Fix a buglet that prevented chan_nbs from loading (and subsequently stopped Asterisk).
In passing, convert the return codes to be the proper AST_MODULE_LOAD_* constants.
Modified:
trunk/channels/chan_nbs.c
Modified: trunk/channels/chan_nbs.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_nbs.c?view=diff&rev=309491&r1=309490&r2=309491
==============================================================================
--- trunk/channels/chan_nbs.c (original)
+++ trunk/channels/chan_nbs.c Fri Mar 4 11:40:02 2011
@@ -280,16 +280,16 @@
static int load_module(void)
{
ast_format_set(&prefformat, AST_FORMAT_SLINEAR, 0);
- if (!(nbs_tech.capabilities == ast_format_cap_alloc())) {
- return -1;
+ if (!(nbs_tech.capabilities = ast_format_cap_alloc())) {
+ return AST_MODULE_LOAD_FAILURE;
}
ast_format_cap_add(nbs_tech.capabilities, &prefformat);
/* Make sure we can register our channel type */
if (ast_channel_register(&nbs_tech)) {
ast_log(LOG_ERROR, "Unable to register channel class %s\n", type);
- return -1;
- }
- return 0;
+ return AST_MODULE_LOAD_DECLINE;
+ }
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Network Broadcast Sound Support");
More information about the asterisk-commits
mailing list