aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkOSFile_posix.cpp
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2015-08-27 07:41:13 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-27 07:41:16 -0700
commit96fcdcc219d2a0d3579719b84b28bede76efba64 (patch)
tree0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/ports/SkOSFile_posix.cpp
parent435af2f736c85c3274a0c6760a3523810750d237 (diff)
Style Change: NULL->nullptr
Diffstat (limited to 'src/ports/SkOSFile_posix.cpp')
-rw-r--r--src/ports/SkOSFile_posix.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ports/SkOSFile_posix.cpp b/src/ports/SkOSFile_posix.cpp
index b604c2190c..58662f382f 100644
--- a/src/ports/SkOSFile_posix.cpp
+++ b/src/ports/SkOSFile_posix.cpp
@@ -63,19 +63,19 @@ void sk_fmunmap(const void* addr, size_t length) {
void* sk_fdmmap(int fd, size_t* size) {
struct stat status;
if (0 != fstat(fd, &status)) {
- return NULL;
+ return nullptr;
}
if (!S_ISREG(status.st_mode)) {
- return NULL;
+ return nullptr;
}
if (!SkTFitsIn<size_t>(status.st_size)) {
- return NULL;
+ return nullptr;
}
size_t fileSize = static_cast<size_t>(status.st_size);
- void* addr = mmap(NULL, fileSize, PROT_READ, MAP_PRIVATE, fd, 0);
+ void* addr = mmap(nullptr, fileSize, PROT_READ, MAP_PRIVATE, fd, 0);
if (MAP_FAILED == addr) {
- return NULL;
+ return nullptr;
}
*size = fileSize;
@@ -89,7 +89,7 @@ int sk_fileno(SkFILE* f) {
void* sk_fmmap(SkFILE* f, size_t* size) {
int fd = sk_fileno(f);
if (fd < 0) {
- return NULL;
+ return nullptr;
}
return sk_fdmmap(fd, size);
@@ -149,7 +149,7 @@ bool SkOSFile::Iter::next(SkString* name, bool getDir) {
if (self.fDIR) {
dirent* entry;
- while ((entry = ::readdir(self.fDIR)) != NULL) {
+ while ((entry = ::readdir(self.fDIR)) != nullptr) {
struct stat s;
SkString str(self.fPath);