From 12b560adc27a07bb6ae5d73b5e3ca4f18f8cf0c3 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Tue, 20 Oct 2015 14:02:29 +0200
Subject: [PATCH] EbmlMaster.cpp: unwrap huge if; fix indentation

---
 src/EbmlMaster.cpp | 201 +++++++++++++++++++++++----------------------
 1 file changed, 102 insertions(+), 99 deletions(-)

diff --git a/src/EbmlMaster.cpp b/src/EbmlMaster.cpp
index b8213c7..9f2d6b9 100644
--- a/src/EbmlMaster.cpp
+++ b/src/EbmlMaster.cpp
@@ -398,107 +398,110 @@ void EbmlMaster::Sort()
 */
 void EbmlMaster::Read(EbmlStream & inDataStream, const EbmlSemanticContext & sContext, int & UpperEltFound, EbmlElement * & FoundElt, bool AllowDummyElt, ScopeMode ReadFully)
 {
-  if (ReadFully != SCOPE_NO_DATA)
-  {
-    EbmlElement * ElementLevelA;
-    // remove all existing elements, including the mandatory ones...
-    size_t Index;
-    for (Index=0; Index<ElementList.size(); Index++) {
-      if (!(*ElementList[Index]).IsLocked()) {
-        delete ElementList[Index];
-      }
+  if (ReadFully == SCOPE_NO_DATA)
+    return;
+
+  EbmlElement * ElementLevelA;
+  // remove all existing elements, including the mandatory ones...
+  size_t Index;
+  for (Index=0; Index<ElementList.size(); Index++) {
+    if (!(*ElementList[Index]).IsLocked()) {
+      delete ElementList[Index];
     }
-    ElementList.clear();
-    uint64 MaxSizeToRead;
-
-    if (IsFiniteSize())
-      MaxSizeToRead = GetSize();
-    else
-      MaxSizeToRead = 0x7FFFFFFF;
-
-    // read blocks and discard the ones we don't care about
-    if (MaxSizeToRead > 0)
-    {
-      inDataStream.I_O().setFilePointer(GetSizePosition() + GetSizeLength(), seek_beginning);
-      ElementLevelA = inDataStream.FindNextElement(sContext, UpperEltFound, MaxSizeToRead, AllowDummyElt);
-      while (ElementLevelA != NULL && UpperEltFound <= 0 && MaxSizeToRead > 0) {
-        if (IsFiniteSize() && ElementLevelA->IsFiniteSize())
-          MaxSizeToRead = GetEndPosition() - ElementLevelA->GetEndPosition(); // even if it's the default value
-        if (!AllowDummyElt && ElementLevelA->IsDummy()) {
-          if (ElementLevelA->IsFiniteSize()) {
-            ElementLevelA->SkipData(inDataStream, sContext);
-            delete ElementLevelA; // forget this unknown element
-          } else {
-            delete ElementLevelA; // forget this unknown element
-            break;
-          }
-        } else {
-          ElementLevelA->Read(inDataStream, EBML_CONTEXT(ElementLevelA), UpperEltFound, FoundElt, AllowDummyElt, ReadFully);
-
-          // Discard elements that couldn't be read properly if
-          // SCOPE_ALL_DATA has been requested. This can happen
-          // e.g. if block data is defective.
-          bool DeleteElement = true;
-
-          if (ElementLevelA->ValueIsSet() || (ReadFully != SCOPE_ALL_DATA)) {
-            ElementList.push_back(ElementLevelA);
-            DeleteElement = false;
-          }
-
-          // just in case
-          if (ElementLevelA->IsFiniteSize()) {
-            ElementLevelA->SkipData(inDataStream, EBML_CONTEXT(ElementLevelA));
-            if (DeleteElement)
-              delete ElementLevelA;
-          } else {
-            if (DeleteElement)
-              delete ElementLevelA;
-            break;
-          }
-        }
-
-        if (UpperEltFound > 0) {
-          UpperEltFound--;
-          if (UpperEltFound > 0 || MaxSizeToRead <= 0)
-            goto processCrc;
-          ElementLevelA = FoundElt;
-          continue;
-        }
-
-        if (UpperEltFound < 0) {
-          UpperEltFound++;
-          if (UpperEltFound < 0)
-            goto processCrc;
-        }
-
-        if (MaxSizeToRead <= 0)
-          goto processCrc;// this level is finished
-
-        ElementLevelA = inDataStream.FindNextElement(sContext, UpperEltFound, MaxSizeToRead, AllowDummyElt);
-      }
-      if (UpperEltFound > 0) {
-        FoundElt = ElementLevelA;
-      }
-    }
-  processCrc:
-        EBML_MASTER_ITERATOR Itr, CrcItr;
-        for (Itr = ElementList.begin(); Itr != ElementList.end();) {
-      if ((EbmlId)(*(*Itr)) == EBML_ID(EbmlCrc32)) {
-        bChecksumUsed = true;
-        // remove the element
-        Checksum = *(static_cast<EbmlCrc32*>(*Itr));
-                CrcItr = Itr;
-                break;
-      }
-            ++Itr;
-    }
-        if (bChecksumUsed)
-        {
-        delete *CrcItr;
-        Remove(CrcItr);
-        }
-    SetValueIsSet();
   }
+  ElementList.clear();
+  uint64 MaxSizeToRead;
+
+  if (IsFiniteSize())
+    MaxSizeToRead = GetSize();
+  else
+    MaxSizeToRead = 0x7FFFFFFF;
+
+  // read blocks and discard the ones we don't care about
+  if (MaxSizeToRead > 0)
+  {
+    inDataStream.I_O().setFilePointer(GetSizePosition() + GetSizeLength(), seek_beginning);
+    ElementLevelA = inDataStream.FindNextElement(sContext, UpperEltFound, MaxSizeToRead, AllowDummyElt);
+    while (ElementLevelA != NULL && UpperEltFound <= 0 && MaxSizeToRead > 0) {
+      if (IsFiniteSize() && ElementLevelA->IsFiniteSize())
+        MaxSizeToRead = GetEndPosition() - ElementLevelA->GetEndPosition(); // even if it's the default value
+      if (!AllowDummyElt && ElementLevelA->IsDummy()) {
+        if (ElementLevelA->IsFiniteSize()) {
+          ElementLevelA->SkipData(inDataStream, sContext);
+          delete ElementLevelA; // forget this unknown element
+        } else {
+          delete ElementLevelA; // forget this unknown element
+          break;
+        }
+      } else {
+        ElementLevelA->Read(inDataStream, EBML_CONTEXT(ElementLevelA), UpperEltFound, FoundElt, AllowDummyElt, ReadFully);
+
+        // Discard elements that couldn't be read properly if
+        // SCOPE_ALL_DATA has been requested. This can happen
+        // e.g. if block data is defective.
+        bool DeleteElement = true;
+
+        if (ElementLevelA->ValueIsSet() || (ReadFully != SCOPE_ALL_DATA)) {
+          ElementList.push_back(ElementLevelA);
+          DeleteElement = false;
+        }
+
+        // just in case
+        if (ElementLevelA->IsFiniteSize()) {
+          ElementLevelA->SkipData(inDataStream, EBML_CONTEXT(ElementLevelA));
+          if (DeleteElement)
+            delete ElementLevelA;
+        } else {
+          if (DeleteElement)
+            delete ElementLevelA;
+          break;
+        }
+      }
+
+      if (UpperEltFound > 0) {
+        UpperEltFound--;
+        if (UpperEltFound > 0 || MaxSizeToRead <= 0)
+          goto processCrc;
+        ElementLevelA = FoundElt;
+        continue;
+      }
+
+      if (UpperEltFound < 0) {
+        UpperEltFound++;
+        if (UpperEltFound < 0)
+          goto processCrc;
+      }
+
+      if (MaxSizeToRead <= 0)
+        goto processCrc;// this level is finished
+
+      ElementLevelA = inDataStream.FindNextElement(sContext, UpperEltFound, MaxSizeToRead, AllowDummyElt);
+    }
+    if (UpperEltFound > 0) {
+      FoundElt = ElementLevelA;
+    }
+  }
+processCrc:
+
+  EBML_MASTER_ITERATOR Itr, CrcItr;
+  for (Itr = ElementList.begin(); Itr != ElementList.end();) {
+    if ((EbmlId)(*(*Itr)) == EBML_ID(EbmlCrc32)) {
+      bChecksumUsed = true;
+      // remove the element
+      Checksum = *(static_cast<EbmlCrc32*>(*Itr));
+      CrcItr = Itr;
+      break;
+    }
+    ++Itr;
+  }
+
+  if (bChecksumUsed)
+  {
+    delete *CrcItr;
+    Remove(CrcItr);
+  }
+
+  SetValueIsSet();
 }
 
 void EbmlMaster::Remove(size_t Index)