From 09f75aa6dcb4aaaeee07a9e3d2823d10c17b2e0e Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Mon, 25 Dec 2006 06:38:09 +0000 Subject: 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 --- res/res_indications.c | 16 ++++++++-------- res/snmp/agent.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'res') diff --git a/res/res_indications.c b/res/res_indications.c index a4d8ae20e..c0b1404c2 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 9911816bb..3fd1eb2d0 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)) -- cgit v1.2.3