Skip to content
Snippets Groups Projects
Commit 28b896fe authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by Android (Google) Code Review
Browse files

Merge "Use nullptr instead of MmappedBufferPtr(nullptr)."

parents ee599754 2dc8e36f
No related branches found
No related tags found
No related merge requests found
...@@ -33,7 +33,7 @@ namespace latinime { ...@@ -33,7 +33,7 @@ namespace latinime {
const int mmapFd = open(path, O_RDONLY); const int mmapFd = open(path, O_RDONLY);
if (mmapFd < 0) { if (mmapFd < 0) {
AKLOGE("DICT: Can't open the source. path=%s errno=%d", path, errno); AKLOGE("DICT: Can't open the source. path=%s errno=%d", path, errno);
return MmappedBufferPtr(nullptr); return nullptr;
} }
const int pagesize = sysconf(_SC_PAGESIZE); const int pagesize = sysconf(_SC_PAGESIZE);
const int offset = bufferOffset % pagesize; const int offset = bufferOffset % pagesize;
...@@ -45,13 +45,13 @@ namespace latinime { ...@@ -45,13 +45,13 @@ namespace latinime {
if (mmappedBuffer == MAP_FAILED) { if (mmappedBuffer == MAP_FAILED) {
AKLOGE("DICT: Can't mmap dictionary. errno=%d", errno); AKLOGE("DICT: Can't mmap dictionary. errno=%d", errno);
close(mmapFd); close(mmapFd);
return MmappedBufferPtr(nullptr); return nullptr;
} }
uint8_t *const buffer = static_cast<uint8_t *>(mmappedBuffer) + offset; uint8_t *const buffer = static_cast<uint8_t *>(mmappedBuffer) + offset;
if (!buffer) { if (!buffer) {
AKLOGE("DICT: buffer is null"); AKLOGE("DICT: buffer is null");
close(mmapFd); close(mmapFd);
return MmappedBufferPtr(nullptr); return nullptr;
} }
return MmappedBufferPtr(new MmappedBuffer(buffer, bufferSize, mmappedBuffer, alignedSize, return MmappedBufferPtr(new MmappedBuffer(buffer, bufferSize, mmappedBuffer, alignedSize,
mmapFd, isUpdatable)); mmapFd, isUpdatable));
...@@ -61,7 +61,7 @@ namespace latinime { ...@@ -61,7 +61,7 @@ namespace latinime {
const char *const path, const bool isUpdatable) { const char *const path, const bool isUpdatable) {
const int fileSize = FileUtils::getFileSize(path); const int fileSize = FileUtils::getFileSize(path);
if (fileSize == -1) { if (fileSize == -1) {
return MmappedBufferPtr(nullptr); return nullptr;
} else if (fileSize == 0) { } else if (fileSize == 0) {
return MmappedBufferPtr(new MmappedBuffer(isUpdatable)); return MmappedBufferPtr(new MmappedBuffer(isUpdatable));
} else { } else {
...@@ -76,7 +76,7 @@ namespace latinime { ...@@ -76,7 +76,7 @@ namespace latinime {
const int filePathLength = snprintf(filePath, filePathBufferSize, "%s%s", dirPath, const int filePathLength = snprintf(filePath, filePathBufferSize, "%s%s", dirPath,
fileName); fileName);
if (filePathLength >= filePathBufferSize) { if (filePathLength >= filePathBufferSize) {
return MmappedBufferPtr(nullptr); return nullptr;
} }
return openBuffer(filePath, isUpdatable); return openBuffer(filePath, isUpdatable);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment