[svn-commits] mjordan: trunk r364580 - in /trunk: ./ formats/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sun Apr 29 14:51:01 CDT 2012
Author: mjordan
Date: Sun Apr 29 14:50:57 2012
New Revision: 364580
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=364580
Log:
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
........
Merged revisions 364579 from http://svn.asterisk.org/svn/asterisk/branches/10
Modified:
trunk/ (props changed)
trunk/formats/format_g719.c
trunk/formats/format_g723.c
trunk/formats/format_g729.c
trunk/formats/format_gsm.c
trunk/formats/format_h263.c
trunk/formats/format_h264.c
trunk/formats/format_ilbc.c
trunk/formats/format_pcm.c
trunk/formats/format_siren14.c
trunk/formats/format_siren7.c
trunk/formats/format_sln.c
trunk/formats/format_vox.c
trunk/formats/format_wav.c
trunk/formats/format_wav_gsm.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.
Modified: trunk/formats/format_g719.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_g719.c?view=diff&rev=364580&r1=364579&r2=364580
==============================================================================
--- trunk/formats/format_g719.c (original)
+++ trunk/formats/format_g719.c Sun Apr 29 14:50:57 2012
@@ -122,7 +122,7 @@
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;
}
Modified: trunk/formats/format_g723.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_g723.c?view=diff&rev=364580&r1=364579&r2=364580
==============================================================================
--- trunk/formats/format_g723.c (original)
+++ trunk/formats/format_g723.c Sun Apr 29 14:50:57 2012
@@ -125,7 +125,7 @@
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;
}
Modified: trunk/formats/format_g729.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_g729.c?view=diff&rev=364580&r1=364579&r2=364580
==============================================================================
--- trunk/formats/format_g729.c (original)
+++ trunk/formats/format_g729.c Sun Apr 29 14:50:57 2012
@@ -120,7 +120,7 @@
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;
}
Modified: trunk/formats/format_gsm.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_gsm.c?view=diff&rev=364580&r1=364579&r2=364580
==============================================================================
--- trunk/formats/format_gsm.c (original)
+++ trunk/formats/format_gsm.c Sun Apr 29 14:50:57 2012
@@ -160,7 +160,7 @@
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;
}
Modified: trunk/formats/format_h263.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_h263.c?view=diff&rev=364580&r1=364579&r2=364580
==============================================================================
--- trunk/formats/format_h263.c (original)
+++ trunk/formats/format_h263.c Sun Apr 29 14:50:57 2012
@@ -153,7 +153,7 @@
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;
}
Modified: trunk/formats/format_h264.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_h264.c?view=diff&rev=364580&r1=364579&r2=364580
==============================================================================
--- trunk/formats/format_h264.c (original)
+++ trunk/formats/format_h264.c Sun Apr 29 14:50:57 2012
@@ -146,7 +146,7 @@
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;
}
Modified: trunk/formats/format_ilbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_ilbc.c?view=diff&rev=364580&r1=364579&r2=364580
==============================================================================
--- trunk/formats/format_ilbc.c (original)
+++ trunk/formats/format_ilbc.c Sun Apr 29 14:50:57 2012
@@ -118,7 +118,7 @@
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;
}
Modified: trunk/formats/format_pcm.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_pcm.c?view=diff&rev=364580&r1=364579&r2=364580
==============================================================================
--- trunk/formats/format_pcm.c (original)
+++ trunk/formats/format_pcm.c Sun Apr 29 14:50:57 2012
@@ -168,7 +168,7 @@
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 @@
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;
}
Modified: trunk/formats/format_siren14.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_siren14.c?view=diff&rev=364580&r1=364579&r2=364580
==============================================================================
--- trunk/formats/format_siren14.c (original)
+++ trunk/formats/format_siren14.c Sun Apr 29 14:50:57 2012
@@ -122,7 +122,7 @@
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;
}
Modified: trunk/formats/format_siren7.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_siren7.c?view=diff&rev=364580&r1=364579&r2=364580
==============================================================================
--- trunk/formats/format_siren7.c (original)
+++ trunk/formats/format_siren7.c Sun Apr 29 14:50:57 2012
@@ -122,7 +122,7 @@
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;
}
Modified: trunk/formats/format_sln.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_sln.c?view=diff&rev=364580&r1=364579&r2=364580
==============================================================================
--- trunk/formats/format_sln.c (original)
+++ trunk/formats/format_sln.c Sun Apr 29 14:50:57 2012
@@ -114,7 +114,7 @@
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;
}
Modified: trunk/formats/format_vox.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_vox.c?view=diff&rev=364580&r1=364579&r2=364580
==============================================================================
--- trunk/formats/format_vox.c (original)
+++ trunk/formats/format_vox.c Sun Apr 29 14:50:57 2012
@@ -120,7 +120,7 @@
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;
}
Modified: trunk/formats/format_wav.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_wav.c?view=diff&rev=364580&r1=364579&r2=364580
==============================================================================
--- trunk/formats/format_wav.c (original)
+++ trunk/formats/format_wav.c Sun Apr 29 14:50:57 2012
@@ -496,7 +496,7 @@
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;
}
Modified: trunk/formats/format_wav_gsm.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_wav_gsm.c?view=diff&rev=364580&r1=364579&r2=364580
==============================================================================
--- trunk/formats/format_wav_gsm.c (original)
+++ trunk/formats/format_wav_gsm.c Sun Apr 29 14:50:57 2012
@@ -530,7 +530,7 @@
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;
}
More information about the svn-commits
mailing list