diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-04-15 15:16:30 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-04-15 15:16:30 +0200 |
commit | e1ed13aea16eae9f7218f5bf8f5b970182363969 (patch) | |
tree | 9d80cc8b0c952e847fac2ec296813b4f91526a1d | |
parent | 1af7f6a5d6f699dd7b6954430f7f68eae3b9807a (diff) |
Style fixes.
4 files changed, 8 insertions, 6 deletions
diff --git a/searchlib/src/vespa/searchlib/bitcompression/compression.cpp b/searchlib/src/vespa/searchlib/bitcompression/compression.cpp index 54e32c022b5..dfcdd991b22 100644 --- a/searchlib/src/vespa/searchlib/bitcompression/compression.cpp +++ b/searchlib/src/vespa/searchlib/bitcompression/compression.cpp @@ -17,9 +17,10 @@ CodingTables::CodingTables() unsigned int x; uint8_t log2Val; - for (x=0; x<65536; x++) { + for (x = 0; x < 65536; x++) { unsigned int val = x; - for (log2Val = 0; (val >>= 1) != 0; log2Val++) { } + for (log2Val = 0; (val >>= 1) != 0; log2Val++) { + } _log2Table[x] = log2Val; } } diff --git a/searchlib/src/vespa/searchlib/bitcompression/pagedict4.cpp b/searchlib/src/vespa/searchlib/bitcompression/pagedict4.cpp index 85b6df7af12..33f18d83af5 100644 --- a/searchlib/src/vespa/searchlib/bitcompression/pagedict4.cpp +++ b/searchlib/src/vespa/searchlib/bitcompression/pagedict4.cpp @@ -106,7 +106,7 @@ getLCP(vespalib::stringref word, size_t len2 = prevWord.size(); size_t res = 0; - while (res < len1 && res < len2 && res < 254u && word[res] == prevWord[res]) { + while ((res < len1) && (res < len2) && (res < 254u) && (word[res] == prevWord[res])) { ++res; } return res; @@ -492,7 +492,7 @@ PageDict4SPWriter::addL3Skip(vespalib::stringref word, addLCPWord(word, lcp, _words); _l3WordOffset = _words.size(); _l3PageNum = pageNum; - if (_l3Size + _l4Size + _l5Size + _headerSize + 8 * _l3WordOffset > getPageBitSize()) { + if (_l3Size + _l4Size + _l5Size + _headerSize + (8 * _l3WordOffset) > getPageBitSize()) { // Cannot convert tentative writes to full writes due to overflow. // Flush existing full writes. flushPage(); diff --git a/searchlib/src/vespa/searchlib/diskindex/fusion.cpp b/searchlib/src/vespa/searchlib/diskindex/fusion.cpp index 2f45ef8e532..fc198e3b74e 100644 --- a/searchlib/src/vespa/searchlib/diskindex/fusion.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/fusion.cpp @@ -405,7 +405,8 @@ Fusion::ReadMappingFiles(const SchemaUtil::IndexIterator *index) const Schema &oldSchema = oi.getSchema(); if (!SchemaUtil::getIndexIds(oldSchema, DataType::STRING, - oldIndexes)) { + oldIndexes)) + { return false; } if (oldIndexes.empty()) { diff --git a/searchlib/src/vespa/searchlib/diskindex/zcposting.cpp b/searchlib/src/vespa/searchlib/diskindex/zcposting.cpp index 19faceb2b27..e40842737c9 100644 --- a/searchlib/src/vespa/searchlib/diskindex/zcposting.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/zcposting.cpp @@ -96,7 +96,7 @@ void Zc4PostingSeqRead:: readCommonWordDocIdAndFeatures(DocIdAndFeatures &features) { - if (_zcDocIds._valI >= _zcDocIds._valE && _hasMore) { + if ((_zcDocIds._valI >= _zcDocIds._valE) && _hasMore) { readWordStart(); // Read start of next chunk } // Split docid & features. |