aboutsummaryrefslogtreecommitdiffstats
path: root/formats
diff options
context:
space:
mode:
authorroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-02-19 19:03:29 +0000
committerroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-02-19 19:03:29 +0000
commit772e08e4f7e6a78258ede6cff226651a1dbb4992 (patch)
treefecf48fa02a1372758853ed7d8f5155163ff5ba5 /formats
parentdcbc1ea48de8e8c768682c66f96c137b6a3b4b65 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@10509 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats')
-rw-r--r--formats/format_sln.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/formats/format_sln.c b/formats/format_sln.c
index c1a16618d..d155b09a2 100644
--- a/formats/format_sln.c
+++ b/formats/format_sln.c
@@ -172,7 +172,6 @@ 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)
{
off_t offset=0,min,cur,max;
- int res;
min = 0;
sample_offset <<= 1;
@@ -190,12 +189,7 @@ static int slinear_seek(struct ast_filestream *fs, long sample_offset, int whenc
}
/* always protect against seeking past begining. */
offset = (offset < min)?min:offset;
- res = fseek(fs->f, offset, SEEK_SET);
- /* Negative values indicate error */
- if (res > -1)
- return res / 2;
- else
- return res;
+ return fseek(fs->f, offset, SEEK_SET);
}
static int slinear_trunc(struct ast_filestream *fs)