diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-07-25 04:06:32 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-07-25 04:06:32 +0000 |
| commit | cafc1158961f28ad54ebcdc5e042bf8094cbc620 (patch) | |
| tree | 2e54d30ea5d8db7e007ff5c653c5acd4ed3fb649 /channels/chan_misdn.c | |
| parent | 9d8a5ceb02f6559940bd94aaf163a544ce6e6f4c (diff) | |
A great big renaming patch
This patch renames the bridging* files to bridge*. This may seem pedantic
and silly, but it fits better in line with current Asterisk naming conventions:
* channel is not "channeling"
* monitor is not "monitoring"
etc.
A bridge is an object. It is a first class citizen in Asterisk. "Bridging" is
the act of using a bridge on a set of channels - and the API that fulfills that
role is more than just the action.
(closes issue ASTERISK-22130)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_misdn.c')
| -rw-r--r-- | channels/chan_misdn.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 65116a5a9..34a134eb4 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -103,7 +103,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/format.h" #include "asterisk/format_cap.h" #include "asterisk/features_config.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "chan_misdn_config.h" #include "isdn_lib.h" @@ -10192,7 +10192,7 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data) struct ast_format_cap *cap = ast_format_cap_alloc_nolock(); struct ast_format tmpfmt; if (!(cap)) { - return RESPONSE_ERR; + return RESPONSE_ERR; } ast_format_cap_add(cap, ast_format_set(&tmpfmt, AST_FORMAT_ALAW, 0)); chan = misdn_new(ch, AST_STATE_RESERVED, bc->dialed.number, bc->caller.number, cap, NULL, bc->port, bc->channel); @@ -11277,8 +11277,8 @@ static int unload_module(void) * Module loading including tests for configuration or dependencies. * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE, * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails - * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the - * configuration file or other non-critical problem return + * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the + * configuration file or other non-critical problem return * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS. */ static int load_module(void) |