Fix several coding style issues
This CL does nothing but addresses several coding style issues and typos.
No behavior change is intended.
BUG=none
TEST=unittest
git-svn-id: https://mozc.googlecode.com/svn/trunk@367 a6090854-d499-a067-5803-1114d4e51264
diff --git a/src/base/thread.cc b/src/base/thread.cc
index 60110a8..fbfe8d9 100644
--- a/src/base/thread.cc
+++ b/src/base/thread.cc
@@ -235,7 +235,7 @@
}
#else
{
- // Covert: the pthread_cleanup_push/pthread_cleanup_pop pair should be put
+ // Caveat: the pthread_cleanup_push/pthread_cleanup_pop pair should be put
// in the same function. Never move them into any other function.
pthread_cleanup_push(PThreadCleanupRoutine,
static_cast<void *>(&p->state_->is_running_));
diff --git a/src/base/util.cc b/src/base/util.cc
index e235cc6..c4f6be5 100644
--- a/src/base/util.cc
+++ b/src/base/util.cc
@@ -1727,8 +1727,7 @@
namespace {
-Util::ScriptType GetScriptTypeInternal(const string &str,
- bool ignore_symbols) {
+Util::ScriptType GetScriptTypeInternal(const string &str, bool ignore_symbols) {
Util::ScriptType result = Util::SCRIPT_TYPE_SIZE;
for (ConstChar32Iterator iter(str); !iter.Done(); iter.Next()) {
diff --git a/src/build_mozc.py b/src/build_mozc.py
index 48854fb..19efcec 100644
--- a/src/build_mozc.py
+++ b/src/build_mozc.py
@@ -1028,8 +1028,8 @@
# Only for android testing.
os.environ['ANDROID_DEVICES'] = options.android_device
- short_basename = GetBuildShortBaseName(options,
- GetMozcVersion().GetTargetPlatform())
+ short_basename = GetBuildShortBaseName(options,
+ GetMozcVersion().GetTargetPlatform())
make_command = ninja
build_args = ['-j %s' % options.jobs,
'-C', '%s/%s' % (short_basename, options.configuration)]
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 4a9b632..4771bd0 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
MAJOR=1
MINOR=15
-BUILD=1910
+BUILD=1911
REVISION=102
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
# downloaded by NaCl Mozc.
diff --git a/src/prediction/user_history_predictor.cc b/src/prediction/user_history_predictor.cc
index 7c66a74..13481fc 100644
--- a/src/prediction/user_history_predictor.cc
+++ b/src/prediction/user_history_predictor.cc
@@ -1825,7 +1825,6 @@
}
}
-// type
// static
UserHistoryPredictor::MatchType UserHistoryPredictor::GetMatchType(
const string &lstr, const string &rstr) {
diff --git a/src/rewriter/variants_rewriter.cc b/src/rewriter/variants_rewriter.cc
index d214f48..e1502ea 100644
--- a/src/rewriter/variants_rewriter.cc
+++ b/src/rewriter/variants_rewriter.cc
@@ -319,7 +319,7 @@
// Meta Candidate
for (size_t i = 0; i < seg->meta_candidates_size(); ++i) {
Segment::Candidate *candidate =
- seg->mutable_candidate(-static_cast<int>(i)-1);
+ seg->mutable_candidate(-static_cast<int>(i) - 1);
DCHECK(candidate);
if (candidate->attributes & Segment::Candidate::NO_EXTRA_DESCRIPTION) {
continue;
diff --git a/src/rewriter/variants_rewriter_test.cc b/src/rewriter/variants_rewriter_test.cc
index 9112887..929ca7e 100644
--- a/src/rewriter/variants_rewriter_test.cc
+++ b/src/rewriter/variants_rewriter_test.cc
@@ -788,4 +788,5 @@
const ConversionRequest request;
EXPECT_EQ(RewriterInterface::ALL, rewriter->capability(request));
}
+
} // namespace mozc
diff --git a/src/unix/ibus/ibus_header.h b/src/unix/ibus/ibus_header.h
index 971f292..c58a888 100644
--- a/src/unix/ibus/ibus_header.h
+++ b/src/unix/ibus/ibus_header.h
@@ -42,5 +42,4 @@
#endif // !MOZC_ENABLE_IBUS_INPUT_PURPOSE
#endif // libibus (>=1.5.4)
-
#endif // MOZC_UNIX_IBUS_IBUS_HEADER_H_
