From 206883d12fd8453ff0e55c4e98b78cad43f7d565 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sun, 19 Feb 2006 18:30:38 +0000
Subject: [PATCH] Merged revisions 10487 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r10487 | tilghman | 2006-02-19 12:29:16 -0600 (Sun, 19 Feb 2006) | 2 lines
Okay, fseek doesn't return an offset
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10488 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
formats/format_sln.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/formats/format_sln.c b/formats/format_sln.c
index c1a16618db..d155b09a2f 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)