Start refactoring to reduce executable type knowledge.

courgette/ensemble_apply.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains the code to apply a Courgette patch.
 
 #include "courgette/ensemble.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
@@ skipping 118 matching lines @@
     SourceStream* transformation_parameters) {
   uint32 number_of_transformations = 0;
   if (!transformation_parameters->ReadVarint32(&number_of_transformations))
     return C_BAD_ENSEMBLE_HEADER;
 
   for (size_t i = 0;  i < number_of_transformations;  ++i) {
     uint32 kind;
     if (!transformation_parameters->ReadVarint32(&kind))
       return C_BAD_ENSEMBLE_HEADER;
 
-    if (kind == CourgettePatchFile::T_COURGETTE_WIN32_X86) {
-      TransformationPatcher* patcher =
-          new CourgetteWin32X86Patcher(base_region_);
+    TransformationPatcher* patcher = NULL;
+
+    switch (kind)
+    {
+      case CourgettePatchFile::T_COURGETTE_WIN32_X86:
+        patcher = new CourgetteWin32X86Patcher(base_region_);
+        break;
+    }
+
+    if (patcher)
       patchers_.push_back(patcher);
-    } else {
+    else
       return C_BAD_ENSEMBLE_HEADER;
-    }
   }
 
   for (size_t i = 0;  i < patchers_.size();  ++i) {
     Status status = patchers_[i]->Init(transformation_parameters);
     if (status != C_OK)
       return status;
   }
 
   // All transformation_parameters should have been consumed by the above loop.
   if (!transformation_parameters->Empty())
@@ skipping 252 matching lines @@
           static_cast<int>(new_sink_stream.Length()));
   if (written == -1)
     return C_WRITE_OPEN_ERROR;
   if (static_cast<size_t>(written) != new_sink_stream.Length())
     return C_WRITE_ERROR;
 
   return C_OK;
 }
 
 }  // namespace