nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

am 28b896fe: Merge "Use nullptr instead of MmappedBufferPtr(nullptr)."

Browse source 
* commit '28b896fe35b0345d4e92e5044974f05f2ee443ec':
  Use nullptr instead of MmappedBufferPtr(nullptr).
This commit is contained in:
Keisuke Kuroyanagi 2014-05-14 13:29:33 +00:00 committed by Android Git Automerger
commit 6059f6c7b5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
native/jni/src/suggest/policyimpl/dictionary/utils/mmapped_buffer.cpp
View file

@ -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 {
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 {
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 {
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);
} }