Allow building with -pedantic (#186). r=ted.mielczarek

http://groups.google.com/group/google-breakpad-dev/browse_thread/thread/6aa39d7f0ffa3c42


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@183 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
mmentovai
2007-05-31 19:44:52 +00:00
parent e96a791d9a
commit 2e0e2234b9
12 changed files with 193 additions and 63 deletions

View File

@@ -233,7 +233,7 @@ static void PrintModules(const CodeModules *modules) {
printf("\n");
printf("Loaded modules:\n");
u_int64_t main_address = 0xffffffffffffffffLL;
u_int64_t main_address = 0;
const CodeModule *main_module = modules->GetMainModule();
if (main_module) {
main_address = main_module->base_address();
@@ -249,7 +249,8 @@ static void PrintModules(const CodeModules *modules) {
base_address, base_address + module->size() - 1,
PathnameStripper::File(module->code_file()).c_str(),
module->version().empty() ? "???" : module->version().c_str(),
base_address == main_address ? " (main)" : "");
main_module != NULL && base_address == main_address ?
" (main)" : "");
}
}
@@ -262,7 +263,7 @@ static void PrintModulesMachineReadable(const CodeModules *modules) {
if (!modules)
return;
u_int64_t main_address = 0xffffffffffffffffLL;
u_int64_t main_address = 0;
const CodeModule *main_module = modules->GetMainModule();
if (main_module) {
main_address = main_module->base_address();
@@ -284,7 +285,8 @@ static void PrintModulesMachineReadable(const CodeModules *modules) {
StripSeparator(module->debug_identifier()).c_str(),
kOutputSeparator, base_address,
kOutputSeparator, base_address + module->size() - 1,
kOutputSeparator, base_address == main_address ? 1 : 0);
kOutputSeparator,
main_module != NULL && base_address == main_address ? 1 : 0);
}
}