am d624091a: Merge "Fix native debug build." into lmp-dev

* commit 'd624091afbbbdf1870dd6fdff69db45447e016bd':
  Fix native debug build.
This commit is contained in:
Keisuke Kuroyanagi 2014-07-31 13:27:42 +00:00 committed by Android Git Automerger
commit dd38758cc2

View file

@ -118,7 +118,7 @@ bool Ver4DictBuffers::flushHeaderAndDictBuffers(const char *const dictDirPath,
} }
FILE *const file = fdopen(fd, "wb"); FILE *const file = fdopen(fd, "wb");
if (!file) { if (!file) {
AKLOGE("fdopen failed for the file %s. errno: %d", filePath, errno); AKLOGE("fdopen failed for the file %s. errno: %d", bodyFilePath, errno);
ASSERT(false); ASSERT(false);
return false; return false;
} }
@ -146,27 +146,27 @@ bool Ver4DictBuffers::flushHeaderAndDictBuffers(const char *const dictDirPath,
bool Ver4DictBuffers::flushDictBuffers(FILE *const file) const { bool Ver4DictBuffers::flushDictBuffers(FILE *const file) const {
// Write trie. // Write trie.
if (!DictFileWritingUtils::writeBufferToFileTail(file, &mExpandableTrieBuffer)) { if (!DictFileWritingUtils::writeBufferToFileTail(file, &mExpandableTrieBuffer)) {
AKLOGE("Trie cannot be written. %s", tmpDirPath); AKLOGE("Trie cannot be written.");
return false; return false;
} }
// Write terminal position lookup table. // Write terminal position lookup table.
if (!mTerminalPositionLookupTable.flushToFile(file)) { if (!mTerminalPositionLookupTable.flushToFile(file)) {
AKLOGE("Terminal position lookup table cannot be written. %s", tmpDirPath); AKLOGE("Terminal position lookup table cannot be written.");
return false; return false;
} }
// Write probability dict content. // Write probability dict content.
if (!mProbabilityDictContent.flushToFile(file)) { if (!mProbabilityDictContent.flushToFile(file)) {
AKLOGE("Probability dict content cannot be written. %s", tmpDirPath); AKLOGE("Probability dict content cannot be written.");
return false; return false;
} }
// Write bigram dict content. // Write bigram dict content.
if (!mBigramDictContent.flushToFile(file)) { if (!mBigramDictContent.flushToFile(file)) {
AKLOGE("Bigram dict content cannot be written. %s", tmpDirPath); AKLOGE("Bigram dict content cannot be written.");
return false; return false;
} }
// Write shortcut dict content. // Write shortcut dict content.
if (!mShortcutDictContent.flushToFile(file)) { if (!mShortcutDictContent.flushToFile(file)) {
AKLOGE("Shortcut dict content cannot be written. %s", tmpDirPath); AKLOGE("Shortcut dict content cannot be written.");
return false; return false;
} }
return true; return true;