mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-20 03:26:55 +00:00
More silly spacing changes
..... Merged revisions 337353 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ..... Merged revisions 337380 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337385 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -435,8 +435,8 @@ static AST_LIST_HEAD_STATIC(vmstates, vmstate);
|
|||||||
#define ASTERISK_USERNAME "asterisk"
|
#define ASTERISK_USERNAME "asterisk"
|
||||||
|
|
||||||
/* Define fast-forward, pause, restart, and reverse keys
|
/* Define fast-forward, pause, restart, and reverse keys
|
||||||
while listening to a voicemail message - these are
|
* while listening to a voicemail message - these are
|
||||||
strings, not characters */
|
* strings, not characters */
|
||||||
#define DEFAULT_LISTEN_CONTROL_FORWARD_KEY "#"
|
#define DEFAULT_LISTEN_CONTROL_FORWARD_KEY "#"
|
||||||
#define DEFAULT_LISTEN_CONTROL_REVERSE_KEY "*"
|
#define DEFAULT_LISTEN_CONTROL_REVERSE_KEY "*"
|
||||||
#define DEFAULT_LISTEN_CONTROL_PAUSE_KEY "0"
|
#define DEFAULT_LISTEN_CONTROL_PAUSE_KEY "0"
|
||||||
@@ -445,7 +445,7 @@ static AST_LIST_HEAD_STATIC(vmstates, vmstate);
|
|||||||
#define VALID_DTMF "1234567890*#" /* Yes ABCD are valid dtmf but what phones have those? */
|
#define VALID_DTMF "1234567890*#" /* Yes ABCD are valid dtmf but what phones have those? */
|
||||||
|
|
||||||
/* Default mail command to mail voicemail. Change it with the
|
/* Default mail command to mail voicemail. Change it with the
|
||||||
mailcmd= command in voicemail.conf */
|
* mailcmd= command in voicemail.conf */
|
||||||
#define SENDMAIL "/usr/sbin/sendmail -t"
|
#define SENDMAIL "/usr/sbin/sendmail -t"
|
||||||
|
|
||||||
#define INTRO "vm-intro"
|
#define INTRO "vm-intro"
|
||||||
@@ -6125,30 +6125,31 @@ leave_vm_out:
|
|||||||
#if !defined(IMAP_STORAGE)
|
#if !defined(IMAP_STORAGE)
|
||||||
static int resequence_mailbox(struct ast_vm_user *vmu, char *dir, int stopcount)
|
static int resequence_mailbox(struct ast_vm_user *vmu, char *dir, int stopcount)
|
||||||
{
|
{
|
||||||
/* we know the actual number of messages, so stop process when number is hit */
|
/* we know the actual number of messages, so stop process when number is hit */
|
||||||
|
|
||||||
int x, dest;
|
int x, dest;
|
||||||
char sfn[PATH_MAX];
|
char sfn[PATH_MAX];
|
||||||
char dfn[PATH_MAX];
|
char dfn[PATH_MAX];
|
||||||
|
|
||||||
if (vm_lock_path(dir))
|
if (vm_lock_path(dir)) {
|
||||||
return ERROR_LOCK_PATH;
|
return ERROR_LOCK_PATH;
|
||||||
|
}
|
||||||
|
|
||||||
for (x = 0, dest = 0; dest != stopcount && x < vmu->maxmsg + 10; x++) {
|
for (x = 0, dest = 0; dest != stopcount && x < vmu->maxmsg + 10; x++) {
|
||||||
make_file(sfn, sizeof(sfn), dir, x);
|
make_file(sfn, sizeof(sfn), dir, x);
|
||||||
if (EXISTS(dir, x, sfn, NULL)) {
|
if (EXISTS(dir, x, sfn, NULL)) {
|
||||||
|
|
||||||
if (x != dest) {
|
if (x != dest) {
|
||||||
make_file(dfn, sizeof(dfn), dir, dest);
|
make_file(dfn, sizeof(dfn), dir, dest);
|
||||||
RENAME(dir, x, vmu->mailbox, vmu->context, dir, dest, sfn, dfn);
|
RENAME(dir, x, vmu->mailbox, vmu->context, dir, dest, sfn, dfn);
|
||||||
}
|
}
|
||||||
|
|
||||||
dest++;
|
dest++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ast_unlock_path(dir);
|
ast_unlock_path(dir);
|
||||||
|
|
||||||
return dest;
|
return dest;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user