Switch out use of std::string and std::vector for large allocations for a buffer class that doesn...

courgette/courgette_tool.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
 #include <vector>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 284 matching lines @@
   FilePath old_path(old_file);
   FilePath patch_path(patch_file);
   FilePath new_path(new_file);
 #else
   FilePath old_path(WideToASCII(old_file));
   FilePath patch_path(WideToASCII(patch_file));
   FilePath new_path(WideToASCII(new_file));
 #endif
 
   courgette::Status status =
-    courgette::ApplyEnsemblePatch(old_path.value().c_str(),
-                                  patch_path.value().c_str(),
-                                  new_path.value().c_str());
+      courgette::ApplyEnsemblePatch(old_path.value().c_str(),
+                                    patch_path.value().c_str(),
+                                    new_path.value().c_str());
 
   if (status == courgette::C_OK)
     return;
 
   // Diagnose the error.
-  if (status == courgette::C_BAD_ENSEMBLE_MAGIC)
-    Problem("Not a courgette patch");
-  if (status == courgette::C_BAD_ENSEMBLE_VERSION)
-    Problem("Wrong version patch");
-  if (status == courgette::C_BAD_ENSEMBLE_HEADER)
-    Problem("Corrupt patch");
+  switch (status) {
+    case courgette::C_BAD_ENSEMBLE_MAGIC:
+      Problem("Not a courgette patch");
+      break;
+
+    case courgette::C_BAD_ENSEMBLE_VERSION:
+      Problem("Wrong version patch");
+      break;
+
+    case courgette::C_BAD_ENSEMBLE_HEADER:
+      Problem("Corrupt patch");
+      break;
+
+    case courgette::C_DISASSEMBLY_FAILED:
+      Problem("Disassembly failed (could be because of memory issues)");
+      break;
+
+    case courgette::C_STREAM_ERROR:
+      Problem("Stream error (likely out of memory or disk space)");
+      break;
+
+    default:
+      break;
+  }
+
   //  If we failed due to a missing input file, this will
   // print the message.
   std::string old_buffer = ReadOrFail(old_file, "'old' input");
   old_buffer.clear();
   std::string patch_buffer = ReadOrFail(patch_file, "'patch' input");
   patch_buffer.clear();
 
   // Non-input related errors:
   if (status == courgette::C_WRITE_OPEN_ERROR)
     Problem("Can't open output");
@@ skipping 124 matching lines @@
     } else if (cmd_spread_1_adjusted || cmd_spread_1_unadjusted) {
       if (values.size() != 3)
         UsageProblem("-gen1[au] <old_file> <new_file> <patch_files_root>");
       DisassembleAdjustDiff(values[0], values[1], values[2],
                             cmd_spread_1_adjusted);
     } else {
       UsageProblem("No operation specified");
     }
   }
 }