Revert of [Courgette] Refactor: Manage AssemblyProgram and EncodedProgram with scoped_ptr.

courgette/courgette_tool.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.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "courgette/assembly_program.h"
 #include "courgette/courgette.h"
-#include "courgette/encoded_program.h"
-#include "courgette/program_detector.h"
 #include "courgette/streams.h"
 #include "courgette/third_party/bsdiff.h"
 
 
 void PrintHelp() {
   fprintf(stderr,
     "Usage:\n"
     "  courgette -supported <executable_file>\n"
     "  courgette -dis <executable_file> <binary_assembly_file>\n"
     "  courgette -asm <binary_assembly_file> <executable_file>\n"
@@ skipping 39 matching lines @@
   if (count == -1)
     Problem("Can't write output.");
   if (static_cast<size_t>(count) != sink->Length())
     Problem("Incomplete write.");
 }
 
 void Disassemble(const base::FilePath& input_file,
                  const base::FilePath& output_file) {
   std::string buffer = ReadOrFail(input_file, "input");
 
-  scoped_ptr<courgette::AssemblyProgram> program;
+  courgette::AssemblyProgram* program = NULL;
   const courgette::Status parse_status =
       courgette::ParseDetectedExecutable(buffer.c_str(), buffer.length(),
                                          &program);
+
   if (parse_status != courgette::C_OK)
     Problem("Can't parse input (code = %d).", parse_status);
 
-  scoped_ptr<courgette::EncodedProgram> encoded;
-  const courgette::Status encode_status = Encode(*program, &encoded);
+  courgette::EncodedProgram* encoded = NULL;
+  const courgette::Status encode_status = Encode(program, &encoded);
+
+  courgette::DeleteAssemblyProgram(program);
+
   if (encode_status != courgette::C_OK)
     Problem("Can't encode program.");
 
-  program.reset();
+  courgette::SinkStreamSet sinks;
 
-  courgette::SinkStreamSet sinks;
   const courgette::Status write_status =
-    courgette::WriteEncodedProgram(encoded.get(), &sinks);
+    courgette::WriteEncodedProgram(encoded, &sinks);
   if (write_status != courgette::C_OK)
     Problem("Can't serialize encoded program.");
 
-  encoded.reset();
+  courgette::DeleteEncodedProgram(encoded);
 
   courgette::SinkStream sink;
   if (!sinks.CopyTo(&sink))
     Problem("Can't combine serialized encoded program streams.");
 
   WriteSinkToFile(&sink, output_file);
 }
 
 bool Supported(const base::FilePath& input_file) {
   bool result = false;
@@ skipping 39 matching lines @@
   printf("%s Executable\n", format.c_str());
   return result;
 }
 
 void DisassembleAndAdjust(const base::FilePath& program_file,
                           const base::FilePath& model_file,
                           const base::FilePath& output_file) {
   std::string program_buffer = ReadOrFail(program_file, "program");
   std::string model_buffer = ReadOrFail(model_file, "reference");
 
-  scoped_ptr<courgette::AssemblyProgram> program;
+  courgette::AssemblyProgram* program = NULL;
   const courgette::Status parse_program_status =
       courgette::ParseDetectedExecutable(program_buffer.c_str(),
                                          program_buffer.length(),
                                          &program);
   if (parse_program_status != courgette::C_OK)
     Problem("Can't parse program input (code = %d).", parse_program_status);
 
-  scoped_ptr<courgette::AssemblyProgram> model;
+  courgette::AssemblyProgram* model = NULL;
   const courgette::Status parse_model_status =
       courgette::ParseDetectedExecutable(model_buffer.c_str(),
                                          model_buffer.length(),
                                          &model);
   if (parse_model_status != courgette::C_OK)
     Problem("Can't parse model input (code = %d).", parse_model_status);
 
-  const courgette::Status adjust_status = Adjust(*model, program.get());
+  const courgette::Status adjust_status = Adjust(*model, program);
   if (adjust_status != courgette::C_OK)
     Problem("Can't adjust program.");
 
-  model.reset();
+  courgette::EncodedProgram* encoded = NULL;
+  const courgette::Status encode_status = Encode(program, &encoded);
 
-  scoped_ptr<courgette::EncodedProgram> encoded;
-  const courgette::Status encode_status = Encode(*program, &encoded);
+  courgette::DeleteAssemblyProgram(program);
+
   if (encode_status != courgette::C_OK)
     Problem("Can't encode program.");
 
-  program.reset();
+  courgette::SinkStreamSet sinks;
 
-  courgette::SinkStreamSet sinks;
   const courgette::Status write_status =
-    courgette::WriteEncodedProgram(encoded.get(), &sinks);
+    courgette::WriteEncodedProgram(encoded, &sinks);
   if (write_status != courgette::C_OK)
     Problem("Can't serialize encoded program.");
 
-  encoded.reset();
+  courgette::DeleteEncodedProgram(encoded);
 
   courgette::SinkStream sink;
   if (!sinks.CopyTo(&sink))
     Problem("Can't combine serialized encoded program streams.");
 
   WriteSinkToFile(&sink, output_file);
 }
 
 // Diffs two executable files, write a set of files for the diff, one file per
 // stream of the EncodedProgram format.  Each file is the bsdiff between the
 // original file's stream and the new file's stream.  This is completely
 // uninteresting to users, but it is handy for seeing how much each which
 // streams are contributing to the final file size.  Adjustment is optional.
 void DisassembleAdjustDiff(const base::FilePath& model_file,
                            const base::FilePath& program_file,
                            const base::FilePath& output_file_root,
                            bool adjust) {
   std::string model_buffer = ReadOrFail(model_file, "'old'");
   std::string program_buffer = ReadOrFail(program_file, "'new'");
 
-  scoped_ptr<courgette::AssemblyProgram> model;
+  courgette::AssemblyProgram* model = NULL;
   const courgette::Status parse_model_status =
       courgette::ParseDetectedExecutable(model_buffer.c_str(),
                                          model_buffer.length(),
                                          &model);
   if (parse_model_status != courgette::C_OK)
     Problem("Can't parse model input (code = %d).", parse_model_status);
 
-  scoped_ptr<courgette::AssemblyProgram> program;
+  courgette::AssemblyProgram* program = NULL;
   const courgette::Status parse_program_status =
       courgette::ParseDetectedExecutable(program_buffer.c_str(),
                                          program_buffer.length(),
                                          &program);
   if (parse_program_status != courgette::C_OK)
     Problem("Can't parse program input (code = %d).", parse_program_status);
 
   if (adjust) {
-    const courgette::Status adjust_status = Adjust(*model, program.get());
+    const courgette::Status adjust_status = Adjust(*model, program);
     if (adjust_status != courgette::C_OK)
       Problem("Can't adjust program.");
   }
 
-  scoped_ptr<courgette::EncodedProgram> encoded_program;
+  courgette::EncodedProgram* encoded_program = NULL;
   const courgette::Status encode_program_status =
-      Encode(*program, &encoded_program);
+      Encode(program, &encoded_program);
+  courgette::DeleteAssemblyProgram(program);
   if (encode_program_status != courgette::C_OK)
     Problem("Can't encode program.");
 
-  program.reset();
-
-  scoped_ptr<courgette::EncodedProgram> encoded_model;
-  const courgette::Status encode_model_status = Encode(*model, &encoded_model);
+  courgette::EncodedProgram* encoded_model = NULL;
+  const courgette::Status encode_model_status = Encode(model, &encoded_model);
+  courgette::DeleteAssemblyProgram(model);
   if (encode_model_status != courgette::C_OK)
     Problem("Can't encode model.");
 
-  model.reset();
-
   courgette::SinkStreamSet program_sinks;
   const courgette::Status write_program_status =
-    courgette::WriteEncodedProgram(encoded_program.get(), &program_sinks);
+    courgette::WriteEncodedProgram(encoded_program, &program_sinks);
   if (write_program_status != courgette::C_OK)
     Problem("Can't serialize encoded program.");
-
-  encoded_program.reset();
+  courgette::DeleteEncodedProgram(encoded_program);
 
   courgette::SinkStreamSet model_sinks;
   const courgette::Status write_model_status =
-    courgette::WriteEncodedProgram(encoded_model.get(), &model_sinks);
+    courgette::WriteEncodedProgram(encoded_model, &model_sinks);
   if (write_model_status != courgette::C_OK)
     Problem("Can't serialize encoded model.");
-
-  encoded_model.reset();
+  courgette::DeleteEncodedProgram(encoded_model);
 
   courgette::SinkStream empty_sink;
   for (int i = 0;  ; ++i) {
     courgette::SinkStream* old_stream = model_sinks.stream(i);
     courgette::SinkStream* new_stream = program_sinks.stream(i);
     if (old_stream == NULL && new_stream == NULL)
       break;
 
     courgette::SourceStream old_source;
     courgette::SourceStream new_source;
@@ skipping 12 matching lines @@
 }
 
 void Assemble(const base::FilePath& input_file,
               const base::FilePath& output_file) {
   std::string buffer = ReadOrFail(input_file, "input");
 
   courgette::SourceStreamSet sources;
   if (!sources.Init(buffer.c_str(), buffer.length()))
     Problem("Bad input file.");
 
-  scoped_ptr<courgette::EncodedProgram> encoded;
-  const courgette::Status read_status =
-      courgette::ReadEncodedProgram(&sources, &encoded);
+  courgette::EncodedProgram* encoded = NULL;
+  const courgette::Status read_status = ReadEncodedProgram(&sources, &encoded);
   if (read_status != courgette::C_OK)
     Problem("Bad encoded program.");
 
   courgette::SinkStream sink;
 
-  const courgette::Status assemble_status =
-      courgette::Assemble(encoded.get(), &sink);
+  const courgette::Status assemble_status = courgette::Assemble(encoded, &sink);
   if (assemble_status != courgette::C_OK)
     Problem("Can't assemble.");
 
   WriteSinkToFile(&sink, output_file);
 }
 
 void GenerateEnsemblePatch(const base::FilePath& old_file,
                            const base::FilePath& new_file,
                            const base::FilePath& patch_file) {
   std::string old_buffer = ReadOrFail(old_file, "'old' input");
@@ skipping 194 matching lines @@
         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");
     }
   }
 
   return 0;
 }