Index: src/client/linux/minidump_writer/minidump_writer_unittest.cc |
=================================================================== |
--- a/src/client/linux/minidump_writer/minidump_writer_unittest.cc |
+++ b/src/client/linux/minidump_writer/minidump_writer_unittest.cc |
@@ -126,19 +126,19 @@ TEST(MinidumpWriterTest, SetupWithFD) { |
// Test that mapping info can be specified when writing a minidump, |
// and that it ends up in the module list of the minidump. |
TEST(MinidumpWriterTest, MappingInfo) { |
int fds[2]; |
ASSERT_NE(-1, pipe(fds)); |
// These are defined here so the parent can use them to check the |
// data from the minidump afterwards. |
- const u_int32_t memory_size = sysconf(_SC_PAGESIZE); |
+ const uint32_t memory_size = sysconf(_SC_PAGESIZE); |
const char* kMemoryName = "a fake module"; |
- const u_int8_t kModuleGUID[sizeof(MDGUID)] = { |
+ const uint8_t kModuleGUID[sizeof(MDGUID)] = { |
0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, |
0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF |
}; |
char module_identifier_buffer[kGUIDStringSize]; |
FileID::ConvertIdentifierToString(kModuleGUID, |
module_identifier_buffer, |
sizeof(module_identifier_buffer)); |
string module_identifier(module_identifier_buffer); |
@@ -208,17 +208,17 @@ TEST(MinidumpWriterTest, MappingInfo) { |
module_list->GetModuleForAddress(kMemoryAddress); |
ASSERT_TRUE(module); |
EXPECT_EQ(kMemoryAddress, module->base_address()); |
EXPECT_EQ(memory_size, module->size()); |
EXPECT_EQ(kMemoryName, module->code_file()); |
EXPECT_EQ(module_identifier, module->debug_identifier()); |
- u_int32_t len; |
+ uint32_t len; |
// These streams are expected to be there |
EXPECT_TRUE(minidump.SeekToStreamType(MD_THREAD_LIST_STREAM, &len)); |
EXPECT_TRUE(minidump.SeekToStreamType(MD_MEMORY_LIST_STREAM, &len)); |
EXPECT_TRUE(minidump.SeekToStreamType(MD_EXCEPTION_STREAM, &len)); |
EXPECT_TRUE(minidump.SeekToStreamType(MD_SYSTEM_INFO_STREAM, &len)); |
EXPECT_TRUE(minidump.SeekToStreamType(MD_LINUX_CPU_INFO, &len)); |
EXPECT_TRUE(minidump.SeekToStreamType(MD_LINUX_PROC_STATUS, &len)); |
EXPECT_TRUE(minidump.SeekToStreamType(MD_LINUX_CMD_LINE, &len)); |
@@ -236,17 +236,17 @@ TEST(MinidumpWriterTest, MappingInfo) { |
TEST(MinidumpWriterTest, MappingInfoContained) { |
int fds[2]; |
ASSERT_NE(-1, pipe(fds)); |
// These are defined here so the parent can use them to check the |
// data from the minidump afterwards. |
const int32_t memory_size = sysconf(_SC_PAGESIZE); |
const char* kMemoryName = "a fake module"; |
- const u_int8_t kModuleGUID[sizeof(MDGUID)] = { |
+ const uint8_t kModuleGUID[sizeof(MDGUID)] = { |
0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, |
0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF |
}; |
char module_identifier_buffer[kGUIDStringSize]; |
FileID::ConvertIdentifierToString(kModuleGUID, |
module_identifier_buffer, |
sizeof(module_identifier_buffer)); |
string module_identifier(module_identifier_buffer); |
@@ -430,25 +430,25 @@ TEST(MinidumpWriterTest, DeletedBinary) |
// Test that an additional memory region can be added to the minidump. |
TEST(MinidumpWriterTest, AdditionalMemory) { |
int fds[2]; |
ASSERT_NE(-1, pipe(fds)); |
// These are defined here so the parent can use them to check the |
// data from the minidump afterwards. |
- const u_int32_t kMemorySize = sysconf(_SC_PAGESIZE); |
+ const uint32_t kMemorySize = sysconf(_SC_PAGESIZE); |
// Get some heap memory. |
- u_int8_t* memory = new u_int8_t[kMemorySize]; |
+ uint8_t* memory = new uint8_t[kMemorySize]; |
const uintptr_t kMemoryAddress = reinterpret_cast<uintptr_t>(memory); |
ASSERT_TRUE(memory); |
// Stick some data into the memory so the contents can be verified. |
- for (u_int32_t i = 0; i < kMemorySize; ++i) { |
+ for (uint32_t i = 0; i < kMemorySize; ++i) { |
memory[i] = i % 255; |
} |
const pid_t child = fork(); |
if (child == 0) { |
close(fds[1]); |
char b; |
HANDLE_EINTR(read(fds[0], &b, sizeof(b))); |