]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 7807 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Thu, 5 Jan 2006 00:19:18 +0000 (00:19 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Thu, 5 Jan 2006 00:19:18 +0000 (00:19 +0000)
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

formats/format_pcm.c
formats/format_pcm_alaw.c

index 87363239d6e248204762bded233ff184c9740dd4..1de3d166f70bb80e0c31afb062d9f771968b8328 100644 (file)
@@ -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:
index b26796bdab169ee395c6bf027fe4745e4ea0d16b..a738cf07b08581c619cf11a27d559fbcd6e7814c 100644 (file)
@@ -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: