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.2@187601 f38db490-d61c-443f-a65b-d21fe96a405b

8 files changed, 12 insertions, 12 deletions

diff --git a/main/app.c b/main/app.c
index 7b79915ea..b94657b4c 100644
--- a/main/app.c
+++ b/main/app.c
@@ -1104,7 +1104,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/bridging.c b/main/bridging.c
index 4306680d6..815623e59 100644
--- a/main/bridging.c
+++ b/main/bridging.c
@@ -108,7 +108,7 @@ int ast_bridge_technology_unregister(struct ast_bridge_technology *technology)
 			break;
 		}
 	}
-	AST_RWLIST_TRAVERSE_SAFE_END
+	AST_RWLIST_TRAVERSE_SAFE_END;
 
 	AST_RWLIST_UNLOCK(&bridge_technologies);
 
diff --git a/main/channel.c b/main/channel.c
index 427b14058..1df51e8ee 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -2650,7 +2650,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 91d90fe3a..0e44273b8 100644
--- a/main/features.c
+++ b/main/features.c
@@ -3297,7 +3297,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 934eaf011..011c0893d 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 0773dde5c..0446ac09b 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -3364,7 +3364,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 2a1c9393d..f60801d4f 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -3967,7 +3967,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) {
@@ -3977,7 +3977,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;
@@ -8279,7 +8279,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);