aboutsummaryrefslogtreecommitdiff
path: root/src/client/mac/handler/testcases
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2011-09-29 16:14:01 +0000
committermark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2011-09-29 16:14:01 +0000
commit9dfe692010fa5ff96ba4c5dc5fa59fa63ab2ceab (patch)
treea07311595f0450b17fdb5511d036180d0388c1a6 /src/client/mac/handler/testcases
parentBuild the Mac Breakpad utilities with the 10.5 SDK in x86_64 Debug mode. This (diff)
downloadbreakpad-9dfe692010fa5ff96ba4c5dc5fa59fa63ab2ceab.tar.xz
Fix some compilation warnings and other errors due to API changes
Review URL: http://breakpad.appspot.com/305002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@841 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/client/mac/handler/testcases')
-rw-r--r--src/client/mac/handler/testcases/DynamicImagesTests.cc18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/client/mac/handler/testcases/DynamicImagesTests.cc b/src/client/mac/handler/testcases/DynamicImagesTests.cc
index cb76eb10..0fc7825b 100644
--- a/src/client/mac/handler/testcases/DynamicImagesTests.cc
+++ b/src/client/mac/handler/testcases/DynamicImagesTests.cc
@@ -55,21 +55,17 @@ void DynamicImagesTests::ReadTaskMemoryTest() {
// pick test2 as a symbol we know to be valid to read
// anything will work, really
void *addr = reinterpret_cast<void*>(&test2);
- void *buf;
+ std::vector<uint8_t> buf(getpagesize());
fprintf(stderr, "reading 0x%p\n", addr);
- buf = google_breakpad::ReadTaskMemory(mach_task_self(),
- addr,
- getpagesize(),
- &kr);
+ kr = google_breakpad::ReadTaskMemory(mach_task_self(),
+ (uint64_t)addr,
+ getpagesize(),
+ buf);
CPTAssert(kr == KERN_SUCCESS);
- CPTAssert(buf != NULL);
-
- CPTAssert(0 == memcmp(buf, (const void*)addr, getpagesize()));
-
- free(buf);
+ CPTAssert(0 == memcmp(&buf[0], (const void*)addr, getpagesize()));
}
void DynamicImagesTests::ReadLibrariesFromLocalTaskTest() {
@@ -79,7 +75,5 @@ void DynamicImagesTests::ReadLibrariesFromLocalTaskTest() {
fprintf(stderr,"Local task image count: %d\n", d->GetImageCount());
- d->TestPrint();
-
CPTAssert(d->GetImageCount() > 0);
}