kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 168561 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/trunk@168562 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-01-13 19:22:13 +00:00
parent f19a4fc941
commit ef6ad2b53c
15 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/res_indications.c
View File

@@ -92,7 +92,7 @@ static const char config[] = "indications.conf";
*/
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) {
@@ -142,7 +142,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:
@@ -187,7 +187,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;
@@ -216,7 +216,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");
@@ -249,7 +249,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]) {
@@ -284,7 +284,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 };
@@ -345,7 +345,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);
ast_destroy_indication_zone(tones);
@@ -361,7 +361,7 @@ static int ind_load_module(int reload)
country = strsep(&c,",");
}
} else {
struct ind_tone_zone_sound *ts;
struct tone_zone_sound *ts;
/* add tone to country */
AST_LIST_TRAVERSE(&tones->tones, ts, list) {

4
res/snmp/agent.c
View File

@@ -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))