mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 04:11:08 +00:00
app_voicemail, say: Fix various leading whitespace problems
In af90afd90c, Japanese language support
was added to app_voicemail and main/say.c, but the leading whitespace
is not consistent with Asterisk coding guidelines. This patch fixes
that.
Whitespace only, no functional change.
ASTERISK~23324
Reported by: Kevin McCoy
Change-Id: I72c725f5930084673749bd7c9cc426a987f08e87
This commit is contained in:
Sean Bright
@@ -7889,29 +7889,29 @@ static int get_folder(struct ast_channel *chan, int start)
|
||||
/* Japanese Syntax */
|
||||
static int get_folder_ja(struct ast_channel *chan, int start)
|
||||
{
|
||||
int x;
|
||||
int d;
|
||||
char fn[256];
|
||||
for (x = start; x< 5; x++) { /* For all folders */
|
||||
if ((d = ast_say_number(chan, x, AST_DIGIT_ANY, ast_channel_language(chan), (char *) NULL))) {
|
||||
return d;
|
||||
int x;
|
||||
int d;
|
||||
char fn[256];
|
||||
for (x = start; x < 5; x++) { /* For all folders */
|
||||
if ((d = ast_say_number(chan, x, AST_DIGIT_ANY, ast_channel_language(chan), (char *) NULL))) {
|
||||
return d;
|
||||
}
|
||||
snprintf(fn, sizeof(fn), "vm-%s", mbox(NULL, x)); /* Folder name */
|
||||
d = vm_play_folder_name(chan, fn);
|
||||
if (d) {
|
||||
return d;
|
||||
return d;
|
||||
}
|
||||
d = ast_waitfordigit(chan, 500);
|
||||
if (d) {
|
||||
return d;
|
||||
d = ast_waitfordigit(chan, 500);
|
||||
if (d) {
|
||||
return d;
|
||||
}
|
||||
}
|
||||
d = ast_play_and_wait(chan, "vm-tocancel"); /* "or pound to cancel" */
|
||||
if (d) {
|
||||
return d;
|
||||
}
|
||||
d = ast_waitfordigit(chan, 4000);
|
||||
return d;
|
||||
d = ast_play_and_wait(chan, "vm-tocancel"); /* "or pound to cancel" */
|
||||
if (d) {
|
||||
return d;
|
||||
}
|
||||
d = ast_waitfordigit(chan, 4000);
|
||||
return d;
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -7933,13 +7933,13 @@ static int get_folder2(struct ast_channel *chan, char *fn, int start)
|
||||
|
||||
res = ast_play_and_wait(chan, fn); /* Folder name */
|
||||
while (((res < '0') || (res > '9')) &&
|
||||
(res != '#') && (res >= 0) &&
|
||||
loops < 4) {
|
||||
/* res = get_folder(chan, 0); */
|
||||
if (!strcasecmp(ast_channel_language(chan),"ja")) { /* Japanese syntax */
|
||||
res = get_folder_ja(chan, 0);
|
||||
} else { /* Default syntax */
|
||||
res = get_folder(chan, 0);
|
||||
(res != '#') && (res >= 0) &&
|
||||
loops < 4) {
|
||||
/* res = get_folder(chan, 0); */
|
||||
if (!strcasecmp(ast_channel_language(chan), "ja")) { /* Japanese syntax */
|
||||
res = get_folder_ja(chan, 0);
|
||||
} else { /* Default syntax */
|
||||
res = get_folder(chan, 0);
|
||||
}
|
||||
loops++;
|
||||
}
|
||||
@@ -9309,15 +9309,15 @@ static int vm_play_folder_name_gr(struct ast_channel *chan, char *box)
|
||||
|
||||
static int vm_play_folder_name_ja(struct ast_channel *chan, char *box)
|
||||
{
|
||||
int cmd;
|
||||
int cmd;
|
||||
|
||||
if (!strcasecmp(box, "vm-INBOX") || !strcasecmp(box, "vm-Old")) {
|
||||
cmd = ast_play_and_wait(chan, box);
|
||||
return cmd ? cmd : ast_play_and_wait(chan, "vm-messages");
|
||||
} else {
|
||||
cmd = ast_play_and_wait(chan, box);
|
||||
return cmd;
|
||||
}
|
||||
if (!strcasecmp(box, "vm-INBOX") || !strcasecmp(box, "vm-Old")) {
|
||||
cmd = ast_play_and_wait(chan, box);
|
||||
return cmd ? cmd : ast_play_and_wait(chan, "vm-messages");
|
||||
} else {
|
||||
cmd = ast_play_and_wait(chan, box);
|
||||
return cmd;
|
||||
}
|
||||
}
|
||||
|
||||
static int vm_play_folder_name_pl(struct ast_channel *chan, char *box)
|
||||
@@ -9362,8 +9362,8 @@ static int vm_play_folder_name(struct ast_channel *chan, char *box)
|
||||
return vm_play_folder_name_gr(chan, box);
|
||||
} else if (!strncasecmp(ast_channel_language(chan), "he", 2)) { /* Hebrew syntax */
|
||||
return ast_play_and_wait(chan, box);
|
||||
} else if (!strncasecmp(ast_channel_language(chan), "ja", 2)) { /* Japanese syntax */
|
||||
return vm_play_folder_name_ja(chan, box);
|
||||
} else if (!strncasecmp(ast_channel_language(chan), "ja", 2)) { /* Japanese syntax */
|
||||
return vm_play_folder_name_ja(chan, box);
|
||||
} else if (!strncasecmp(ast_channel_language(chan), "pl", 2)) {
|
||||
return vm_play_folder_name_pl(chan, box);
|
||||
} else if (!strncasecmp(ast_channel_language(chan), "ua", 2)) { /* Ukrainian syntax */
|
||||
@@ -9591,40 +9591,40 @@ static int vm_intro_he(struct ast_channel *chan, struct vm_state *vms)
|
||||
/* Japanese syntax */
|
||||
static int vm_intro_ja(struct ast_channel *chan,struct vm_state *vms)
|
||||
{
|
||||
/* Introduce messages they have */
|
||||
int res;
|
||||
if (vms->newmessages) {
|
||||
res = ast_play_and_wait(chan, "vm-INBOX");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "vm-message");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "jp-ga");
|
||||
if (!res)
|
||||
res = say_and_wait(chan, vms->newmessages, ast_channel_language(chan));
|
||||
if (vms->oldmessages && !res)
|
||||
res = ast_play_and_wait(chan, "silence/1");
|
||||
/* Introduce messages they have */
|
||||
int res;
|
||||
if (vms->newmessages) {
|
||||
res = ast_play_and_wait(chan, "vm-INBOX");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "vm-message");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "jp-ga");
|
||||
if (!res)
|
||||
res = say_and_wait(chan, vms->newmessages, ast_channel_language(chan));
|
||||
if (vms->oldmessages && !res)
|
||||
res = ast_play_and_wait(chan, "silence/1");
|
||||
|
||||
}
|
||||
if (vms->oldmessages) {
|
||||
res = ast_play_and_wait(chan, "vm-Old");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "vm-message");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "jp-ga");
|
||||
if (!res)
|
||||
res = say_and_wait(chan, vms->oldmessages, ast_channel_language(chan));
|
||||
}
|
||||
if (!vms->oldmessages && !vms->newmessages) {
|
||||
res = ast_play_and_wait(chan, "vm-messages");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "jp-wa");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "jp-arimasen");
|
||||
}
|
||||
else {
|
||||
res = ast_play_and_wait(chan, "jp-arimasu");
|
||||
}
|
||||
return res;
|
||||
}
|
||||
if (vms->oldmessages) {
|
||||
res = ast_play_and_wait(chan, "vm-Old");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "vm-message");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "jp-ga");
|
||||
if (!res)
|
||||
res = say_and_wait(chan, vms->oldmessages, ast_channel_language(chan));
|
||||
}
|
||||
if (!vms->oldmessages && !vms->newmessages) {
|
||||
res = ast_play_and_wait(chan, "vm-messages");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "jp-wa");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "jp-arimasen");
|
||||
}
|
||||
else {
|
||||
res = ast_play_and_wait(chan, "jp-arimasu");
|
||||
}
|
||||
return res;
|
||||
} /* Japanese */
|
||||
|
||||
/* Default English syntax */
|
||||
@@ -10538,82 +10538,82 @@ static int vm_instructions_en(struct ast_channel *chan, struct ast_vm_user *vmu,
|
||||
|
||||
static int vm_instructions_ja(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, int skipadvanced, int in_urgent)
|
||||
{
|
||||
int res = 0;
|
||||
/* Play instructions and wait for new command */
|
||||
while (!res) {
|
||||
if (vms->starting) {
|
||||
if (vms->lastmsg > -1) {
|
||||
res = vm_play_folder_name(chan, vms->vmbox);
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "jp-wa");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "digits/1");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "jp-wo");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "silence/1");
|
||||
}
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "vm-opts");
|
||||
} else {
|
||||
/* Added for additional help */
|
||||
if (skipadvanced) {
|
||||
res = vm_play_folder_name(chan, vms->vmbox);
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "jp-wa");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "digits/1");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "jp-wo");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "silence/1");
|
||||
res = ast_play_and_wait(chan, "vm-opts-full");
|
||||
}
|
||||
/* Logic:
|
||||
* If the current message is not the first OR
|
||||
* if we're listening to the first new message and there are
|
||||
* also urgent messages, then prompt for navigation to the
|
||||
* previous message
|
||||
*/
|
||||
if (vms->curmsg || (!in_urgent && vms->urgentmessages > 0) || (ast_test_flag(vmu, VM_MESSAGEWRAP) && vms->lastmsg > 0)) {
|
||||
res = ast_play_and_wait(chan, "vm-prev");
|
||||
}
|
||||
if (!res && !skipadvanced)
|
||||
res = ast_play_and_wait(chan, "vm-advopts");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "vm-repeat");
|
||||
/* Logic:
|
||||
* If we're not listening to the last message OR
|
||||
* we're listening to the last urgent message and there are
|
||||
* also new non-urgent messages, then prompt for navigation
|
||||
* to the next message
|
||||
*/
|
||||
if (!res && ((vms->curmsg != vms->lastmsg) || (in_urgent && vms->newmessages > 0) ||
|
||||
(ast_test_flag(vmu, VM_MESSAGEWRAP) && vms->lastmsg > 0) )) {
|
||||
res = ast_play_and_wait(chan, "vm-next");
|
||||
}
|
||||
if (!res) {
|
||||
int curmsg_deleted;
|
||||
int res = 0;
|
||||
/* Play instructions and wait for new command */
|
||||
while (!res) {
|
||||
if (vms->starting) {
|
||||
if (vms->lastmsg > -1) {
|
||||
res = vm_play_folder_name(chan, vms->vmbox);
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "jp-wa");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "digits/1");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "jp-wo");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "silence/1");
|
||||
}
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "vm-opts");
|
||||
} else {
|
||||
/* Added for additional help */
|
||||
if (skipadvanced) {
|
||||
res = vm_play_folder_name(chan, vms->vmbox);
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "jp-wa");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "digits/1");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "jp-wo");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "silence/1");
|
||||
res = ast_play_and_wait(chan, "vm-opts-full");
|
||||
}
|
||||
/* Logic:
|
||||
* If the current message is not the first OR
|
||||
* if we're listening to the first new message and there are
|
||||
* also urgent messages, then prompt for navigation to the
|
||||
* previous message
|
||||
*/
|
||||
if (vms->curmsg || (!in_urgent && vms->urgentmessages > 0) || (ast_test_flag(vmu, VM_MESSAGEWRAP) && vms->lastmsg > 0)) {
|
||||
res = ast_play_and_wait(chan, "vm-prev");
|
||||
}
|
||||
if (!res && !skipadvanced)
|
||||
res = ast_play_and_wait(chan, "vm-advopts");
|
||||
if (!res)
|
||||
res = ast_play_and_wait(chan, "vm-repeat");
|
||||
/* Logic:
|
||||
* If we're not listening to the last message OR
|
||||
* we're listening to the last urgent message and there are
|
||||
* also new non-urgent messages, then prompt for navigation
|
||||
* to the next message
|
||||
*/
|
||||
if (!res && ((vms->curmsg != vms->lastmsg) || (in_urgent && vms->newmessages > 0) ||
|
||||
(ast_test_flag(vmu, VM_MESSAGEWRAP) && vms->lastmsg > 0) )) {
|
||||
res = ast_play_and_wait(chan, "vm-next");
|
||||
}
|
||||
if (!res) {
|
||||
int curmsg_deleted;
|
||||
#ifdef IMAP_STORAGE
|
||||
ast_mutex_lock(&vms->lock);
|
||||
ast_mutex_lock(&vms->lock);
|
||||
#endif
|
||||
curmsg_deleted = vms->deleted[vms->curmsg];
|
||||
curmsg_deleted = vms->deleted[vms->curmsg];
|
||||
#ifdef IMAP_STORAGE
|
||||
ast_mutex_unlock(&vms->lock);
|
||||
ast_mutex_unlock(&vms->lock);
|
||||
#endif
|
||||
if (!curmsg_deleted) {
|
||||
res = ast_play_and_wait(chan, "vm-delete");
|
||||
} else {
|
||||
res = ast_play_and_wait(chan, "vm-undelete");
|
||||
}
|
||||
if (!res) {
|
||||
res = ast_play_and_wait(chan, "vm-toforward");
|
||||
}
|
||||
if (!res) {
|
||||
res = ast_play_and_wait(chan, "vm-savemessage");
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!curmsg_deleted) {
|
||||
res = ast_play_and_wait(chan, "vm-delete");
|
||||
} else {
|
||||
res = ast_play_and_wait(chan, "vm-undelete");
|
||||
}
|
||||
if (!res) {
|
||||
res = ast_play_and_wait(chan, "vm-toforward");
|
||||
}
|
||||
if (!res) {
|
||||
res = ast_play_and_wait(chan, "vm-savemessage");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!res) {
|
||||
res = ast_play_and_wait(chan, "vm-helpexit");
|
||||
@@ -10629,7 +10629,7 @@ static int vm_instructions_ja(struct ast_channel *chan, struct ast_vm_user *vmu,
|
||||
|
||||
}
|
||||
|
||||
return res;
|
||||
return res;
|
||||
}
|
||||
|
||||
static int vm_instructions_zh(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, int skipadvanced, int in_urgent)
|
||||
@@ -10658,16 +10658,15 @@ static int vm_instructions_zh(struct ast_channel *chan, struct ast_vm_user *vmu,
|
||||
|
||||
static int vm_instructions(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, int skipadvanced, int in_urgent)
|
||||
{
|
||||
if (!strncasecmp(ast_channel_language(chan), "ja", 2)) { /* Japanese syntax */
|
||||
return vm_instructions_ja(chan, vmu, vms, skipadvanced, in_urgent);
|
||||
} else if (vms->starting && !strncasecmp(ast_channel_language(chan), "zh", 2)) { /* CHINESE (Taiwan) syntax */
|
||||
if (!strncasecmp(ast_channel_language(chan), "ja", 2)) { /* Japanese syntax */
|
||||
return vm_instructions_ja(chan, vmu, vms, skipadvanced, in_urgent);
|
||||
} else if (vms->starting && !strncasecmp(ast_channel_language(chan), "zh", 2)) { /* CHINESE (Taiwan) syntax */
|
||||
return vm_instructions_zh(chan, vmu, vms, skipadvanced, in_urgent);
|
||||
} else { /* Default to ENGLISH */
|
||||
return vm_instructions_en(chan, vmu, vms, skipadvanced, in_urgent);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static int vm_newuser_setup(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, char *fmtc, signed char record_gain)
|
||||
{
|
||||
int cmd = 0;
|
||||
@@ -11093,21 +11092,21 @@ static int vm_browse_messages_it(struct ast_channel *chan, struct vm_state *vms,
|
||||
*/
|
||||
static int vm_browse_messages_ja(struct ast_channel *chan, struct vm_state *vms, struct ast_vm_user *vmu)
|
||||
{
|
||||
int cmd = 0;
|
||||
int cmd = 0;
|
||||
|
||||
if (vms->lastmsg > -1) {
|
||||
cmd = play_message(chan, vmu, vms);
|
||||
} else {
|
||||
snprintf(vms->fn, sizeof(vms->fn), "vm-%s", vms->curbox);
|
||||
cmd = ast_play_and_wait(chan, vms->fn);
|
||||
if (!cmd)
|
||||
cmd = ast_play_and_wait(chan, "vm-messages");
|
||||
if (!cmd)
|
||||
cmd = ast_play_and_wait(chan, "jp-wa");
|
||||
if (!cmd)
|
||||
cmd = ast_play_and_wait(chan, "jp-arimasen");
|
||||
}
|
||||
return cmd;
|
||||
if (vms->lastmsg > -1) {
|
||||
cmd = play_message(chan, vmu, vms);
|
||||
} else {
|
||||
snprintf(vms->fn, sizeof(vms->fn), "vm-%s", vms->curbox);
|
||||
cmd = ast_play_and_wait(chan, vms->fn);
|
||||
if (!cmd)
|
||||
cmd = ast_play_and_wait(chan, "vm-messages");
|
||||
if (!cmd)
|
||||
cmd = ast_play_and_wait(chan, "jp-wa");
|
||||
if (!cmd)
|
||||
cmd = ast_play_and_wait(chan, "jp-arimasen");
|
||||
}
|
||||
return cmd;
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -11235,8 +11234,8 @@ static int vm_browse_messages(struct ast_channel *chan, struct vm_state *vms, st
|
||||
return vm_browse_messages_he(chan, vms, vmu);
|
||||
} else if (!strncasecmp(ast_channel_language(chan), "it", 2)) { /* ITALIAN */
|
||||
return vm_browse_messages_it(chan, vms, vmu);
|
||||
} else if (!strncasecmp(ast_channel_language(chan), "ja", 2)) { /* JAPANESE */
|
||||
return vm_browse_messages_ja(chan, vms, vmu);
|
||||
} else if (!strncasecmp(ast_channel_language(chan), "ja", 2)) { /* JAPANESE */
|
||||
return vm_browse_messages_ja(chan, vms, vmu);
|
||||
} else if (!strncasecmp(ast_channel_language(chan), "pt", 2)) { /* PORTUGUESE */
|
||||
return vm_browse_messages_pt(chan, vms, vmu);
|
||||
} else if (!strncasecmp(ast_channel_language(chan), "vi", 2)) { /* VIETNAMESE */
|
||||
@@ -12192,22 +12191,22 @@ static int vm_execmain(struct ast_channel *chan, const char *data)
|
||||
break;
|
||||
case '*': /* Help */
|
||||
if (!vms.starting) {
|
||||
if (!strncasecmp(ast_channel_language(chan), "ja", 2)) {
|
||||
cmd = vm_play_folder_name(chan, vms.vmbox);
|
||||
if (!cmd)
|
||||
cmd = ast_play_and_wait(chan, "jp-wa");
|
||||
if (!cmd)
|
||||
cmd = ast_play_and_wait(chan, "digits/1");
|
||||
if (!cmd)
|
||||
cmd = ast_play_and_wait(chan, "jp-wo");
|
||||
if (!cmd)
|
||||
cmd = ast_play_and_wait(chan, "silence/1");
|
||||
if (!cmd)
|
||||
cmd = ast_play_and_wait(chan, "vm-opts");
|
||||
if (!cmd)
|
||||
cmd = vm_instructions(chan, vmu, &vms, 1, in_urgent);
|
||||
break;
|
||||
}
|
||||
if (!strncasecmp(ast_channel_language(chan), "ja", 2)) {
|
||||
cmd = vm_play_folder_name(chan, vms.vmbox);
|
||||
if (!cmd)
|
||||
cmd = ast_play_and_wait(chan, "jp-wa");
|
||||
if (!cmd)
|
||||
cmd = ast_play_and_wait(chan, "digits/1");
|
||||
if (!cmd)
|
||||
cmd = ast_play_and_wait(chan, "jp-wo");
|
||||
if (!cmd)
|
||||
cmd = ast_play_and_wait(chan, "silence/1");
|
||||
if (!cmd)
|
||||
cmd = ast_play_and_wait(chan, "vm-opts");
|
||||
if (!cmd)
|
||||
cmd = vm_instructions(chan, vmu, &vms, 1, in_urgent);
|
||||
break;
|
||||
}
|
||||
cmd = ast_play_and_wait(chan, "vm-onefor");
|
||||
if (!strncasecmp(ast_channel_language(chan), "he", 2)) {
|
||||
cmd = ast_play_and_wait(chan, "vm-for");
|
||||
|
||||
Reference in New Issue
Block a user