diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-05-10 15:30:59 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-05-10 15:30:59 +0000 |
| commit | 932c5c7fd73c36dc1bc5e056b025b4a57861fbf8 (patch) | |
| tree | 01d5ec67b53cac9f9d0ca913019fc14cc5d220fd | |
| parent | e0f0f4b4a430858766e599354ef51b60019f8658 (diff) | |
use the channel lock wrappers (issue #7120, Mithraen)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@26528 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | apps/app_chanspy.c | 8 | ||||
| -rw-r--r-- | apps/app_sendtext.c | 6 | ||||
| -rw-r--r-- | funcs/func_channel.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 8c8f5d475..20512f4db 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -198,9 +198,9 @@ static int start_spying(struct ast_channel *chan, struct ast_channel *spychan, s ast_log(LOG_NOTICE, "Attaching %s to %s\n", spychan->name, chan->name); - ast_mutex_lock(&chan->lock); + ast_channel_lock(chan); res = ast_channel_spy_add(chan, spy); - ast_mutex_unlock(&chan->lock); + ast_channel_unlock(chan); if (!res && ast_test_flag(chan, AST_FLAG_NBRIDGE) && (peer = ast_bridged_channel(chan))) { ast_softhangup(peer, AST_SOFTHANGUP_UNBRIDGE); @@ -219,9 +219,9 @@ static void stop_spying(struct ast_channel *chan, struct ast_channel_spy *spy) if (!chan) return; - ast_mutex_lock(&chan->lock); + ast_channel_lock(chan); ast_channel_spy_remove(chan, spy); - ast_mutex_unlock(&chan->lock); + ast_channel_unlock(chan); }; /* Map 'volume' levels from -4 through +4 into diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c index 248c559bc..e9bdfe571 100644 --- a/apps/app_sendtext.c +++ b/apps/app_sendtext.c @@ -93,9 +93,9 @@ static int sendtext_exec(struct ast_channel *chan, void *data) priority_jump = 1; } - ast_mutex_lock(&chan->lock); + ast_channel_lock(chan); if (!chan->tech->send_text) { - ast_mutex_unlock(&chan->lock); + ast_channel_unlock(chan); /* Does not support transport */ if (priority_jump || ast_opt_priority_jumping) ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101); @@ -103,7 +103,7 @@ static int sendtext_exec(struct ast_channel *chan, void *data) return 0; } status = "FAILURE"; - ast_mutex_unlock(&chan->lock); + ast_channel_unlock(chan); res = ast_sendtext(chan, args.text); if (!res) status = "SUCCESS"; diff --git a/funcs/func_channel.c b/funcs/func_channel.c index 3fe5db240..a181fec4f 100644 --- a/funcs/func_channel.c +++ b/funcs/func_channel.c @@ -40,15 +40,15 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/stringfields.h" #define locked_copy_string(chan, dest, source, len) \ do { \ - ast_mutex_lock(&chan->lock); \ + ast_channel_lock(chan); \ ast_copy_string(dest, source, len); \ - ast_mutex_unlock(&chan->lock); \ + ast_channel_unlock(chan); \ } while (0) #define locked_string_field_set(chan, field, source) \ do { \ - ast_mutex_lock(&chan->lock); \ + ast_channel_lock(chan); \ ast_string_field_set(chan, field, source); \ - ast_mutex_unlock(&chan->lock); \ + ast_channel_unlock(chan); \ } while (0) static int func_channel_read(struct ast_channel *chan, char *function, |