kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 07:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@10486 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-02-19 18:03:48 +00:00
parent e098adeaf7
commit d291491eb6
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_voicemail.c
View File

@@ -4945,7 +4945,7 @@ static int vm_authenticate(struct ast_channel *chan, char *mailbox, int mailbox_
struct ast_vm_user *res_vmu, const char *context, const char *prefix, struct ast_vm_user *res_vmu, const char *context, const char *prefix,
int skipuser, int maxlogins, int silent) int skipuser, int maxlogins, int silent)
{ {
int useadsi, valid=0, logretries=0; int useadsi=0, valid=0, logretries=0;
char password[AST_MAX_EXTENSION]="", *passptr; char password[AST_MAX_EXTENSION]="", *passptr;
struct ast_vm_user vmus, *vmu = NULL; struct ast_vm_user vmus, *vmu = NULL;

8
formats/format_sln.c
View File

@@ -172,6 +172,7 @@ static int slinear_write(struct ast_filestream *fs, struct ast_frame *f)
static int slinear_seek(struct ast_filestream *fs, long sample_offset, int whence) static int slinear_seek(struct ast_filestream *fs, long sample_offset, int whence)
{ {
off_t offset=0,min,cur,max; off_t offset=0,min,cur,max;
int res;
min = 0; min = 0;
sample_offset <<= 1; sample_offset <<= 1;
@@ -189,7 +190,12 @@ static int slinear_seek(struct ast_filestream *fs, long sample_offset, int whenc
} }
/* always protect against seeking past begining. */ /* always protect against seeking past begining. */
offset = (offset < min)?min:offset; offset = (offset < min)?min:offset;
return fseek(fs->f, offset, SEEK_SET) / 2; res = fseek(fs->f, offset, SEEK_SET);
/* Negative values indicate error */
if (res > -1)
return res / 2;
else
return res;
} }
static int slinear_trunc(struct ast_filestream *fs) static int slinear_trunc(struct ast_filestream *fs)