commit b309e983c8ee0dba539b9bbd2f40a5b79eb77f22
author Wan-Teh Chang <wtc@google.com> Sat Feb 20 16:59:36 2021 -0800
committer GitHub <noreply@github.com> Sat Feb 20 16:59:36 2021 -0800
tree 841952777cbf1fabb24aaef5f0640bd54f3f08a4
parent 6a2c5ea56cbe16ea2a9fdfbd3490d7993f1323f9

Chain a series of memcmp() calls using else if (#509)

Chain a series of memcmp() calls on irefHeader.type in
avifParseItemReferenceBox() using else if.

Remove a pair of unneeded parentheses around two memcmp() calls in
avifParse().

src/read.c

diff --git a/src/read.c b/src/read.c
index f7e8f33..44ee044 100644
--- a/src/read.c
+++ b/src/read.c
@@ -1678,14 +1678,11 @@
 
                 if (!memcmp(irefHeader.type, "thmb", 4)) {
                     item->thumbnailForID = toID;
-                }
-                if (!memcmp(irefHeader.type, "auxl", 4)) {
+                } else if (!memcmp(irefHeader.type, "auxl", 4)) {
                     item->auxForID = toID;
-                }
-                if (!memcmp(irefHeader.type, "cdsc", 4)) {
+                } else if (!memcmp(irefHeader.type, "cdsc", 4)) {
                     item->descForID = toID;
-                }
-                if (!memcmp(irefHeader.type, "dimg", 4)) {
+                } else if (!memcmp(irefHeader.type, "dimg", 4)) {
                     // derived images refer in the opposite direction
                     avifDecoderItem * dimg = avifMetaFindItem(meta, toID);
                     if (!dimg) {
@@ -1693,8 +1690,7 @@
                     }
 
                     dimg->dimgForID = fromID;
-                }
-                if (!memcmp(irefHeader.type, "prem", 4)) {
+                } else if (!memcmp(irefHeader.type, "prem", 4)) {
                     item->premByID = toID;
                 }
             }
@@ -2145,7 +2141,7 @@
         avifROData boxContents = AVIF_DATA_EMPTY;
 
         // TODO: reorg this code to only do these memcmps once each
-        if (!memcmp(header.type, "ftyp", 4) || (!memcmp(header.type, "meta", 4) || !memcmp(header.type, "moov", 4))) {
+        if (!memcmp(header.type, "ftyp", 4) || !memcmp(header.type, "meta", 4) || !memcmp(header.type, "moov", 4)) {
             readResult = decoder->io->read(decoder->io, 0, parseOffset, header.size, &boxContents);
             if (readResult != AVIF_RESULT_OK) {
                 return readResult;