diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-10 03:56:37 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-10 03:56:37 +0000 |
commit | 8171f30e10fdbded326179d2dc3e3db0e979077f (patch) | |
tree | 110e32ced45d265536e6557ff2752f2366fefb26 /main | |
parent | 58d560b99447624b2d7ccce9a6197e64fedd7776 (diff) |
Merged revisions 187599 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r187599 | tilghman | 2009-04-09 22:55:27 -0500 (Thu, 09 Apr 2009) | 2 lines
Modify headers and macros, according to Russell's suggestions on the -dev list
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@187600 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/app.c | 2 | ||||
-rw-r--r-- | main/audiohook.c | 6 | ||||
-rw-r--r-- | main/channel.c | 2 | ||||
-rw-r--r-- | main/features.c | 2 | ||||
-rw-r--r-- | main/http.c | 2 | ||||
-rw-r--r-- | main/manager.c | 2 | ||||
-rw-r--r-- | main/pbx.c | 6 |
7 files changed, 11 insertions, 11 deletions
diff --git a/main/app.c b/main/app.c index 8528ab53a..7e65d9568 100644 --- a/main/app.c +++ b/main/app.c @@ -1033,7 +1033,7 @@ int ast_app_group_update(struct ast_channel *old, struct ast_channel *new) ast_free(gi); } } - AST_RWLIST_TRAVERSE_SAFE_END + AST_RWLIST_TRAVERSE_SAFE_END; AST_RWLIST_UNLOCK(&groups); return 0; diff --git a/main/audiohook.c b/main/audiohook.c index baf370dc7..6f6e08b3a 100644 --- a/main/audiohook.c +++ b/main/audiohook.c @@ -592,7 +592,7 @@ static struct ast_frame *audio_audiohook_write_list(struct ast_channel *chan, st ast_audiohook_write_frame(audiohook, direction, middle_frame); ast_audiohook_unlock(audiohook); } - AST_LIST_TRAVERSE_SAFE_END + AST_LIST_TRAVERSE_SAFE_END; /* If this frame is being written out to the channel then we need to use whisper sources */ if (direction == AST_AUDIOHOOK_DIRECTION_WRITE && !AST_LIST_EMPTY(&audiohook_list->whisper_list)) { @@ -615,7 +615,7 @@ static struct ast_frame *audio_audiohook_write_list(struct ast_channel *chan, st } ast_audiohook_unlock(audiohook); } - AST_LIST_TRAVERSE_SAFE_END + AST_LIST_TRAVERSE_SAFE_END; /* We take all of the combined whisper sources and combine them into the audio being written out */ for (i = 0, data1 = middle_frame->data.ptr, data2 = combine_buf; i < samples; i++, data1++, data2++) ast_slinear_saturated_add(data1, data2); @@ -638,7 +638,7 @@ static struct ast_frame *audio_audiohook_write_list(struct ast_channel *chan, st audiohook->manipulate_callback(audiohook, chan, middle_frame, direction); ast_audiohook_unlock(audiohook); } - AST_LIST_TRAVERSE_SAFE_END + AST_LIST_TRAVERSE_SAFE_END; end_frame = middle_frame; } diff --git a/main/channel.c b/main/channel.c index ff9c68f60..3a19ee6f5 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2623,7 +2623,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) AST_LIST_REMOVE_CURRENT(frame_list); break; } - AST_LIST_TRAVERSE_SAFE_END + AST_LIST_TRAVERSE_SAFE_END; if (!f) { /* There were no acceptable frames on the readq. */ diff --git a/main/features.c b/main/features.c index e0461dbb1..cfa3fb03d 100644 --- a/main/features.c +++ b/main/features.c @@ -3260,7 +3260,7 @@ static int park_exec_full(struct ast_channel *chan, void *data, struct ast_parki break; } } - AST_LIST_TRAVERSE_SAFE_END + AST_LIST_TRAVERSE_SAFE_END; AST_LIST_UNLOCK(&parkinglot->parkings); if (pu) { diff --git a/main/http.c b/main/http.c index 6dea2fed6..c520560ac 100644 --- a/main/http.c +++ b/main/http.c @@ -399,7 +399,7 @@ void ast_http_uri_unlink_all_with_key(const char *key) ast_free(urih); } } - AST_RWLIST_TRAVERSE_SAFE_END + AST_RWLIST_TRAVERSE_SAFE_END; AST_RWLIST_UNLOCK(&uris); } diff --git a/main/manager.c b/main/manager.c index eb7e43f5f..6008e89a7 100644 --- a/main/manager.c +++ b/main/manager.c @@ -3352,7 +3352,7 @@ int ast_manager_unregister(char *action) break; } } - AST_RWLIST_TRAVERSE_SAFE_END + AST_RWLIST_TRAVERSE_SAFE_END; AST_RWLIST_UNLOCK(&actions); return 0; diff --git a/main/pbx.c b/main/pbx.c index 04cc14803..b4f6599d9 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -3473,7 +3473,7 @@ int ast_extension_state_del(int id, ast_state_cb_type callback) break; } } - AST_LIST_TRAVERSE_SAFE_END + AST_LIST_TRAVERSE_SAFE_END; } else { /* callback with extension, find the callback based on ID */ struct ast_hint *hint; AST_RWLIST_TRAVERSE(&hints, hint, list) { @@ -3483,7 +3483,7 @@ int ast_extension_state_del(int id, ast_state_cb_type callback) break; } } - AST_LIST_TRAVERSE_SAFE_END + AST_LIST_TRAVERSE_SAFE_END; if (p_cur) break; @@ -7726,7 +7726,7 @@ void __ast_context_destroy(struct ast_context *list, struct ast_hashtab *context ast_free(sw); } } - AST_LIST_TRAVERSE_SAFE_END + AST_LIST_TRAVERSE_SAFE_END; if (tmp->root_table) { /* it is entirely possible that the context is EMPTY */ exten_iter = ast_hashtab_start_traversal(tmp->root_table); |