Skip to content
Snippets Groups Projects
Commit c29b5389 authored by George Joseph's avatar George Joseph Committed by Gerrit Code Review
Browse files

Merge "app_voicemail: Fix json blob errors"

parents d6a49afb 4d1e3fef
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 24 additions and 12 deletions
apps/app_voicemail.c
+ 24
− 12
View file @ c29b5389
...@@ -7872,7 +7872,8 @@ static int get_folder2(struct ast_channel *chan, char *fn, int start) ...@@ -7872,7 +7872,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", '#', '#'); ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c", '#', '#');
return '#'; 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; return res;
} }
   
...@@ -8035,7 +8036,8 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu, ...@@ -8035,7 +8036,8 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu,
if (retries > 3) { if (retries > 3) {
cmd = '*'; /* Let's cancel this beast */ 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 : '?');
} }
} }
   
...@@ -8263,7 +8265,8 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st ...@@ -8263,7 +8265,8 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
cmd = 't'; cmd = 't';
done = 1; 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') if (cmd < 0 || cmd == 't')
...@@ -8928,7 +8931,8 @@ static int play_message(struct ast_channel *chan, struct ast_vm_user *vmu, struc ...@@ -8928,7 +8931,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); ast_log(AST_LOG_WARNING, "Playback of message %s failed\n", vms->fn);
res = 0; 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); DISPOSE(vms->curdir, vms->curmsg);
return res; return res;
...@@ -10783,7 +10787,8 @@ static int vm_options(struct ast_channel *chan, struct ast_vm_user *vmu, struct ...@@ -10783,7 +10787,8 @@ static int vm_options(struct ast_channel *chan, struct ast_vm_user *vmu, struct
if (retries > 3) { if (retries > 3) {
cmd = 't'; 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') if (cmd == 't')
...@@ -10863,7 +10868,8 @@ static int vm_tempgreeting(struct ast_channel *chan, struct ast_vm_user *vmu, st ...@@ -10863,7 +10868,8 @@ static int vm_tempgreeting(struct ast_channel *chan, struct ast_vm_user *vmu, st
if (retries > 3) { if (retries > 3) {
cmd = 't'; 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); DISPOSE(prefile, -1);
...@@ -11685,7 +11691,8 @@ static int vm_execmain(struct ast_channel *chan, const char *data) ...@@ -11685,7 +11691,8 @@ static int vm_execmain(struct ast_channel *chan, const char *data)
} else { } else {
cmd = vm_intro(chan, vmu, &vms); 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.repeats = 0;
vms.starting = 1; vms.starting = 1;
...@@ -11705,7 +11712,8 @@ static int vm_execmain(struct ast_channel *chan, const char *data) ...@@ -11705,7 +11712,8 @@ static int vm_execmain(struct ast_channel *chan, const char *data)
adsi_folders(chan, 0, "Change to folder..."); adsi_folders(chan, 0, "Change to folder...");
   
cmd = get_folder2(chan, "vm-changeto", 0); 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 == '#') { if (cmd == '#') {
cmd = 0; cmd = 0;
} else if (cmd > 0) { } else if (cmd > 0) {
...@@ -11837,7 +11845,8 @@ static int vm_execmain(struct ast_channel *chan, const char *data) ...@@ -11837,7 +11845,8 @@ static int vm_execmain(struct ast_channel *chan, const char *data)
if (vms.repeats > 3) { if (vms.repeats > 3) {
cmd = 't'; 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') { if (cmd == 't') {
...@@ -12015,7 +12024,8 @@ static int vm_execmain(struct ast_channel *chan, const char *data) ...@@ -12015,7 +12024,8 @@ static int vm_execmain(struct ast_channel *chan, const char *data)
if (useadsi) if (useadsi)
adsi_folders(chan, 1, "Save to folder..."); adsi_folders(chan, 1, "Save to folder...");
cmd = get_folder2(chan, "vm-savefolder", 1); 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 */ box = 0; /* Shut up compiler */
if (cmd == '#') { if (cmd == '#') {
cmd = 0; cmd = 0;
...@@ -15181,7 +15191,8 @@ static int dialout(struct ast_channel *chan, struct ast_vm_user *vmu, char *num, ...@@ -15181,7 +15191,8 @@ static int dialout(struct ast_channel *chan, struct ast_vm_user *vmu, char *num,
else else
cmd = 't'; 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) { if (retries >= 3) {
return 0; return 0;
...@@ -15346,7 +15357,8 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s ...@@ -15346,7 +15357,8 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s
res = 't'; 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; break;
   
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment