clang compiler warnings: Fix -Wself-assign

Assigning a variable to itself isn't super useful. However, the WAV format
modules make use of this in order to perform byte endian checks. This patch
works around the warning by only performing the self assignment if we are
going to do more than just assign it to ourselves. Which is odd, but true.

ASTERISK-24917
Reported by: dkdegroot
patches:
  rb4544.patch submitted by dkdegroot (License 6600)

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

diff --git a/formats/format_wav.c b/formats/format_wav.c
index 06d6ae12de7ff9ff85b7e5ac69ed36310cc277e6..5418ea0b02dac99430bab8ebf414ec64fb916c79 100644 (file)
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -61,14 +61,14 @@ struct wav_desc {   /* format-specific parameters */
 #define ltohs(b) (b)
 #else
 #if __BYTE_ORDER == __BIG_ENDIAN
-#define htoll(b)  \
-          (((((b)      ) & 0xFF) << 24) | \
-              ((((b) >>  8) & 0xFF) << 16) | \
-                  ((((b) >> 16) & 0xFF) <<  8) | \
-                  ((((b) >> 24) & 0xFF)      ))
+#define htoll(b) \
+       (((((b)      ) & 0xFF) << 24) | \
+       ((( (b) >>  8) & 0xFF) << 16) | \
+       ((( (b) >> 16) & 0xFF) <<  8) | \
+       ((( (b) >> 24) & 0xFF)      ))
 #define htols(b) \
-          (((((b)      ) & 0xFF) << 8) | \
-                  ((((b) >> 8) & 0xFF)      ))
+       (((((b)      ) & 0xFF) <<  8) | \
+       ((( (b) >>  8) & 0xFF)      ))
 #define ltohl(b) htoll(b)
 #define ltohs(b) htols(b)
 #else
@@ -107,8 +107,8 @@ static int check_header_fmt(FILE *f, int hsize, int hz)
                return -1;
        }
        if (((ltohl(freq) != 8000) && (ltohl(freq) != 16000)) ||
-           ((ltohl(freq) == 8000) && (hz != 8000)) ||
-           ((ltohl(freq) == 16000) && (hz != 16000))) {
+               ((ltohl(freq) == 8000) && (hz != 8000)) ||
+               ((ltohl(freq) == 16000) && (hz != 16000))) {
                ast_log(LOG_WARNING, "Unexpected frequency mismatch %d (expecting %d)\n", ltohl(freq),hz);
                return -1;
        }
@@ -150,7 +150,9 @@ static int check_header(FILE *f, int hz)
                ast_log(LOG_WARNING, "Read failed (size)\n");
                return -1;
        }
+#if __BYTE_ORDER == __BIG_ENDIAN
        size = ltohl(size);
+#endif
        if (fread(&formtype, 1, 4, f) != 4) {
                ast_log(LOG_WARNING, "Read failed (formtype)\n");
                return -1;
@@ -167,30 +169,32 @@ static int check_header(FILE *f, int hz)
        for(;;)
        { 
                char buf[4];
-           
-           /* Begin data chunk */
-           if (fread(&buf, 1, 4, f) != 4) {
+               
+               /* Begin data chunk */
+               if (fread(&buf, 1, 4, f) != 4) {
                        ast_log(LOG_WARNING, "Read failed (block header format)\n");
                        return -1;
-           }
-           /* Data has the actual length of data in it */
-           if (fread(&data, 1, 4, f) != 4) {
+               }
+               /* Data has the actual length of data in it */
+               if (fread(&data, 1, 4, f) != 4) {
                        ast_log(LOG_WARNING, "Read failed (block '%.4s' header length)\n", buf);
                        return -1;
-           }
-           data = ltohl(data);
+               }
+#if __BYTE_ORDER == __BIG_ENDIAN
+               data = ltohl(data);
+#endif
                if (memcmp(&buf, "fmt ", 4) == 0) {
                        if (check_header_fmt(f, data, hz))
                                return -1;
                        continue;
                }
-           if(memcmp(buf, "data", 4) == 0 ) 
+               if(memcmp(buf, "data", 4) == 0 ) 
                        break;
                ast_log(LOG_DEBUG, "Skipping unknown block '%.4s'\n", buf);
-           if (fseek(f,data,SEEK_CUR) == -1 ) {
+               if (fseek(f,data,SEEK_CUR) == -1 ) {
                        ast_log(LOG_WARNING, "Failed to skip '%.4s' block: %d\n", buf, data);
                        return -1;
-           }
+               }
        }
 #if 0
        curpos = lseek(fd, 0, SEEK_CUR);
@@ -473,13 +477,14 @@ static int wav_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
                return -1;
        }
 
-       if (whence == SEEK_SET)
+       if (whence == SEEK_SET) {
                offset = samples + min;
-       else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
+       } else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) {
                offset = samples + cur;
-       else if (whence == SEEK_END)
+       } else if (whence == SEEK_END) {
                offset = max - samples;
-        if (whence != SEEK_FORCECUR) {
+       }
+       if (whence != SEEK_FORCECUR) {
                offset = (offset > max)?max:offset;
        }
        /* always protect the header space. */

diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index f08e9ce21e1895c6cc18b5d05a4ef3084a4a9706..a559c83a5942275cdf6999f435ed2bcaf8c61346 100644 (file)
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -73,14 +73,14 @@ struct wavg_desc {
 #define ltohs(b) (b)
 #else
 #if __BYTE_ORDER == __BIG_ENDIAN
-#define htoll(b)  \
-          (((((b)      ) & 0xFF) << 24) | \
-              ((((b) >>  8) & 0xFF) << 16) | \
-                  ((((b) >> 16) & 0xFF) <<  8) | \
-                  ((((b) >> 24) & 0xFF)      ))
+#define htoll(b) \
+       (((((b)      ) & 0xFF) << 24) | \
+       ((( (b) >>  8) & 0xFF) << 16) | \
+       ((( (b) >> 16) & 0xFF) <<  8) | \
+       ((( (b) >> 24) & 0xFF)      ))
 #define htols(b) \
-          (((((b)      ) & 0xFF) << 8) | \
-                  ((((b) >> 8) & 0xFF)      ))
+       (((((b)      ) & 0xFF) <<  8) | \
+       ((( (b) >>  8) & 0xFF)      ))
 #define ltohl(b) htoll(b)
 #define ltohs(b) htols(b)
 #else
@@ -104,7 +104,9 @@ static int check_header(FILE *f)
                ast_log(LOG_WARNING, "Read failed (size)\n");
                return -1;
        }
+#if __BYTE_ORDER == __BIG_ENDIAN
        size = ltohl(size);
+#endif
        if (fread(&formtype, 1, 4, f) != 4) {
                ast_log(LOG_WARNING, "Read failed (formtype)\n");
                return -1;