Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1016)

Unified Diff: chrome/browser/mac/install_from_dmg.mm

Issue 9845017: Fix a few warnings that -Wnull-conversion of a future clang will complain about. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/process_util_mac.mm ('k') | chrome/common/mac/mock_launchd.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/mac/install_from_dmg.mm
diff --git a/chrome/browser/mac/install_from_dmg.mm b/chrome/browser/mac/install_from_dmg.mm
index ab1241e5b97602685ac7b947901f027bf33cc683..3b454c7371cac5fe3f1a2f1f19ef95029c27ba2d 100644
--- a/chrome/browser/mac/install_from_dmg.mm
+++ b/chrome/browser/mac/install_from_dmg.mm
@@ -82,10 +82,10 @@ io_service_t CopyHDIXDriveServiceForMedia(io_service_t media) {
&iterator_ref);
if (kr != KERN_SUCCESS) {
LOG(ERROR) << "IORegistryEntryCreateIterator: " << kr;
- return NULL;
+ return IO_OBJECT_NULL;
}
base::mac::ScopedIOObject<io_iterator_t> iterator(iterator_ref);
- iterator_ref = NULL;
+ iterator_ref = IO_OBJECT_NULL;
// Look at each of the ancestor services, beginning with the parent,
// iterating all the way up to the device tree's root. If any ancestor
@@ -102,7 +102,7 @@ io_service_t CopyHDIXDriveServiceForMedia(io_service_t media) {
}
// The media does not reside on a disk image.
- return NULL;
+ return IO_OBJECT_NULL;
}
// Given an io_service_t (expected to be of class IOMedia), determines whether
@@ -213,7 +213,7 @@ bool IsPathOnReadOnlyDiskImage(const char path[],
return false;
}
base::mac::ScopedIOObject<io_iterator_t> iterator(iterator_ref);
- iterator_ref = NULL;
+ iterator_ref = IO_OBJECT_NULL;
// There needs to be exactly one matching service.
base::mac::ScopedIOObject<io_service_t> media(IOIteratorNext(iterator));
« no previous file with comments | « base/process_util_mac.mm ('k') | chrome/common/mac/mock_launchd.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698