From 257123ca70f1895cd6fd37c75ebaeef2de9e17b1 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 29 Dec 2015 13:42:49 -0800 Subject: Let breakpad build with -Wall on OS X and Linux. A=thakis@chromium.org Original Review: https://codereview.chromium.org/1550933002/ R=thakis@chromium.org Review URL: https://codereview.chromium.org/1554613002 . --- src/client/mac/handler/dynamic_images.cc | 8 ++------ src/common/dwarf/dwarf2reader.cc | 6 ++++-- src/common/dwarf/dwarf2reader.h | 2 ++ src/common/linux/dump_symbols.cc | 1 - src/common/linux/libcurl_wrapper.h | 2 +- src/common/linux/synth_elf.cc | 4 +++- src/common/linux/synth_elf.h | 2 ++ src/processor/minidump.cc | 9 --------- src/tools/mac/symupload/symupload.m | 9 --------- 9 files changed, 14 insertions(+), 29 deletions(-) diff --git a/src/client/mac/handler/dynamic_images.cc b/src/client/mac/handler/dynamic_images.cc index 3dc4f3b4..cdba6df4 100644 --- a/src/client/mac/handler/dynamic_images.cc +++ b/src/client/mac/handler/dynamic_images.cc @@ -364,7 +364,7 @@ static uint64_t LookupSymbol(const char* symbol_name, return list.n_value; } -#if TARGET_OS_IPHONE +#if TARGET_OS_IPHONE || MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 static bool HasTaskDyldInfo() { return true; } @@ -381,13 +381,9 @@ static SInt32 GetOSVersion() { } static bool HasTaskDyldInfo() { -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 - return true; -#else return GetOSVersion() >= 0x1060; -#endif } -#endif // TARGET_OS_IPHONE +#endif // TARGET_OS_IPHONE || MAC_OS_X_VERSION_MIN_REQUIRED >= 10_6 uint64_t DynamicImages::GetDyldAllImageInfosPointer() { if (HasTaskDyldInfo()) { diff --git a/src/common/dwarf/dwarf2reader.cc b/src/common/dwarf/dwarf2reader.cc index f2f3d581..49c2ee15 100644 --- a/src/common/dwarf/dwarf2reader.cc +++ b/src/common/dwarf/dwarf2reader.cc @@ -517,8 +517,10 @@ void CompilationUnit::ProcessDIEs() { LineInfo::LineInfo(const char* buffer, uint64 buffer_length, ByteReader* reader, LineInfoHandler* handler): - handler_(handler), reader_(reader), buffer_(buffer), - buffer_length_(buffer_length) { + handler_(handler), reader_(reader), buffer_(buffer) { +#ifndef NDEBUG + buffer_length_ = buffer_length; +#endif header_.std_opcode_lengths = NULL; } diff --git a/src/common/dwarf/dwarf2reader.h b/src/common/dwarf/dwarf2reader.h index 8824bf90..e4f7f495 100644 --- a/src/common/dwarf/dwarf2reader.h +++ b/src/common/dwarf/dwarf2reader.h @@ -140,7 +140,9 @@ class LineInfo { // the line info to read is. after_header is the place right after // the end of the line information header. const char* buffer_; +#ifndef NDEBUG uint64 buffer_length_; +#endif const char* after_header_; }; diff --git a/src/common/linux/dump_symbols.cc b/src/common/linux/dump_symbols.cc index 1e96ca6a..5ae44e53 100644 --- a/src/common/linux/dump_symbols.cc +++ b/src/common/linux/dump_symbols.cc @@ -889,7 +889,6 @@ bool ReadSymbolDataElfClass(const typename ElfClass::Ehdr* elf_header, const DumpOptions& options, Module** out_module) { typedef typename ElfClass::Ehdr Ehdr; - typedef typename ElfClass::Shdr Shdr; *out_module = NULL; diff --git a/src/common/linux/libcurl_wrapper.h b/src/common/linux/libcurl_wrapper.h index de84a63b..25905ad8 100644 --- a/src/common/linux/libcurl_wrapper.h +++ b/src/common/linux/libcurl_wrapper.h @@ -43,7 +43,7 @@ namespace google_breakpad { class LibcurlWrapper { public: LibcurlWrapper(); - ~LibcurlWrapper(); + virtual ~LibcurlWrapper(); virtual bool Init(); virtual bool SetProxy(const string& proxy_host, const string& proxy_userpwd); diff --git a/src/common/linux/synth_elf.cc b/src/common/linux/synth_elf.cc index b978550f..98e81dab 100644 --- a/src/common/linux/synth_elf.cc +++ b/src/common/linux/synth_elf.cc @@ -213,8 +213,10 @@ void ELF::Finish() { SymbolTable::SymbolTable(Endianness endianness, size_t addr_size, StringTable& table) : Section(endianness), - addr_size_(addr_size), table_(table) { +#ifndef NDEBUG + addr_size_ = addr_size; +#endif assert(addr_size_ == 4 || addr_size_ == 8); } diff --git a/src/common/linux/synth_elf.h b/src/common/linux/synth_elf.h index 330ceae8..1d2a20ca 100644 --- a/src/common/linux/synth_elf.h +++ b/src/common/linux/synth_elf.h @@ -173,7 +173,9 @@ class SymbolTable : public Section { uint64_t size, unsigned info, uint16_t shndx); private: +#ifndef NDEBUG size_t addr_size_; +#endif StringTable& table_; }; diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc index f2240026..ccc90d5a 100644 --- a/src/processor/minidump.cc +++ b/src/processor/minidump.cc @@ -165,19 +165,10 @@ static void Swap(uint128_struct* value) { } // Swapping signed integers -static inline void Swap(int16_t* value) { - Swap(reinterpret_cast(value)); -} - static inline void Swap(int32_t* value) { Swap(reinterpret_cast(value)); } -static inline void Swap(int64_t* value) { - Swap(reinterpret_cast(value)); -} - - static inline void Swap(MDLocationDescriptor* location_descriptor) { Swap(&location_descriptor->data_size); Swap(&location_descriptor->rva); diff --git a/src/tools/mac/symupload/symupload.m b/src/tools/mac/symupload/symupload.m index fe413458..179f8d50 100644 --- a/src/tools/mac/symupload/symupload.m +++ b/src/tools/mac/symupload/symupload.m @@ -81,15 +81,6 @@ static NSArray *ModuleDataForSymbolFile(NSString *file) { return parts; } -//============================================================================= -static NSString *CompactIdentifier(NSString *uuid) { - NSMutableString *str = [NSMutableString stringWithString:uuid]; - [str replaceOccurrencesOfString:@"-" withString:@"" options:0 - range:NSMakeRange(0, [str length])]; - - return str; -} - //============================================================================= static void Start(Options *options) { NSURL *url = [NSURL URLWithString:options->uploadURLStr]; -- cgit v1.2.1