[svn-commits] trunk - r7808 in /trunk: ./ formats/format_pcm.c formats/format_pcm_alaw.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Wed Jan  4 18:19:18 2006
New Revision: 7808

URL: http://svn.digium.com/view/asterisk?rev=7808&view=rev
Log:
Merged revisions 7807 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7807 | kpfleming | 2006-01-04 18:18:46 -0600 (Wed, 04 Jan 2006) | 2 lines

doh... fseek() has no useful return value

........

Modified:
    trunk/   (props changed)
    trunk/formats/format_pcm.c
    trunk/formats/format_pcm_alaw.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan  4 18:19:18 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7489,7491-7496,7498-7516,7518-7528,7530-7545,7547-7549,7551,7553-7556,7558-7579,7581-7585,7587-7594,7596-7604,7606-7640,7642-7662,7664-7705,7707-7737,7739-7770,7772-7791,7793-7805
+/branches/1.2:1-7489,7491-7496,7498-7516,7518-7528,7530-7545,7547-7549,7551,7553-7556,7558-7579,7581-7585,7587-7594,7596-7604,7606-7640,7642-7662,7664-7705,7707-7737,7739-7770,7772-7791,7793-7807

Modified: trunk/formats/format_pcm.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_pcm.c?rev=7808&r1=7807&r2=7808&view=diff
==============================================================================
--- trunk/formats/format_pcm.c (original)
+++ trunk/formats/format_pcm.c Wed Jan  4 18:19:18 2006
@@ -179,7 +179,8 @@
 	long cur, max, offset;
 
 	cur = ftell(fs->f);
-	max = fseek(fs->f, 0, SEEK_END);
+	fseek(fs->f, 0, SEEK_END);
+	max = ftell(fs->f);
 
 	switch (whence) {
 	case SEEK_SET:

Modified: trunk/formats/format_pcm_alaw.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_pcm_alaw.c?rev=7808&r1=7807&r2=7808&view=diff
==============================================================================
--- trunk/formats/format_pcm_alaw.c (original)
+++ trunk/formats/format_pcm_alaw.c Wed Jan  4 18:19:18 2006
@@ -254,7 +254,8 @@
 	long cur, max, offset;
 
 	cur = ftell(fs->f);
-	max = fseek(fs->f, 0, SEEK_END);
+	fseek(fs->f, 0, SEEK_END);
+	max = ftell(fs->f);
 
 	switch (whence) {
 	case SEEK_SET: