diff options
| author | Russell Bryant <russell@russellbryant.com> | 2011-05-03 20:45:32 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2011-05-03 20:45:32 +0000 |
| commit | 37aa52fd78996b5c516ff4c851b60252eda84b05 (patch) | |
| tree | e1651180838e594a0203f863f3cdd084860e1bf5 /main/audiohook.c | |
| parent | 810b9c887949fc4bd9f01dcdc0d3a4f476cb00de (diff) | |
Merged revisions 316265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r316265 | russell | 2011-05-03 14:55:49 -0500 (Tue, 03 May 2011) | 5 lines
Fix a bunch of compiler warnings generated by gcc 4.6.0.
Most of these are -Wunused-but-set-variable, but there were a few others
mixed in here, as well.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316293 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/audiohook.c')
| -rw-r--r-- | main/audiohook.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/main/audiohook.c b/main/audiohook.c index a1d658ce7..83fec318f 100644 --- a/main/audiohook.c +++ b/main/audiohook.c @@ -944,28 +944,25 @@ int ast_channel_audiohook_count_by_source(struct ast_channel *chan, const char * switch (type) { case AST_AUDIOHOOK_TYPE_SPY: - AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->audiohooks->spy_list, ah, list) { + AST_LIST_TRAVERSE(&chan->audiohooks->spy_list, ah, list) { if (!strcmp(ah->source, source)) { count++; } } - AST_LIST_TRAVERSE_SAFE_END; break; case AST_AUDIOHOOK_TYPE_WHISPER: - AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->audiohooks->whisper_list, ah, list) { + AST_LIST_TRAVERSE(&chan->audiohooks->whisper_list, ah, list) { if (!strcmp(ah->source, source)) { count++; } } - AST_LIST_TRAVERSE_SAFE_END; break; case AST_AUDIOHOOK_TYPE_MANIPULATE: - AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->audiohooks->manipulate_list, ah, list) { + AST_LIST_TRAVERSE(&chan->audiohooks->manipulate_list, ah, list) { if (!strcmp(ah->source, source)) { count++; } } - AST_LIST_TRAVERSE_SAFE_END; break; default: ast_debug(1, "Invalid audiohook type supplied, (%d)\n", type); @@ -985,25 +982,22 @@ int ast_channel_audiohook_count_by_source_running(struct ast_channel *chan, cons switch (type) { case AST_AUDIOHOOK_TYPE_SPY: - AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->audiohooks->spy_list, ah, list) { + AST_LIST_TRAVERSE(&chan->audiohooks->spy_list, ah, list) { if ((!strcmp(ah->source, source)) && (ah->status == AST_AUDIOHOOK_STATUS_RUNNING)) count++; } - AST_LIST_TRAVERSE_SAFE_END; break; case AST_AUDIOHOOK_TYPE_WHISPER: - AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->audiohooks->whisper_list, ah, list) { + AST_LIST_TRAVERSE(&chan->audiohooks->whisper_list, ah, list) { if ((!strcmp(ah->source, source)) && (ah->status == AST_AUDIOHOOK_STATUS_RUNNING)) count++; } - AST_LIST_TRAVERSE_SAFE_END; break; case AST_AUDIOHOOK_TYPE_MANIPULATE: - AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->audiohooks->manipulate_list, ah, list) { + AST_LIST_TRAVERSE(&chan->audiohooks->manipulate_list, ah, list) { if ((!strcmp(ah->source, source)) && (ah->status == AST_AUDIOHOOK_STATUS_RUNNING)) count++; } - AST_LIST_TRAVERSE_SAFE_END; break; default: ast_debug(1, "Invalid audiohook type supplied, (%d)\n", type); |