From: Luigi Rizzo Date: Mon, 25 Dec 2006 06:38:09 +0000 (+0000) Subject: rename the structs struct tone_zone_sound and struct tone_zone X-Git-Tag: 1.6.0-beta1~3^2~3639 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09f75aa6dcb4aaaeee07a9e3d2823d10c17b2e0e;p=thirdparty%2Fasterisk.git 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: https://origsvn.digium.com/svn/asterisk/trunk@48958 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_disa.c b/apps/app_disa.c index 586640e67b..b536e5fb7d 100644 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -99,7 +99,7 @@ static char *descrip = static void play_dialtone(struct ast_channel *chan, char *mailbox) { - const struct tone_zone_sound *ts = NULL; + const struct ind_tone_zone_sound *ts = NULL; if(ast_app_has_voicemail(mailbox, NULL)) ts = ast_get_indication_tone(chan->zone, "dialrecall"); else diff --git a/apps/app_read.c b/apps/app_read.c index 6c4fe3ffa3..cde03c6375 100644 --- a/apps/app_read.c +++ b/apps/app_read.c @@ -93,7 +93,7 @@ static int read_exec(struct ast_channel *chan, void *data) int tries = 1, to = 0, x = 0; double tosec; char *argcopy = NULL; - struct tone_zone_sound *ts; + struct ind_tone_zone_sound *ts; struct ast_flags flags = {0}; AST_DECLARE_APP_ARGS(arglist, diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 74a6ce4e8b..9d2a0e9df6 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -205,7 +205,7 @@ struct chan_list { int other_pid; struct chan_list *other_ch; - const struct tone_zone_sound *ts; + const struct ind_tone_zone_sound *ts; int overlap_dial; int overlap_dial_task; @@ -2775,7 +2775,7 @@ static enum ast_bridge_result misdn_bridge (struct ast_channel *c0, static int dialtone_indicate(struct chan_list *cl) { - const struct tone_zone_sound *ts= NULL; + const struct ind_tone_zone_sound *ts= NULL; struct ast_channel *ast=cl->ast; diff --git a/contrib/utils/zones2indications.c b/contrib/utils/zones2indications.c index 186e53c9f5..645cd0ed53 100644 --- a/contrib/utils/zones2indications.c +++ b/contrib/utils/zones2indications.c @@ -27,7 +27,7 @@ #define PROGRAM "zones2indication" -void print_tone_zone_sound(struct tone_zone *zone_data, const char* name, +void print_tone_zone_sound(struct ind_tone_zone *zone_data, const char* name, int toneid) { int i; for (i=0; i size) diff --git a/main/channel.c b/main/channel.c index 3b06b266ad..cb31be81ab 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 f51b4abd13..bd0e3bd54c 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 */ diff --git a/res/res_indications.c b/res/res_indications.c index a4d8ae20e2..c0b1404c2f 100644 --- a/res/res_indications.c +++ b/res/res_indications.c @@ -85,7 +85,7 @@ char *playtones_desc= */ static int handle_add_indication(int fd, int argc, char *argv[]) { - struct tone_zone *tz; + struct ind_tone_zone *tz; int created_country = 0; if (argc != 5) return RESULT_SHOWUSAGE; @@ -119,7 +119,7 @@ static int handle_add_indication(int fd, int argc, char *argv[]) */ static int handle_remove_indication(int fd, int argc, char *argv[]) { - struct tone_zone *tz; + struct ind_tone_zone *tz; if (argc != 3 && argc != 4) return RESULT_SHOWUSAGE; if (argc == 3) { @@ -148,7 +148,7 @@ static int handle_remove_indication(int fd, int argc, char *argv[]) */ static int handle_show_indications(int fd, int argc, char *argv[]) { - struct tone_zone *tz = NULL; + struct ind_tone_zone *tz = NULL; char buf[256]; int found_country = 0; @@ -166,7 +166,7 @@ static int handle_show_indications(int fd, int argc, char *argv[]) for (i=2; icountry,argv[i])==0 && !tz->alias[0]) { - struct tone_zone_sound* ts; + struct ind_tone_zone_sound* ts; if (!found_country) { found_country = 1; ast_cli(fd,"Country Indication PlayList\n" @@ -196,7 +196,7 @@ static int handle_show_indications(int fd, int argc, char *argv[]) */ static int handle_playtones(struct ast_channel *chan, void *data) { - struct tone_zone_sound *ts; + struct ind_tone_zone_sound *ts; int res; if (!data || !((char*)data)[0]) { @@ -231,7 +231,7 @@ static int ind_load_module(void) struct ast_variable *v; char *cxt; char *c; - struct tone_zone *tones; + struct ind_tone_zone *tones; const char *country = NULL; /* that the following cast is needed, is yuk! */ @@ -284,7 +284,7 @@ static int ind_load_module(void) c = countries; country = strsep(&c,","); while (country) { - struct tone_zone* azone; + struct ind_tone_zone* azone; if (!(azone = ast_calloc(1, sizeof(*azone)))) { ast_config_destroy(cfg); return -1; @@ -300,7 +300,7 @@ static int ind_load_module(void) } } else { /* add tone to country */ - struct tone_zone_sound *ps,*ts; + struct ind_tone_zone_sound *ps,*ts; for (ps=NULL,ts=tones->tones; ts; ps=ts, ts=ts->next) { if (strcasecmp(v->name,ts->name)==0) { /* already there */ diff --git a/res/snmp/agent.c b/res/snmp/agent.c index 9911816bbf..3fd1eb2d05 100644 --- a/res/snmp/agent.c +++ b/res/snmp/agent.c @@ -622,7 +622,7 @@ static u_char *ast_var_indications(struct variable *vp, oid *name, size_t *lengt int exact, size_t *var_len, WriteMethod **write_method) { static unsigned long long_ret; - struct tone_zone *tz = NULL; + struct ind_tone_zone *tz = NULL; if (header_generic(vp, name, length, exact, var_len, write_method)) return NULL; @@ -652,7 +652,7 @@ static u_char *ast_var_indications_table(struct variable *vp, oid *name, size_t int exact, size_t *var_len, WriteMethod **write_method) { static unsigned long long_ret; - struct tone_zone *tz = NULL; + struct ind_tone_zone *tz = NULL; int i; if (header_simple_table(vp, name, length, exact, var_len, write_method, -1))