Fix error that caused truncate operations to fail

Another very inappropriate placement of a ')' (again introduced in r362151)
caused the various truncate operations to attempt to truncate the sound file
at a position of '0'.

(issue ASTERISK-19655)
Reported by: Matt Jordan

(issue ASTERISK-19810)
Reported by: colbec
........

Merged revisions 364578 from http://svn.asterisk.org/svn/asterisk/branches/1.8

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@364579 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/formats/format_g719.c b/formats/format_g719.c
index 0a0eea17039351b284047791403db95328b986af..ee9221230de75847886eda8a02ee085d3dd16520 100644 (file)
--- a/formats/format_g719.c
+++ b/formats/format_g719.c
@@ -122,7 +122,7 @@ static int g719trunc(struct ast_filestream *fs)
                ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for g719 filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }
-       if ((cur = ftello(fs->f) < 0)) {
+       if ((cur = ftello(fs->f)) < 0) {
                ast_log(AST_LOG_WARNING, "Unable to determine current position in g719 filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }

diff --git a/formats/format_g723.c b/formats/format_g723.c
index b3e87367e36353b5947ec6b7648f6db1711b2bd9..c3c194d1528a673e492a29fd371faa3e674557e6 100644 (file)
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -125,7 +125,7 @@ static int g723_trunc(struct ast_filestream *fs)
                ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for g723 filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }
-       if ((cur = ftello(fs->f) < 0)) {
+       if ((cur = ftello(fs->f)) < 0) {
                ast_log(AST_LOG_WARNING, "Unable to determine current position in g723 filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }

diff --git a/formats/format_g729.c b/formats/format_g729.c
index 477883f179ef94b9e222675fc1c8447896b85bbc..f11fa97d969f099a47afb0c1395db5018c7eb8ff 100644 (file)
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -120,7 +120,7 @@ static int g729_trunc(struct ast_filestream *fs)
                ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for g729 filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }
-       if ((cur = ftello(fs->f) < 0)) {
+       if ((cur = ftello(fs->f)) < 0) {
                ast_log(AST_LOG_WARNING, "Unable to determine current position in g729 filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }

diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index 26306806c2fe504ebe815ba50a89f42f8ffd1417..47ed41c3ad8a213862c66c102f77cfd28eb8326c 100644 (file)
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -160,7 +160,7 @@ static int gsm_trunc(struct ast_filestream *fs)
                ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for gsm filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }
-       if ((cur = ftello(fs->f) < 0)) {
+       if ((cur = ftello(fs->f)) < 0) {
                ast_log(AST_LOG_WARNING, "Unable to determine current position in gsm filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }

diff --git a/formats/format_h263.c b/formats/format_h263.c
index 1e820bf212ee08f809c933b5f98422dc02d68415..bf7d167fd1d0e7b0f897ad13e42771d5d5c4d001 100644 (file)
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -154,7 +154,7 @@ static int h263_trunc(struct ast_filestream *fs)
                ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for h263 filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }
-       if ((cur = ftello(fs->f) < 0)) {
+       if ((cur = ftello(fs->f)) < 0) {
                ast_log(AST_LOG_WARNING, "Unable to determine current position in h263 filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }

diff --git a/formats/format_h264.c b/formats/format_h264.c
index 25ba54a77c6fbb34b41989982e2bacc11456505d..3f8c42ed1b0a74d526e7efad0617d394b214c8b8 100644 (file)
--- a/formats/format_h264.c
+++ b/formats/format_h264.c
@@ -147,7 +147,7 @@ static int h264_trunc(struct ast_filestream *fs)
                ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for h264 filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }
-       if ((cur = ftello(fs->f) < 0)) {
+       if ((cur = ftello(fs->f)) < 0) {
                ast_log(AST_LOG_WARNING, "Unable to determine current position in h264 filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }

diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c
index e18c78ab1b6b3adfbd25956715948c0a1a12417c..07155b717df96cc153c32c9f534223c0a64f8fdd 100644 (file)
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -118,7 +118,7 @@ static int ilbc_trunc(struct ast_filestream *fs)
                ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for iLBC filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }
-       if ((cur = ftello(fs->f) < 0)) {
+       if ((cur = ftello(fs->f)) < 0) {
                ast_log(AST_LOG_WARNING, "Unable to determine current position in iLBC filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }

diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index f65a6202f809f79e0be60343d767de5663c4eb37..b763b55925ad7c48f8520203eb1238c95feee229 100644 (file)
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -168,7 +168,7 @@ static int pcm_trunc(struct ast_filestream *fs)
                ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for pcm filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }
-       if ((cur = ftello(fs->f) < 0)) {
+       if ((cur = ftello(fs->f)) < 0) {
                ast_log(AST_LOG_WARNING, "Unable to determine current position in pcm filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }
@@ -445,7 +445,7 @@ static int au_trunc(struct ast_filestream *fs)
                ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for au filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }
-       if ((cur = ftello(fs->f) < 0)) {
+       if ((cur = ftello(fs->f)) < 0) {
                ast_log(AST_LOG_WARNING, "Unable to determine current position in au filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }

diff --git a/formats/format_siren14.c b/formats/format_siren14.c
index f3e53e79556c11eb9e30a0a3375732949e5ec22f..77a9fe3efbe9f95f88b8ff25315d1af9d57c4dac 100644 (file)
--- a/formats/format_siren14.c
+++ b/formats/format_siren14.c
@@ -122,7 +122,7 @@ static int siren14trunc(struct ast_filestream *fs)
                ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for siren14 filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }
-       if ((cur = ftello(fs->f) < 0)) {
+       if ((cur = ftello(fs->f)) < 0) {
                ast_log(AST_LOG_WARNING, "Unable to determine current position in siren14 filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }

diff --git a/formats/format_siren7.c b/formats/format_siren7.c
index a07144bfc010a8be06d9866cbf8203a8d72abfcd..35e2a3460015aad527105612f4f17dfc7ad4162d 100644 (file)
--- a/formats/format_siren7.c
+++ b/formats/format_siren7.c
@@ -122,7 +122,7 @@ static int siren7trunc(struct ast_filestream *fs)
                ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for siren7 filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }
-       if ((cur = ftello(fs->f) < 0)) {
+       if ((cur = ftello(fs->f)) < 0) {
                ast_log(AST_LOG_WARNING, "Unable to determine current position in siren7 filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }

diff --git a/formats/format_sln.c b/formats/format_sln.c
index 982054459436b46c34d94d8720698e208080ba23..30a1ebe316bf43df6e13d1434cf02145ad51060a 100644 (file)
--- a/formats/format_sln.c
+++ b/formats/format_sln.c
@@ -114,7 +114,7 @@ static int slinear_trunc(struct ast_filestream *fs)
                ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for sln filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }
-       if ((cur = ftello(fs->f) < 0)) {
+       if ((cur = ftello(fs->f)) < 0) {
                ast_log(AST_LOG_WARNING, "Unable to determine current position in sln filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }

diff --git a/formats/format_vox.c b/formats/format_vox.c
index 3f3b1eabb326b596624ca31cf5fe6f41a646ec06..f640021d8b23dee685b4401cf49e03648fa09ed5 100644 (file)
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -120,7 +120,7 @@ static int vox_trunc(struct ast_filestream *fs)
                ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for vox filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }
-       if ((cur = ftello(fs->f) < 0)) {
+       if ((cur = ftello(fs->f)) < 0) {
                ast_log(AST_LOG_WARNING, "Unable to determine current position in vox filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }

diff --git a/formats/format_wav.c b/formats/format_wav.c
index ca12ca47b77d8807c5256e4e57884a1f68905844..4e2418646e56c875b070ec3479855fe518dc585a 100644 (file)
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -496,7 +496,7 @@ static int wav_trunc(struct ast_filestream *fs)
                ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for wav filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }
-       if ((cur = ftello(fs->f) < 0)) {
+       if ((cur = ftello(fs->f)) < 0) {
                ast_log(AST_LOG_WARNING, "Unable to determine current position in wav filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }

diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index e4c5051a29aa1f4262e58747a30395a9817e49f3..f08e9ce21e1895c6cc18b5d05a4ef3084a4a9706 100644 (file)
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -530,7 +530,7 @@ static int wav_trunc(struct ast_filestream *fs)
                ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for WAV filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }
-       if ((cur = ftello(fs->f) < 0)) {
+       if ((cur = ftello(fs->f)) < 0) {
                ast_log(AST_LOG_WARNING, "Unable to determine current position in WAV filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }