kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move around some defines to unbreak ODBC storage.

Browse Source 
(closes issue #11932)
 Reported by: snuffy


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@102576 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-02-06 00:26:02 +00:00
parent 748609f25e
commit c9bb4fc12a
1 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
apps/app_voicemail.c
View File

@@ -1479,6 +1479,30 @@ static void rename_file(char *sfn, char *dfn)
} }
#endif #endif
/*
* A negative return value indicates an error.
*/
#if (!defined(IMAP_STORAGE) && !defined(ODBC_STORAGE))
static int last_message_index(struct ast_vm_user *vmu, char *dir)
{
int x;
char fn[PATH_MAX];
if (vm_lock_path(dir))
return ERROR_LOCK_PATH;
for (x = 0; x < vmu->maxmsg; x++) {
make_file(fn, sizeof(fn), dir, x);
if (ast_fileexists(fn, NULL, NULL) < 1)
break;
}
ast_unlock_path(dir);
return x - 1;
}
#endif
#endif
static int copy(char *infile, char *outfile) static int copy(char *infile, char *outfile)
{ {
int ifd; int ifd;
@@ -1538,31 +1562,6 @@ static void copy_plain_file(char *frompath, char *topath)
copy(frompath2, topath2); copy(frompath2, topath2);
} }
/*
* A negative return value indicates an error.
*/
#if (!defined(IMAP_STORAGE) && !defined(ODBC_STORAGE))
static int last_message_index(struct ast_vm_user *vmu, char *dir)
{
int x;
char fn[PATH_MAX];
if (vm_lock_path(dir))
return ERROR_LOCK_PATH;
for (x = 0; x < vmu->maxmsg; x++) {
make_file(fn, sizeof(fn), dir, x);
if (ast_fileexists(fn, NULL, NULL) < 1)
break;
}
ast_unlock_path(dir);
return x - 1;
}
#endif
#endif
#ifndef ODBC_STORAGE
static int vm_delete(char *file) static int vm_delete(char *file)
{ {
char *txt; char *txt;
@@ -1577,7 +1576,6 @@ static int vm_delete(char *file)
unlink(txt); unlink(txt);
return ast_filedelete(file, NULL); return ast_filedelete(file, NULL);
} }
#endif
static int inbuf(struct baseio *bio, FILE *fi) static int inbuf(struct baseio *bio, FILE *fi)
{ {
@@ -4240,7 +4238,7 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
} }
/* Remove surrogate file */ /* Remove surrogate file */
DELETE(tmpdir, curmsg, msgfile); vm_delete(msgfile);
} }
/* If anything failed above, we still have this list to free */ /* If anything failed above, we still have this list to free */