Index: src/common/mac/dump_syms.h |
diff --git a/src/common/mac/dump_syms.h b/src/common/mac/dump_syms.h |
index babed701ea904c4ee2dd3ada0144fe238111e7c0..b09928c95fbc5ddbd2f550940f0e36d98e2a36ec 100644 |
--- a/src/common/mac/dump_syms.h |
+++ b/src/common/mac/dump_syms.h |
@@ -35,7 +35,6 @@ |
// reading debugging information from Mach-O files and writing it out as a |
// Breakpad symbol file. |
-#include <Foundation/Foundation.h> |
#include <mach-o/loader.h> |
#include <stdio.h> |
#include <stdlib.h> |
@@ -48,6 +47,7 @@ |
#include "common/mac/macho_reader.h" |
#include "common/mac/super_fat_arch.h" |
#include "common/module.h" |
+#include "common/scoped_ptr.h" |
#include "common/symbol_data.h" |
namespace google_breakpad { |
@@ -64,20 +64,13 @@ class DumpSymbols { |
selected_object_file_(), |
selected_object_name_() { } |
~DumpSymbols() { |
- [input_pathname_ release]; |
- [object_filename_ release]; |
- [contents_ release]; |
} |
// Prepare to read debugging information from |filename|. |filename| may be |
// the name of a universal binary, a Mach-O file, or a dSYM bundle |
// containing either of the above. On success, return true; if there is a |
// problem reading |filename|, report it and return false. |
- // |
- // (This class uses NSString for filenames and related values, |
- // because the Mac Foundation framework seems to support |
- // filename-related operations more fully on NSString values.) |
- bool Read(NSString *filename); |
+ bool Read(const std::string &filename); |
// If this dumper's file includes an object file for |cpu_type| and |
// |cpu_subtype|, then select that object file for dumping, and return |
@@ -163,16 +156,16 @@ class DumpSymbols { |
// The name of the file or bundle whose symbols this will dump. |
// This is the path given to Read, for use in error messages. |
- NSString *input_pathname_; |
+ std::string input_pathname_; |
// The name of the file this DumpSymbols will actually read debugging |
// information from. Normally, this is the same as input_pathname_, but if |
// filename refers to a dSYM bundle, then this is the resource file |
// within that bundle. |
- NSString *object_filename_; |
+ std::string object_filename_; |
// The complete contents of object_filename_, mapped into memory. |
- NSData *contents_; |
+ scoped_array<uint8_t> contents_; |
// A vector of SuperFatArch structures describing the object files |
// object_filename_ contains. If object_filename_ refers to a fat binary, |