diff options
Diffstat (limited to 'src/tools/mac/crash_report')
| -rw-r--r-- | src/tools/mac/crash_report/crash_report.mm | 2 | ||||
| -rw-r--r-- | src/tools/mac/crash_report/on_demand_symbol_supplier.mm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/mac/crash_report/crash_report.mm b/src/tools/mac/crash_report/crash_report.mm index b6e3f1cc..8b10b646 100644 --- a/src/tools/mac/crash_report/crash_report.mm +++ b/src/tools/mac/crash_report/crash_report.mm @@ -164,7 +164,7 @@ static void PrintRegisters(const CallStack *stack, const string &cpu) { const StackFramePPC *frame_ppc = reinterpret_cast<const StackFramePPC*>(frame); - if (frame_ppc->context_validity & StackFramePPC::CONTEXT_VALID_ALL == + if ((frame_ppc->context_validity & StackFramePPC::CONTEXT_VALID_ALL) == StackFramePPC::CONTEXT_VALID_ALL) { sequence = PrintRegister("srr0", frame_ppc->context.srr0, sequence); sequence = PrintRegister("srr1", frame_ppc->context.srr1, sequence); diff --git a/src/tools/mac/crash_report/on_demand_symbol_supplier.mm b/src/tools/mac/crash_report/on_demand_symbol_supplier.mm index edcc5ad7..1bd1f693 100644 --- a/src/tools/mac/crash_report/on_demand_symbol_supplier.mm +++ b/src/tools/mac/crash_report/on_demand_symbol_supplier.mm @@ -80,7 +80,7 @@ OnDemandSymbolSupplier::OnDemandSymbolSupplier(const string &search_dir, [dirEnum skipDescendents]; } else { NSString *filePath = [symbolSearchPath stringByAppendingPathComponent:fileName]; - NSString *dataStr = [[[NSString alloc] initWithContentsOfFile:filePath] autorelease]; + NSString *dataStr = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:NULL]; if (dataStr) { // Check file to see if it is of appropriate type, and grab module // name. @@ -280,7 +280,7 @@ bool OnDemandSymbolSupplier::GenerateSymbolFile(const CodeModule *module, NSString *module_str = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:module_path.c_str() length:module_path.length()]; - DumpSymbols dump; + DumpSymbols dump(ALL_SYMBOL_DATA, false); if (dump.Read(module_str)) { // What Breakpad calls "x86" should be given to the system as "i386". std::string architecture; @@ -293,7 +293,7 @@ bool OnDemandSymbolSupplier::GenerateSymbolFile(const CodeModule *module, if (dump.SetArchitecture(architecture)) { std::fstream file([symbol_path fileSystemRepresentation], std::ios_base::out | std::ios_base::trunc); - dump.WriteSymbolFile(file, true); + dump.WriteSymbolFile(file); } else { printf("Architecture %s not available for %s\n", system_info->cpu.c_str(), name.c_str()); |