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

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

diff --git a/formats/format_g719.c b/formats/format_g719.c
index 81662d521a8de8c1d006dd351c393ae7c024f616..29cfa367f1c067fc5e0b9dca0934bc7d74685019 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 4d1c2cd56f1806d0719d5252e5783c43831e8305..520f6aea49a6dfc3a6a0efe2e8b408fa17932b29 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 5863ccec83797ed5e73f90f03ca470cf1682c493..d0f0b4771f8edb43fe86b24d812b588d03f46e94 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 a8b70e56e78f1aedb85140bbaf12a8d41bbe44c4..5e534901e6eb263121278a76f0da201b1629f52d 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 757437c8a6ad8d9e14e3e828e683247bffaf22bf..8167b5effa2b7bf0457a4ada1e945ea6502ca0e4 100644 (file)
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -156,7 +156,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 84e94aa7a57bedbca5f8d2161d64082827142056..ab22f4779a31fc884c2059a19c92c9ce44626127 100644 (file)
--- a/formats/format_h264.c
+++ b/formats/format_h264.c
@@ -145,7 +145,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 b7673d8ef0fc36e124f76090a6e1925751c0db01..8f5aad0e1ac8da19c23ea2364900681e979e33ed 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 4ff42f9626439c549226d967c3a51f751cbc6785..49807f8d1cb4d0af32a5bb3a1266fe394e8497a0 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 e6cb3ec07142cc21298caccf234c0ab42a1f477f..4a65146cb62c22dadf4a9846f96fb7d1fcd78be2 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 1f361e1da2ae8febec7c8a862bda9450d4a37e6e..b6646c3da400c69455f14849bf2bafa3300ad9d7 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 2a318f865597d010cbd144f1a3f1cc6a7963b995..fc74f00e38113ac2161b1411a483fc4e5d47f89b 100644 (file)
--- a/formats/format_sln.c
+++ b/formats/format_sln.c
@@ -118,7 +118,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_sln16.c b/formats/format_sln16.c
index 1836fa5a26872b0189dd7b61f8e1001183e1b3cc..782f5564e820cd3a7f9bb697062596fcb9200491 100644 (file)
--- a/formats/format_sln16.c
+++ b/formats/format_sln16.c
@@ -122,7 +122,7 @@ static int slinear_trunc(struct ast_filestream *fs)
                ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for sln16 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 sln16 filestream %p: %s\n", fs, strerror(errno));
                return -1;
        }

diff --git a/formats/format_vox.c b/formats/format_vox.c
index 3fd2504cb24722d7550964604e787fb00b0b3d3f..457c3c65ed18abfd339fb41fedb471d84e0c0309 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 f78ade4600d1a867963d04eb595f18a86159ec5e..4453955d664e9d091d8830af1591dbd12a92c715 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 4b13110d53de5a5a033c8f935d49fd0ee9a3dee8..cf7e05644aed49ec2f3dd43035d04513530ab1e5 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;
        }