don't call ltohl() twice on the same value
authorMatthew Nicholson <mnicholson@digium.com>
Wed, 9 Nov 2011 15:28:33 +0000 (15:28 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Wed, 9 Nov 2011 15:28:33 +0000 (15:28 +0000)
ASTERISK-18739
Patch by: pawel (modified)
........

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

Merged revisions 344049 from http://svn.asterisk.org/svn/asterisk/branches/10

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

formats/format_wav.c

index 956b13e..78b3a7f 100644 (file)
@@ -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;