diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-12-19 21:13:41 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-12-19 21:13:41 +0000 |
commit | 10717cc766b828c2b0b344ad7cd74148939bc294 (patch) | |
tree | 788562539a60bddcdd1880d1d76415845a03beac /formats | |
parent | e5d58524be40d77f9d4717c40afff6b5c31fb1c3 (diff) |
Merge Olle's comment patch (bug #3097)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4488 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats')
-rwxr-xr-x | formats/format_g729.c | 2 | ||||
-rwxr-xr-x | formats/format_gsm.c | 6 | ||||
-rwxr-xr-x | formats/format_ilbc.c | 6 | ||||
-rwxr-xr-x | formats/format_sln.c | 2 | ||||
-rwxr-xr-x | formats/format_wav_gsm.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/formats/format_g729.c b/formats/format_g729.c index 7c268996b..28acc92a9 100755 --- a/formats/format_g729.c +++ b/formats/format_g729.c @@ -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; diff --git a/formats/format_gsm.c b/formats/format_gsm.c index cb1a7ab0d..df1f9591a 100755 --- a/formats/format_gsm.c +++ b/formats/format_gsm.c @@ -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; diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c index f92018cf2..17a16dc26 100755 --- a/formats/format_ilbc.c +++ b/formats/format_ilbc.c @@ -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; diff --git a/formats/format_sln.c b/formats/format_sln.c index 639905e01..d1826a366 100755 --- a/formats/format_sln.c +++ b/formats/format_sln.c @@ -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); } diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index a34ae929d..be85fa098 100755 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -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; |