Sapian
/
asterisk
mirror of http://gerrit.asterisk.org/asterisk
3
0
Fork 0
Code Issues Releases Wiki Activity

Merge "app_voicemail: Fix json blob errors" into 15

Browse Source
changes/54/8554/2
Jenkins2 9 years ago committed by Gerrit Code Review
parent f3feff0ef4 2ef947555b
commit 6048dc3868
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File

36
apps/app_voicemail.c
Unescape View File

@ -7835,7 +7835,8 @@ static int get_folder2(struct ast_channel *chan, char *fn, int start)
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c", '#', '#');
return '#';
}
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c", res, res);
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c",
isprint(res) ? res : '?', isprint(res) ? res : '?');
return res;
}
@ -7998,7 +7999,8 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu,
if (retries > 3) {
cmd = '*'; /* Let's cancel this beast */
}
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c", cmd, cmd);
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c",
isprint(cmd) ? cmd : '?', isprint(cmd) ? cmd : '?');
}
}
@ -8226,7 +8228,8 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
cmd = 't';
done = 1;
}
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c", cmd, cmd);
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c",
isprint(cmd) ? cmd : '?', isprint(cmd) ? cmd : '?');
}
}
if (cmd < 0 || cmd == 't')
@ -8891,7 +8894,8 @@ static int play_message(struct ast_channel *chan, struct ast_vm_user *vmu, struc
ast_log(AST_LOG_WARNING, "Playback of message %s failed\n", vms->fn);
res = 0;
}
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c", res, res);
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c",
isprint(res) ? res : '?', isprint(res) ? res : '?');
}
DISPOSE(vms->curdir, vms->curmsg);
return res;
@ -10746,7 +10750,8 @@ static int vm_options(struct ast_channel *chan, struct ast_vm_user *vmu, struct
if (retries > 3) {
cmd = 't';
}
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c", cmd, cmd);
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c",
isprint(cmd) ? cmd : '?', isprint(cmd) ? cmd : '?');
}
}
if (cmd == 't')
@ -10826,7 +10831,8 @@ static int vm_tempgreeting(struct ast_channel *chan, struct ast_vm_user *vmu, st
if (retries > 3) {
cmd = 't';
}
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c", cmd, cmd);
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c",
isprint(cmd) ? cmd : '?', isprint(cmd) ? cmd : '?');
}
}
DISPOSE(prefile, -1);
@ -11648,7 +11654,8 @@ static int vm_execmain(struct ast_channel *chan, const char *data)
} else {
cmd = vm_intro(chan, vmu, &vms);
}
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c", cmd, cmd);
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c",
isprint(cmd) ? cmd : '?', isprint(cmd) ? cmd : '?');
vms.repeats = 0;
vms.starting = 1;
@ -11668,7 +11675,8 @@ static int vm_execmain(struct ast_channel *chan, const char *data)
adsi_folders(chan, 0, "Change to folder...");
cmd = get_folder2(chan, "vm-changeto", 0);
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c", cmd, cmd);
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c",
isprint(cmd) ? cmd : '?', isprint(cmd) ? cmd : '?');
if (cmd == '#') {
cmd = 0;
} else if (cmd > 0) {
@ -11800,7 +11808,8 @@ static int vm_execmain(struct ast_channel *chan, const char *data)
if (vms.repeats > 3) {
cmd = 't';
}
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c", cmd, cmd);
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c",
isprint(cmd) ? cmd : '?', isprint(cmd) ? cmd : '?');
}
}
if (cmd == 't') {
@ -11978,7 +11987,8 @@ static int vm_execmain(struct ast_channel *chan, const char *data)
if (useadsi)
adsi_folders(chan, 1, "Save to folder...");
cmd = get_folder2(chan, "vm-savefolder", 1);
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c", cmd, cmd);
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c",
isprint(cmd) ? cmd : '?', isprint(cmd) ? cmd : '?');
box = 0; /* Shut up compiler */
if (cmd == '#') {
cmd = 0;
@ -15066,7 +15076,8 @@ static int dialout(struct ast_channel *chan, struct ast_vm_user *vmu, char *num,
else
cmd = 't';
}
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c", cmd, cmd);
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c",
isprint(cmd) ? cmd : '?', isprint(cmd) ? cmd : '?');
}
if (retries >= 3) {
return 0;
@ -15231,7 +15242,8 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s
res = 't';
}
}
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c", res, res);
ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c",
isprint(res) ? res : '?', isprint(res) ? res : '?');
break;
}

Write Preview
Loading…
Cancel
Save