aboutsummaryrefslogtreecommitdiff
path: root/src/tools/linux
diff options
context:
space:
mode:
authorted.mielczarek@gmail.com <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-03-06 14:04:42 +0000
committerted.mielczarek@gmail.com <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-03-06 14:04:42 +0000
commitaeffe1056f9ff6526d87a16ef55222899f5528f7 (patch)
tree1b7601a9135f82c14e73535c9d4a24f94d494662 /src/tools/linux
parentWork around Windows headers #defining ERROR by renaming enum values in StackF... (diff)
downloadbreakpad-aeffe1056f9ff6526d87a16ef55222899f5528f7.tar.xz
Use stdint types everywhere
R=mark at https://breakpad.appspot.com/535002/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1121 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/tools/linux')
-rw-r--r--src/tools/linux/md2core/minidump-2-core.cc4
-rw-r--r--src/tools/linux/md2core/minidump_memory_range.h4
-rw-r--r--src/tools/linux/md2core/minidump_memory_range_unittest.cc8
3 files changed, 8 insertions, 8 deletions
diff --git a/src/tools/linux/md2core/minidump-2-core.cc b/src/tools/linux/md2core/minidump-2-core.cc
index 289bb980..93c46aab 100644
--- a/src/tools/linux/md2core/minidump-2-core.cc
+++ b/src/tools/linux/md2core/minidump-2-core.cc
@@ -500,9 +500,9 @@ ParseMaps(CrashedProcess* crashinfo, const MinidumpMemoryRange& range) {
fputs("MD_LINUX_MAPS:\n", stderr);
fwrite(range.data(), range.length(), 1, stderr);
}
- for (const u_int8_t* ptr = range.data();
+ for (const uint8_t* ptr = range.data();
ptr < range.data() + range.length();) {
- const u_int8_t* eol = (u_int8_t*)memchr(ptr, '\n',
+ const uint8_t* eol = (uint8_t*)memchr(ptr, '\n',
range.data() + range.length() - ptr);
std::string line((const char*)ptr,
eol ? eol - ptr : range.data() + range.length() - ptr);
diff --git a/src/tools/linux/md2core/minidump_memory_range.h b/src/tools/linux/md2core/minidump_memory_range.h
index b0d8255f..a793e2cf 100644
--- a/src/tools/linux/md2core/minidump_memory_range.h
+++ b/src/tools/linux/md2core/minidump_memory_range.h
@@ -75,8 +75,8 @@ class MinidumpMemoryRange : public MemoryRange {
std::string str;
const MDString* md_str = GetData<MDString>(sub_offset);
if (md_str) {
- const u_int16_t* buffer = &md_str->buffer[0];
- for (u_int32_t i = 0; i < md_str->length && buffer[i]; ++i) {
+ const uint16_t* buffer = &md_str->buffer[0];
+ for (uint32_t i = 0; i < md_str->length && buffer[i]; ++i) {
str.push_back(buffer[i]);
}
}
diff --git a/src/tools/linux/md2core/minidump_memory_range_unittest.cc b/src/tools/linux/md2core/minidump_memory_range_unittest.cc
index f4994fe6..fe4ded83 100644
--- a/src/tools/linux/md2core/minidump_memory_range_unittest.cc
+++ b/src/tools/linux/md2core/minidump_memory_range_unittest.cc
@@ -38,9 +38,9 @@ using testing::Message;
namespace {
-const u_int32_t kBuffer[10] = { 0 };
+const uint32_t kBuffer[10] = { 0 };
const size_t kBufferSize = sizeof(kBuffer);
-const u_int8_t* kBufferPointer = reinterpret_cast<const u_int8_t*>(kBuffer);
+const uint8_t* kBufferPointer = reinterpret_cast<const uint8_t*>(kBuffer);
// Test vectors for verifying Covers, GetData, and Subrange.
const struct {
@@ -222,7 +222,7 @@ TEST(MinidumpMemoryRangeTest, GetArrayElmentWithTemplateType) {
}
TEST(MinidumpMemoryRangeTest, GetAsciiMDString) {
- u_int8_t buffer[100] = { 0 };
+ uint8_t buffer[100] = { 0 };
MDString* md_str = reinterpret_cast<MDString*>(buffer);
md_str->length = 4;
@@ -233,7 +233,7 @@ TEST(MinidumpMemoryRangeTest, GetAsciiMDString) {
md_str->buffer[4] = '\0';
size_t str2_offset =
- sizeof(MDString) + (md_str->length + 1) * sizeof(u_int16_t);
+ sizeof(MDString) + (md_str->length + 1) * sizeof(uint16_t);
md_str = reinterpret_cast<MDString*>(buffer + str2_offset);
md_str->length = 9; // Test length larger than actual string