From 07b3445bf1fead131a9d975deb364e9c07019986 Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Fri, 30 Mar 2012 14:30:06 +0000 Subject: Fix -Wnull-conversion warnings in breakpad. Patch by Nico Weber Review URL: https://breakpad.appspot.com/367001/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@938 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/client/mac/handler/dynamic_images.cc | 2 +- src/client/mac/handler/exception_handler.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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; -- cgit v1.2.1