From: Kevin P. Fleming Date: Thu, 5 Jan 2006 00:19:18 +0000 (+0000) Subject: Merged revisions 7807 via svnmerge from X-Git-Tag: 1.4.0-beta1~3068 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e9180d0a8fc26b0b91ea9b1b54af6f244c3104d;p=thirdparty%2Fasterisk.git 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 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7808 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 87363239d6..1de3d166f7 100644 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -179,7 +179,8 @@ static int pcm_seek(struct ast_filestream *fs, long sample_offset, int whence) 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: diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c index b26796bdab..a738cf07b0 100644 --- a/formats/format_pcm_alaw.c +++ b/formats/format_pcm_alaw.c @@ -254,7 +254,8 @@ static int pcm_seek(struct ast_filestream *fs, long sample_offset, int whence) 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: