rename the structs struct tone_zone_sound and struct tone_zone

defined in indications.h to ind_tone_zone_sound and ind_tone_zone,
to avoid conflicts with the structs with the same names
defined in tonezone.h

Hope i haven't missed any instance.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48958 f38db490-d61c-443f-a65b-d21fe96a405b

3 files changed, 20 insertions, 20 deletions

diff --git a/main/app.c b/main/app.c
index 33c6bd57d..284400ad2 100644
--- a/main/app.c
+++ b/main/app.c
@@ -62,7 +62,7 @@ of 'maxlen' or 'size' minus the original strlen() of collect digits.
 */
 int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect, size_t size, int maxlen, int timeout) 
 {
-	struct tone_zone_sound *ts;
+	struct ind_tone_zone_sound *ts;
 	int res=0, x=0;
 
 	if (maxlen > size)
diff --git a/main/channel.c b/main/channel.c
index 3b06b266a..cb31be81a 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -2301,7 +2301,7 @@ int ast_indicate_data(struct ast_channel *chan, int condition, const void *data,
 		if (condition < 0)
 			ast_playtones_stop(chan);
 		else {
-			const struct tone_zone_sound *ts = NULL;
+			const struct ind_tone_zone_sound *ts = NULL;
 			switch (condition) {
 			case AST_CONTROL_RINGING:
 				ts = ast_get_indication_tone(chan->zone, "ring");
diff --git a/main/indications.c b/main/indications.c
index f51b4abd1..bd0e3bd54 100644
--- a/main/indications.c
+++ b/main/indications.c
@@ -337,12 +337,12 @@ void ast_playtones_stop(struct ast_channel *chan)
 
 /*--------------------------------------------*/
 
-static AST_RWLIST_HEAD_STATIC(tone_zones, tone_zone);
-static struct tone_zone *current_tonezone;
+static AST_RWLIST_HEAD_STATIC(tone_zones, ind_tone_zone);
+static struct ind_tone_zone *current_tonezone;
 
-struct tone_zone *ast_walk_indications(const struct tone_zone *cur)
+struct ind_tone_zone *ast_walk_indications(const struct ind_tone_zone *cur)
 {
-	struct tone_zone *tz = NULL;
+	struct ind_tone_zone *tz = NULL;
 
 	AST_RWLIST_RDLOCK(&tone_zones);
 	/* If cur is not NULL, then we have to iterate through - otherwise just return the first entry */
@@ -363,7 +363,7 @@ struct tone_zone *ast_walk_indications(const struct tone_zone *cur)
 /* Set global indication country */
 int ast_set_indication_country(const char *country)
 {
-	struct tone_zone *zone = NULL;
+	struct ind_tone_zone *zone = NULL;
 
 	/* If no country is specified or we are unable to find the zone, then return not found */
 	if (!country || !(zone = ast_get_indication_zone(country)))
@@ -382,9 +382,9 @@ int ast_set_indication_country(const char *country)
 }
 
 /* locate tone_zone, given the country. if country == NULL, use the default country */
-struct tone_zone *ast_get_indication_zone(const char *country)
+struct ind_tone_zone *ast_get_indication_zone(const char *country)
 {
-	struct tone_zone *tz = NULL;
+	struct ind_tone_zone *tz = NULL;
 	int alias_loop = 0;
 
 	AST_RWLIST_RDLOCK(&tone_zones);
@@ -418,9 +418,9 @@ struct tone_zone *ast_get_indication_zone(const char *country)
 }
 
 /* locate a tone_zone_sound, given the tone_zone. if tone_zone == NULL, use the default tone_zone */
-struct tone_zone_sound *ast_get_indication_tone(const struct tone_zone *zone, const char *indication)
+struct ind_tone_zone_sound *ast_get_indication_tone(const struct ind_tone_zone *zone, const char *indication)
 {
-	struct tone_zone_sound *ts = NULL;
+	struct ind_tone_zone_sound *ts = NULL;
 
 	AST_RWLIST_RDLOCK(&tone_zones);
 
@@ -447,10 +447,10 @@ struct tone_zone_sound *ast_get_indication_tone(const struct tone_zone *zone, co
 }
 
 /* helper function to delete a tone_zone in its entirety */
-static inline void free_zone(struct tone_zone* zone)
+static inline void free_zone(struct ind_tone_zone* zone)
 {
 	while (zone->tones) {
-		struct tone_zone_sound *tmp = zone->tones->next;
+		struct ind_tone_zone_sound *tmp = zone->tones->next;
 		free((void*)zone->tones->name);
 		free((void*)zone->tones->data);
 		free(zone->tones);
@@ -466,9 +466,9 @@ static inline void free_zone(struct tone_zone* zone)
 /*--------------------------------------------*/
 
 /* add a new country, if country exists, it will be replaced. */
-int ast_register_indication_country(struct tone_zone *zone)
+int ast_register_indication_country(struct ind_tone_zone *zone)
 {
-	struct tone_zone *tz = NULL;
+	struct ind_tone_zone *tz = NULL;
 
 	AST_RWLIST_WRLOCK(&tone_zones);
 	AST_RWLIST_TRAVERSE_SAFE_BEGIN(&tone_zones, tz, list) {
@@ -502,7 +502,7 @@ int ast_register_indication_country(struct tone_zone *zone)
  * Also, all countries which are an alias for the specified country are removed. */
 int ast_unregister_indication_country(const char *country)
 {
-	struct tone_zone *tz = NULL;
+	struct ind_tone_zone *tz = NULL;
 	int res = -1;
 
 	AST_RWLIST_WRLOCK(&tone_zones);
@@ -529,9 +529,9 @@ int ast_unregister_indication_country(const char *country)
 
 /* add a new indication to a tone_zone. tone_zone must exist. if the indication already
  * exists, it will be replaced. */
-int ast_register_indication(struct tone_zone *zone, const char *indication, const char *tonelist)
+int ast_register_indication(struct ind_tone_zone *zone, const char *indication, const char *tonelist)
 {
-	struct tone_zone_sound *ts, *ps;
+	struct ind_tone_zone_sound *ts, *ps;
 
 	/* is it an alias? stop */
 	if (zone->alias[0])
@@ -567,9 +567,9 @@ int ast_register_indication(struct tone_zone *zone, const char *indication, cons
 }
 
 /* remove an existing country's indication. Both country and indication must exist */
-int ast_unregister_indication(struct tone_zone *zone, const char *indication)
+int ast_unregister_indication(struct ind_tone_zone *zone, const char *indication)
 {
-	struct tone_zone_sound *ts,*ps = NULL, *tmp;
+	struct ind_tone_zone_sound *ts,*ps = NULL, *tmp;
 	int res = -1;
 
 	/* is it an alias? stop */