Breakpad processor: Use unsigned constants in comparisons, to quiet compiler warnings.

This patch avoids comparisons between signed and unsigned values, as
warned about by G++ 4.4.1.

a=jimblandy, r=nealsid


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@469 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
jimblandy 2009-12-23 22:01:57 +00:00
parent 0468306245
commit 5ebd6507e3
3 changed files with 12 additions and 12 deletions

View file

@ -3747,8 +3747,8 @@ bool Minidump::ReadBytes(void* bytes, size_t count) {
} }
stream_->read(static_cast<char*>(bytes), count); stream_->read(static_cast<char*>(bytes), count);
size_t bytes_read = stream_->gcount(); size_t bytes_read = stream_->gcount();
if (static_cast<size_t>(bytes_read) != count) { if (bytes_read != count) {
if (bytes_read == -1) { if (bytes_read == size_t(-1)) {
string error_string; string error_string;
int error_code = ErrnoString(&error_string); int error_code = ErrnoString(&error_string);
BPLOG(ERROR) << "ReadBytes: error " << error_code << ": " << error_string; BPLOG(ERROR) << "ReadBytes: error " << error_code << ": " << error_string;

View file

@ -204,16 +204,16 @@ TEST_F(MinidumpProcessorTest, TestBasicProcessing) {
ASSERT_EQ(state.system_info()->cpu_info, kSystemInfoCPUInfo); ASSERT_EQ(state.system_info()->cpu_info, kSystemInfoCPUInfo);
ASSERT_TRUE(state.crashed()); ASSERT_TRUE(state.crashed());
ASSERT_EQ(state.crash_reason(), "EXCEPTION_ACCESS_VIOLATION"); ASSERT_EQ(state.crash_reason(), "EXCEPTION_ACCESS_VIOLATION");
ASSERT_EQ(state.crash_address(), 0x45); ASSERT_EQ(state.crash_address(), 0x45U);
ASSERT_EQ(state.threads()->size(), 1); ASSERT_EQ(state.threads()->size(), size_t(1));
ASSERT_EQ(state.requesting_thread(), 0); ASSERT_EQ(state.requesting_thread(), 0);
CallStack *stack = state.threads()->at(0); CallStack *stack = state.threads()->at(0);
ASSERT_TRUE(stack); ASSERT_TRUE(stack);
ASSERT_EQ(stack->frames()->size(), 4); ASSERT_EQ(stack->frames()->size(), 4U);
ASSERT_TRUE(stack->frames()->at(0)->module); ASSERT_TRUE(stack->frames()->at(0)->module);
ASSERT_EQ(stack->frames()->at(0)->module->base_address(), 0x400000); ASSERT_EQ(stack->frames()->at(0)->module->base_address(), 0x400000U);
ASSERT_EQ(stack->frames()->at(0)->module->code_file(), "c:\\test_app.exe"); ASSERT_EQ(stack->frames()->at(0)->module->code_file(), "c:\\test_app.exe");
ASSERT_EQ(stack->frames()->at(0)->function_name, ASSERT_EQ(stack->frames()->at(0)->function_name,
"`anonymous namespace'::CrashFunction"); "`anonymous namespace'::CrashFunction");
@ -221,7 +221,7 @@ TEST_F(MinidumpProcessorTest, TestBasicProcessing) {
ASSERT_EQ(stack->frames()->at(0)->source_line, 58); ASSERT_EQ(stack->frames()->at(0)->source_line, 58);
ASSERT_TRUE(stack->frames()->at(1)->module); ASSERT_TRUE(stack->frames()->at(1)->module);
ASSERT_EQ(stack->frames()->at(1)->module->base_address(), 0x400000); ASSERT_EQ(stack->frames()->at(1)->module->base_address(), 0x400000U);
ASSERT_EQ(stack->frames()->at(1)->module->code_file(), "c:\\test_app.exe"); ASSERT_EQ(stack->frames()->at(1)->module->code_file(), "c:\\test_app.exe");
ASSERT_EQ(stack->frames()->at(1)->function_name, "main"); ASSERT_EQ(stack->frames()->at(1)->function_name, "main");
ASSERT_EQ(stack->frames()->at(1)->source_file_name, "c:\\test_app.cc"); ASSERT_EQ(stack->frames()->at(1)->source_file_name, "c:\\test_app.cc");
@ -229,7 +229,7 @@ TEST_F(MinidumpProcessorTest, TestBasicProcessing) {
// This comes from the CRT // This comes from the CRT
ASSERT_TRUE(stack->frames()->at(2)->module); ASSERT_TRUE(stack->frames()->at(2)->module);
ASSERT_EQ(stack->frames()->at(2)->module->base_address(), 0x400000); ASSERT_EQ(stack->frames()->at(2)->module->base_address(), 0x400000U);
ASSERT_EQ(stack->frames()->at(2)->module->code_file(), "c:\\test_app.exe"); ASSERT_EQ(stack->frames()->at(2)->module->code_file(), "c:\\test_app.exe");
ASSERT_EQ(stack->frames()->at(2)->function_name, "__tmainCRTStartup"); ASSERT_EQ(stack->frames()->at(2)->function_name, "__tmainCRTStartup");
ASSERT_EQ(stack->frames()->at(2)->source_file_name, ASSERT_EQ(stack->frames()->at(2)->source_file_name,
@ -238,14 +238,14 @@ TEST_F(MinidumpProcessorTest, TestBasicProcessing) {
// No debug info available for kernel32.dll // No debug info available for kernel32.dll
ASSERT_TRUE(stack->frames()->at(3)->module); ASSERT_TRUE(stack->frames()->at(3)->module);
ASSERT_EQ(stack->frames()->at(3)->module->base_address(), 0x7c800000); ASSERT_EQ(stack->frames()->at(3)->module->base_address(), 0x7c800000U);
ASSERT_EQ(stack->frames()->at(3)->module->code_file(), ASSERT_EQ(stack->frames()->at(3)->module->code_file(),
"C:\\WINDOWS\\system32\\kernel32.dll"); "C:\\WINDOWS\\system32\\kernel32.dll");
ASSERT_TRUE(stack->frames()->at(3)->function_name.empty()); ASSERT_TRUE(stack->frames()->at(3)->function_name.empty());
ASSERT_TRUE(stack->frames()->at(3)->source_file_name.empty()); ASSERT_TRUE(stack->frames()->at(3)->source_file_name.empty());
ASSERT_EQ(stack->frames()->at(3)->source_line, 0); ASSERT_EQ(stack->frames()->at(3)->source_line, 0);
ASSERT_EQ(state.modules()->module_count(), 13); ASSERT_EQ(state.modules()->module_count(), 13U);
ASSERT_TRUE(state.modules()->GetMainModule()); ASSERT_TRUE(state.modules()->GetMainModule());
ASSERT_EQ(state.modules()->GetMainModule()->code_file(), "c:\\test_app.exe"); ASSERT_EQ(state.modules()->GetMainModule()->code_file(), "c:\\test_app.exe");
ASSERT_FALSE(state.modules()->GetModuleForAddress(0)); ASSERT_FALSE(state.modules()->GetModuleForAddress(0));

View file

@ -65,7 +65,7 @@ TEST_F(MinidumpTest, TestMinidumpFromFile) {
ASSERT_TRUE(minidump.Read()); ASSERT_TRUE(minidump.Read());
const MDRawHeader* header = minidump.header(); const MDRawHeader* header = minidump.header();
ASSERT_NE(header, (MDRawHeader*)NULL); ASSERT_NE(header, (MDRawHeader*)NULL);
ASSERT_EQ(header->signature, MD_HEADER_SIGNATURE); ASSERT_EQ(header->signature, u_int32_t(MD_HEADER_SIGNATURE));
//TODO: add more checks here //TODO: add more checks here
} }
@ -91,7 +91,7 @@ TEST_F(MinidumpTest, TestMinidumpFromStream) {
ASSERT_TRUE(minidump.Read()); ASSERT_TRUE(minidump.Read());
const MDRawHeader* header = minidump.header(); const MDRawHeader* header = minidump.header();
ASSERT_NE(header, (MDRawHeader*)NULL); ASSERT_NE(header, (MDRawHeader*)NULL);
ASSERT_EQ(header->signature, MD_HEADER_SIGNATURE); ASSERT_EQ(header->signature, u_int32_t(MD_HEADER_SIGNATURE));
//TODO: add more checks here //TODO: add more checks here
} }