From 5e21ac60b0f6f2aa0be37b51d13d7985a5395ceb Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Wed, 30 Jan 2013 23:44:22 +0900
Subject: [PATCH] Small cleanups in binary_format.h
Change-Id: I6049a2f312b7d53a3ffa688ddca5731004784ebe
---
native/jni/src/binary_format.h | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/native/jni/src/binary_format.h b/native/jni/src/binary_format.h
index f19d5e3eac..2d7c4b492a 100644
--- a/native/jni/src/binary_format.h
+++ b/native/jni/src/binary_format.h
@@ -18,9 +18,9 @@
#define LATINIME_BINARY_FORMAT_H
#include <cstdlib>
-#include <limits>
#include <map>
#include <stdint.h>
+
#include "bloom_filter.h"
#include "char_utils.h"
@@ -66,8 +66,8 @@ class BinaryFormat {
static int detectFormat(const uint8_t *const dict);
static int getHeaderSize(const uint8_t *const dict);
static int getFlags(const uint8_t *const dict);
- static void readHeaderValue(const uint8_t *const dict, const char *const key,
- int *outValue, const int outValueSize);
+ static void readHeaderValue(const uint8_t *const dict, const char *const key, int *outValue,
+ const int outValueSize);
static int readHeaderValueInt(const uint8_t *const dict, const char *const key);
static int getGroupCountAndForwardPointer(const uint8_t *const dict, int *pos);
static uint8_t getFlagsAndForwardPointer(const uint8_t *const dict, int *pos);
@@ -168,7 +168,7 @@ inline int BinaryFormat::getHeaderSize(const uint8_t *const dict) {
// See the format of the header in the comment in detectFormat() above
return (dict[8] << 24) + (dict[9] << 16) + (dict[10] << 8) + dict[11];
default:
- return std::numeric_limits<int>::max();
+ return S_INT_MAX;
}
}
@@ -197,8 +197,7 @@ inline void BinaryFormat::readHeaderValue(const uint8_t *const dict, const char
if (codePoint == NOT_A_CODE_POINT && key[keyIndex] == 0) {
// We found the key! Copy and return the value.
codePoint = getCodePointAndForwardPointer(dict, &index);
- while (codePoint != NOT_A_CODE_POINT
- && outValueIndex < outValueSize) {
+ while (codePoint != NOT_A_CODE_POINT && outValueIndex < outValueSize) {
outValue[outValueIndex++] = codePoint;
codePoint = getCodePointAndForwardPointer(dict, &index);
}
@@ -664,9 +663,8 @@ inline int BinaryFormat::getProbability(const int position, const std::map<int,
if (bigramFreqIt != bigramMap->end()) {
const int bigramFreq = bigramFreqIt->second;
return computeFrequencyForBigram(unigramFreq, bigramFreq);
- } else {
- return backoff(unigramFreq);
}
+ return backoff(unigramFreq);
}
} // namespace latinime
#endif // LATINIME_BINARY_FORMAT_H
--
GitLab