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

Merge Olle's comment patch (bug #3097)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4488 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-12-19 21:13:41 +00:00
parent d6a415c262
commit d6471bec31
23 changed files with 126 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
formats/format_g729.c
View File

@@ -187,7 +187,7 @@ static int g729_seek(struct ast_filestream *fs, long sample_offset, int whence)
if (whence != SEEK_FORCECUR) {
offset = (offset > max)?max:offset;
}
// protect against seeking beyond begining.
/* protect against seeking beyond begining. */
offset = (offset < min)?min:offset;
if (lseek(fs->fd, offset, SEEK_SET) < 0)
return -1;

6
formats/format_gsm.c
View File

@@ -3,9 +3,9 @@
*
* Save to raw, headerless GSM data.
*
* Copyright (C) 1999, Mark Spencer
* Copyright (C) 1999-2004, Digium, inc
*
* Mark Spencer <markster@linux-support.net>
* Mark Spencer <markster@digium.com>
*
* This program is free software, distributed under the terms of
* the GNU General Public License
@@ -200,7 +200,7 @@ static int gsm_seek(struct ast_filestream *fs, long sample_offset, int whence)
offset = distance + cur;
else if(whence == SEEK_END)
offset = max - distance;
// Always protect against seeking past the begining.
/* Always protect against seeking past the begining. */
offset = (offset < min)?min:offset;
if (whence != SEEK_FORCECUR) {
offset = (offset > max)?max:offset;

6
formats/format_ilbc.c
View File

@@ -5,9 +5,9 @@
*
* Brian K. West <brian@bkw.org>
*
* Copyright (C) 1999, Mark Spencer
* Copyright (C) 1999-2004, Digium, inc
*
* Mark Spencer <markster@linux-support.net>
* Mark Spencer <markster@digium.com>
*
* This program is free software, distributed under the terms of
* the GNU General Public License
@@ -189,7 +189,7 @@ static int ilbc_seek(struct ast_filestream *fs, long sample_offset, int whence)
if (whence != SEEK_FORCECUR) {
offset = (offset > max)?max:offset;
}
// protect against seeking beyond begining.
/* protect against seeking beyond begining. */
offset = (offset < min)?min:offset;
if (lseek(fs->fd, offset, SEEK_SET) < 0)
return -1;

2
formats/format_sln.c
View File

@@ -175,7 +175,7 @@ static int slinear_seek(struct ast_filestream *fs, long sample_offset, int whenc
if (whence != SEEK_FORCECUR) {
offset = (offset > max)?max:offset;
}
// always protect against seeking past begining.
/* always protect against seeking past begining. */
offset = (offset < min)?min:offset;
return lseek(fs->fd, offset, SEEK_SET);
}

2
formats/format_wav_gsm.c
View File

@@ -501,7 +501,7 @@ static int wav_seek(struct ast_filestream *fs, long sample_offset, int whence)
offset = distance + cur;
else if(whence == SEEK_END)
offset = max - distance;
// always protect against seeking past end of header
/* always protect against seeking past end of header */
offset = (offset < min)?min:offset;
if (whence != SEEK_FORCECUR) {
offset = (offset > max)?max:offset;