aboutsummaryrefslogtreecommitdiff
path: root/src/client/mac/handler
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2012-03-30 14:30:06 +0000
committermark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2012-03-30 14:30:06 +0000
commit07b3445bf1fead131a9d975deb364e9c07019986 (patch)
tree12626af2d139025dee3fb68e2e4a69904364c924 /src/client/mac/handler
parentFix class/struct mismatches in forward declarations. (diff)
downloadbreakpad-07b3445bf1fead131a9d975deb364e9c07019986.tar.xz
Fix -Wnull-conversion warnings in breakpad.
Patch by Nico Weber <thakis@chromium.org> Review URL: https://breakpad.appspot.com/367001/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@938 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/client/mac/handler')
-rw-r--r--src/client/mac/handler/dynamic_images.cc2
-rw-r--r--src/client/mac/handler/exception_handler.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/client/mac/handler/dynamic_images.cc b/src/client/mac/handler/dynamic_images.cc
index 3b22e180..ef5743ca 100644
--- a/src/client/mac/handler/dynamic_images.cc
+++ b/src/client/mac/handler/dynamic_images.cc
@@ -394,7 +394,7 @@ uint64_t DynamicImages::GetDyldAllImageInfosPointer() {
mach_msg_type_number_t count = TASK_DYLD_INFO_COUNT;
if (task_info(task_, TASK_DYLD_INFO, (task_info_t)&task_dyld_info,
&count) != KERN_SUCCESS) {
- return NULL;
+ return 0;
}
return (uint64_t)task_dyld_info.all_image_info_addr;
diff --git a/src/client/mac/handler/exception_handler.cc b/src/client/mac/handler/exception_handler.cc
index b2f59b93..b09633f9 100644
--- a/src/client/mac/handler/exception_handler.cc
+++ b/src/client/mac/handler/exception_handler.cc
@@ -744,7 +744,7 @@ bool ExceptionHandler::Teardown() {
}
handler_thread_ = NULL;
- handler_port_ = NULL;
+ handler_port_ = MACH_PORT_NULL;
pthread_mutex_destroy(&minidump_write_mutex_);
return result == KERN_SUCCESS;