Add parenthesis for readability

1 files changed, 44 insertions, 23 deletions

diff --git a/document/src/vespa/document/serialization/vespadocumentdeserializer.cpp b/document/src/vespa/document/serialization/vespadocumentdeserializer.cpp
index d15ebf311bb..747dfbbcee6 100644
--- a/document/src/vespa/document/serialization/vespadocumentdeserializer.cpp
+++ b/document/src/vespa/document/serialization/vespadocumentdeserializer.cpp
@@ -71,7 +71,8 @@ getChunkCount(uint8_t contentCode)
 
 }  // namespace
 
-void VespaDocumentDeserializer::readDocument(Document &value) {
+void
+VespaDocumentDeserializer::readDocument(Document &value) {
     read(value.getId());
     uint8_t content_code = readValue<uint8_t>(_stream);
 
@@ -94,7 +95,8 @@ void VespaDocumentDeserializer::readDocument(Document &value) {
     }
 }
 
-void VespaDocumentDeserializer::read(FieldValue &value) {
+void
+VespaDocumentDeserializer::read(FieldValue &value) {
     value.accept(*this);
 }
 
@@ -117,20 +119,23 @@ VespaDocumentDeserializer::readDocType(const DocumentType &guess)
     return 0;
 }
 
-void VespaDocumentDeserializer::read(DocumentId &value) {
+void
+VespaDocumentDeserializer::read(DocumentId &value) {
     stringref s(_stream.peek());
     value.set(s);
     _stream.adjustReadPos(s.size() + 1);
 }
 
-void VespaDocumentDeserializer::read(DocumentType &value) {
+void
+VespaDocumentDeserializer::read(DocumentType &value) {
     const DocumentType *doc_type = readDocType(value);
     if (doc_type) {
         value = *doc_type;
     }
 }
 
-void VespaDocumentDeserializer::read(Document &value) {
+void
+VespaDocumentDeserializer::read(Document &value) {
     uint16_t version = readValue<uint16_t>(_stream);
     VarScope<uint16_t> version_scope(_version, version);
 
@@ -154,11 +159,13 @@ void VespaDocumentDeserializer::read(Document &value) {
 
 }
 
-void VespaDocumentDeserializer::read(AnnotationReferenceFieldValue &value) {
+void
+VespaDocumentDeserializer::read(AnnotationReferenceFieldValue &value) {
     value.setAnnotationIndex(getInt1_2_4Bytes(_stream));
 }
 
-void VespaDocumentDeserializer::read(ArrayFieldValue &value) {
+void
+VespaDocumentDeserializer::read(ArrayFieldValue &value) {
     uint32_t size = readSize(_stream);
     value.clear();
     value.resize(size);
@@ -167,7 +174,8 @@ void VespaDocumentDeserializer::read(ArrayFieldValue &value) {
     }
 }
 
-void VespaDocumentDeserializer::read(MapFieldValue &value) {
+void
+VespaDocumentDeserializer::read(MapFieldValue &value) {
     value.clear();
     uint32_t size = readSize(_stream);
     value.resize(size);
@@ -194,31 +202,38 @@ void readFieldValue(nbostream &input, T &value) {
 
 }  // namespace
 
-void VespaDocumentDeserializer::read(BoolFieldValue &value) {
+void
+VespaDocumentDeserializer::read(BoolFieldValue &value) {
     readFieldValue(_stream, value);
 }
 
-void VespaDocumentDeserializer::read(ByteFieldValue &value) {
+void
+VespaDocumentDeserializer::read(ByteFieldValue &value) {
     readFieldValue(_stream, value);
 }
 
-void VespaDocumentDeserializer::read(DoubleFieldValue &value) {
+void
+VespaDocumentDeserializer::read(DoubleFieldValue &value) {
     readFieldValue(_stream, value);
 }
 
-void VespaDocumentDeserializer::read(FloatFieldValue &value) {
+void
+VespaDocumentDeserializer::read(FloatFieldValue &value) {
     readFieldValue(_stream, value);
 }
 
-void VespaDocumentDeserializer::read(IntFieldValue &value) {
+void
+VespaDocumentDeserializer::read(IntFieldValue &value) {
     readFieldValue(_stream, value);
 }
 
-void VespaDocumentDeserializer::read(LongFieldValue &value) {
+void
+VespaDocumentDeserializer::read(LongFieldValue &value) {
     readFieldValue(_stream, value);
 }
 
-void VespaDocumentDeserializer::read(PredicateFieldValue &value) {
+void
+VespaDocumentDeserializer::read(PredicateFieldValue &value) {
     uint32_t stored_size = readValue<uint32_t>(_stream);
     Memory memory(_stream.peek(), _stream.size());
     std::unique_ptr<Slime> slime(new Slime);
@@ -242,18 +257,21 @@ void setValue(FV &field_value, stringref val, bool use_ref) {
 }
 }  // namespace
 
-void VespaDocumentDeserializer::read(RawFieldValue &value) {
+void
+VespaDocumentDeserializer::read(RawFieldValue &value) {
     uint32_t size = readValue<uint32_t>(_stream);
     stringref val(_stream.peek(), size);
     setValue(value, val, _stream.isLongLivedBuffer());
     _stream.adjustReadPos(size);
 }
 
-void VespaDocumentDeserializer::read(ShortFieldValue &value) {
+void
+VespaDocumentDeserializer::read(ShortFieldValue &value) {
     readFieldValue(_stream, value);
 }
 
-void VespaDocumentDeserializer::read(StringFieldValue &value) {
+void
+VespaDocumentDeserializer::read(StringFieldValue &value) {
     uint8_t coding = readValue<uint8_t>(_stream);
     size_t size = getInt1_4Bytes(_stream);
     if (size == 0) {
@@ -322,7 +340,8 @@ deCompress(CompressionConfig::Type compression, uint32_t uncompressedLength, ves
 
 }  // namespace
 
-void VespaDocumentDeserializer::readStructNoReset(StructFieldValue &value) {
+void
+VespaDocumentDeserializer::readStructNoReset(StructFieldValue &value) {
     size_t data_size = readValue<uint32_t>(_stream);
 
     CompressionConfig::Type compression_type = CompressionConfig::Type(readValue<uint8_t>(_stream));
@@ -345,9 +364,9 @@ void VespaDocumentDeserializer::readStructNoReset(StructFieldValue &value) {
     if (data_size > 0) {
         ByteBuffer buffer = CompressionConfig::isCompressed(compression_type)
                             ? deCompress(compression_type, uncompressed_size, ConstBufferRef(_stream.peek(), data_size))
-                            : _stream.isLongLivedBuffer()
+                            : (_stream.isLongLivedBuffer()
                                 ? ByteBuffer(_stream.peek(), data_size)
-                                : ByteBuffer::copyBuffer(_stream.peek(), data_size);
+                                : ByteBuffer::copyBuffer(_stream.peek(), data_size));
         if (value.getFields().empty()) {
             LOG(spam, "Lazy deserializing into %s with _version %u", value.getDataType()->getName().c_str(), _version);
             value.lazyDeserialize(_repo, _version, std::move(field_info), std::move(buffer));
@@ -376,7 +395,8 @@ VespaDocumentDeserializer::read(StructFieldValue& value)
     readStructNoReset(value);
 }
 
-void VespaDocumentDeserializer::read(WeightedSetFieldValue &value) {
+void
+VespaDocumentDeserializer::read(WeightedSetFieldValue &value) {
     value.clear();
     readValue<uint32_t>(_stream);  // skip type id
     uint32_t size = readValue<uint32_t>(_stream);
@@ -420,7 +440,8 @@ VespaDocumentDeserializer::readTensor()
     return tensor;
 }
 
-void VespaDocumentDeserializer::read(ReferenceFieldValue& value) {
+void
+VespaDocumentDeserializer::read(ReferenceFieldValue& value) {
     const bool hasId(readValue<uint8_t>(_stream) == 1);
     if (hasId) {
         DocumentId id;