kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 20:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 316265 via svnmerge from

Browse Source 
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
This commit is contained in:
Russell Bryant
2011-05-03 20:45:32 +00:00
parent 810b9c8879
commit 37aa52fd78
35 changed files with 69 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main/audiohook.c
View File

@@ -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);