[asterisk-commits] trunk r10488 - in /trunk: ./ formats/format_sln.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Sun Feb 19 12:30:38 2006
New Revision: 10488

URL: http://svn.digium.com/view/asterisk?rev=10488&view=rev
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/formats/format_sln.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/formats/format_sln.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_sln.c?rev=10488&r1=10487&r2=10488&view=diff
==============================================================================
--- trunk/formats/format_sln.c (original)
+++ trunk/formats/format_sln.c Sun Feb 19 12:30:38 2006
@@ -172,7 +172,6 @@
 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 @@
 	}
 	/* 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)