diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-13 19:27:54 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-13 19:27:54 +0000 |
commit | 106cd08ff8f130cd9259ba455f3087ab51d8fa5b (patch) | |
tree | d88f5d2640401c23ce535b1a7915512eaae99081 /res | |
parent | dc396918902acd1422ef0ee93cfbf8e01e81a1d0 (diff) |
Merged revisions 168562 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r168562 | russell | 2009-01-13 13:22:13 -0600 (Tue, 13 Jan 2009) | 10 lines
Merged revisions 168561 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r168561 | russell | 2009-01-13 13:13:05 -0600 (Tue, 13 Jan 2009) | 2 lines
Revert unnecessary indications API change from rev 122314
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@168564 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r-- | res/res_indications.c | 16 | ||||
-rw-r--r-- | res/snmp/agent.c | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/res/res_indications.c b/res/res_indications.c index af56444cd..b6f2b687c 100644 --- a/res/res_indications.c +++ b/res/res_indications.c @@ -65,7 +65,7 @@ char *playtones_desc= */ static char *handle_cli_indication_add(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { - struct ind_tone_zone *tz; + struct tone_zone *tz; int created_country = 0; switch (cmd) { @@ -115,7 +115,7 @@ static char *handle_cli_indication_add(struct ast_cli_entry *e, int cmd, struct */ static char *handle_cli_indication_remove(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { - struct ind_tone_zone *tz; + struct tone_zone *tz; switch (cmd) { case CLI_INIT: @@ -160,7 +160,7 @@ static char *handle_cli_indication_remove(struct ast_cli_entry *e, int cmd, stru */ static char *handle_cli_indication_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { - struct ind_tone_zone *tz = NULL; + struct tone_zone *tz = NULL; char buf[256]; int found_country = 0; @@ -189,7 +189,7 @@ static char *handle_cli_indication_show(struct ast_cli_entry *e, int cmd, struct int i, j; for (i = 2; i < a->argc; i++) { if (strcasecmp(tz->country, a->argv[i]) == 0 && !tz->alias[0]) { - struct ind_tone_zone_sound* ts; + struct tone_zone_sound* ts; if (!found_country) { found_country = 1; ast_cli(a->fd, "Country Indication PlayList\n"); @@ -221,7 +221,7 @@ static char *handle_cli_indication_show(struct ast_cli_entry *e, int cmd, struct */ static int handle_playtones(struct ast_channel *chan, void *data) { - struct ind_tone_zone_sound *ts; + struct tone_zone_sound *ts; int res; if (!data || !((char*)data)[0]) { @@ -256,7 +256,7 @@ static int ind_load_module(int reload) struct ast_variable *v; char *cxt; char *c; - struct ind_tone_zone *tones; + struct tone_zone *tones; const char *country = NULL; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; @@ -315,7 +315,7 @@ static int ind_load_module(int reload) c = countries; country = strsep(&c,","); while (country) { - struct ind_tone_zone* azone; + struct tone_zone* azone; if (!(azone = ast_calloc(1, sizeof(*azone)))) { ast_config_destroy(cfg); return -1; @@ -331,7 +331,7 @@ static int ind_load_module(int reload) } } else { /* add tone to country */ - struct ind_tone_zone_sound *ps,*ts; + struct 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 8ccee1d46..8820b697e 100644 --- a/res/snmp/agent.c +++ b/res/snmp/agent.c @@ -644,7 +644,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 ind_tone_zone *tz = NULL; + struct tone_zone *tz = NULL; if (header_generic(vp, name, length, exact, var_len, write_method)) return NULL; @@ -674,7 +674,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 ind_tone_zone *tz = NULL; + struct tone_zone *tz = NULL; int i; if (header_simple_table(vp, name, length, exact, var_len, write_method, -1)) |