From: Matthew Nicholson Date: Wed, 9 Nov 2011 15:26:50 +0000 (+0000) Subject: don't call ltohl() twice on the same value X-Git-Tag: 10.1.0-rc1~111 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf5149dd315cefd3e55b649fc780ab5e904b1f9a;p=thirdparty%2Fasterisk.git don't call ltohl() twice on the same value ASTERISK-18739 Patch by: pawel (modified) ........ Merged revisions 344048 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@344049 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/formats/format_wav.c b/formats/format_wav.c index 956b13e307..78b3a7fa11 100644 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -81,7 +81,7 @@ static int check_header_fmt(FILE *f, int hsize, int hz) int bysec; int freq; if (hsize < 16) { - ast_log(LOG_WARNING, "Unexpected header size %d\n", ltohl(hsize)); + ast_log(LOG_WARNING, "Unexpected header size %d\n", hsize); return -1; } if (fread(&format, 1, 2, f) != 2) { @@ -129,8 +129,8 @@ static int check_header_fmt(FILE *f, int hsize, int hz) return -1; } /* Skip any additional header */ - if (fseek(f,ltohl(hsize)-16,SEEK_CUR) == -1 ) { - ast_log(LOG_WARNING, "Failed to skip remaining header bytes: %d\n", ltohl(hsize)-16 ); + if (fseek(f,hsize-16,SEEK_CUR) == -1 ) { + ast_log(LOG_WARNING, "Failed to skip remaining header bytes: %d\n", hsize-16 ); return -1; } return 0;