SERVER-18579: Clang-Format - reformat code, no comment reflow

1 files changed, 135 insertions, 136 deletions

diff --git a/src/mongo/db/dbmessage.cpp b/src/mongo/db/dbmessage.cpp
index 2dbbce7704a..a91178afa16 100644
--- a/src/mongo/db/dbmessage.cpp
+++ b/src/mongo/db/dbmessage.cpp
@@ -33,16 +33,16 @@
 
 namespace mongo {
 
-    using std::string;
-    using std::stringstream;
-
-    string Message::toString() const {
-        stringstream ss;
-        ss << "op: " << opToString( operation() ) << " len: " << size();
-        if ( operation() >= 2000 && operation() < 2100 ) {
-            DbMessage d(*this);
-            ss << " ns: " << d.getns();
-            switch ( operation() ) {
+using std::string;
+using std::stringstream;
+
+string Message::toString() const {
+    stringstream ss;
+    ss << "op: " << opToString(operation()) << " len: " << size();
+    if (operation() >= 2000 && operation() < 2100) {
+        DbMessage d(*this);
+        ss << " ns: " << d.getns();
+        switch (operation()) {
             case dbUpdate: {
                 int flags = d.pullInt();
                 BSONObj q = d.nextJsObj();
@@ -61,168 +61,167 @@ namespace mongo {
             }
             default:
                 ss << " CANNOT HANDLE YET";
-            }
-
-
         }
-        return ss.str();
     }
+    return ss.str();
+}
 
-    DbMessage::DbMessage(const Message& msg) : _msg(msg), _nsStart(NULL), _mark(NULL), _nsLen(0) {
-        // for received messages, Message has only one buffer
-        _theEnd = _msg.singleData().data() + _msg.singleData().dataLen();
-        _nextjsobj = _msg.singleData().data();
-
-        _reserved = readAndAdvance<int>();
+DbMessage::DbMessage(const Message& msg) : _msg(msg), _nsStart(NULL), _mark(NULL), _nsLen(0) {
+    // for received messages, Message has only one buffer
+    _theEnd = _msg.singleData().data() + _msg.singleData().dataLen();
+    _nextjsobj = _msg.singleData().data();
 
-        // Read packet for NS
-        if (messageShouldHaveNs()) {
+    _reserved = readAndAdvance<int>();
 
-            // Limit = buffer size of message -
-            //        (first int4 in message which is either flags or a zero constant)
-            size_t limit = _msg.singleData().dataLen() - sizeof(int);
+    // Read packet for NS
+    if (messageShouldHaveNs()) {
+        // Limit = buffer size of message -
+        //        (first int4 in message which is either flags or a zero constant)
+        size_t limit = _msg.singleData().dataLen() - sizeof(int);
 
-            _nsStart = _nextjsobj;
-            _nsLen = strnlen(_nsStart, limit);
+        _nsStart = _nextjsobj;
+        _nsLen = strnlen(_nsStart, limit);
 
-            // Validate there is room for a null byte in the buffer
-            // Strings can be zero length
-            uassert(18633, "Failed to parse ns string", _nsLen < limit);
+        // Validate there is room for a null byte in the buffer
+        // Strings can be zero length
+        uassert(18633, "Failed to parse ns string", _nsLen < limit);
 
-            _nextjsobj += _nsLen + 1; // skip namespace + null
-        }
+        _nextjsobj += _nsLen + 1;  // skip namespace + null
     }
+}
 
-    const char * DbMessage::getns() const {
-        verify(messageShouldHaveNs());
-        return _nsStart;
-    }
+const char* DbMessage::getns() const {
+    verify(messageShouldHaveNs());
+    return _nsStart;
+}
 
-    int DbMessage::getQueryNToReturn() const {
-        verify(messageShouldHaveNs());
-        const char* p = _nsStart + _nsLen + 1;
-        checkRead<int>(p, 2);
+int DbMessage::getQueryNToReturn() const {
+    verify(messageShouldHaveNs());
+    const char* p = _nsStart + _nsLen + 1;
+    checkRead<int>(p, 2);
 
-        return ConstDataView(p).read<LittleEndian<int32_t>>(sizeof(int32_t));
-    }
+    return ConstDataView(p).read<LittleEndian<int32_t>>(sizeof(int32_t));
+}
 
-    int DbMessage::pullInt() {
-        return readAndAdvance<int32_t>();
-    }
+int DbMessage::pullInt() {
+    return readAndAdvance<int32_t>();
+}
 
-    long long DbMessage::pullInt64() {
-        return readAndAdvance<int64_t>();
-    }
+long long DbMessage::pullInt64() {
+    return readAndAdvance<int64_t>();
+}
 
-    const char* DbMessage::getArray(size_t count) const {
-        checkRead<long long>(_nextjsobj, count);
-        return _nextjsobj;
-    }
+const char* DbMessage::getArray(size_t count) const {
+    checkRead<long long>(_nextjsobj, count);
+    return _nextjsobj;
+}
 
-    BSONObj DbMessage::nextJsObj() {
-        massert(10304,
+BSONObj DbMessage::nextJsObj() {
+    massert(10304,
             "Client Error: Remaining data too small for BSON object",
             _nextjsobj != NULL && _theEnd - _nextjsobj >= 5);
 
-        if (serverGlobalParams.objcheck) {
-            Status status = validateBSON(_nextjsobj, _theEnd - _nextjsobj);
-            massert(10307,
+    if (serverGlobalParams.objcheck) {
+        Status status = validateBSON(_nextjsobj, _theEnd - _nextjsobj);
+        massert(10307,
                 str::stream() << "Client Error: bad object in message: " << status.reason(),
                 status.isOK());
-        }
-
-        BSONObj js(_nextjsobj);
-        verify(js.objsize() >= 5);
-        verify(js.objsize() <= (_theEnd - _nextjsobj));
-
-        _nextjsobj += js.objsize();
-        if (_nextjsobj >= _theEnd)
-            _nextjsobj = NULL;
-        return js;
     }
 
-    void DbMessage::markReset(const char * toMark = NULL) {
-        if (toMark == NULL) {
-            toMark = _mark;
-        }
+    BSONObj js(_nextjsobj);
+    verify(js.objsize() >= 5);
+    verify(js.objsize() <= (_theEnd - _nextjsobj));
 
-        verify(toMark);
-        _nextjsobj = toMark;
-    }
+    _nextjsobj += js.objsize();
+    if (_nextjsobj >= _theEnd)
+        _nextjsobj = NULL;
+    return js;
+}
 
-    template<typename T>
-    void DbMessage::checkRead(const char* start, size_t count) const {
-        if ((_theEnd - start) < static_cast<int>(sizeof(T) * count)) {
-            uassert(18634, "Not enough data to read", false);
-        }
+void DbMessage::markReset(const char* toMark = NULL) {
+    if (toMark == NULL) {
+        toMark = _mark;
     }
 
-    template<typename T>
-    T DbMessage::read() const {
-        checkRead<T>(_nextjsobj, 1);
+    verify(toMark);
+    _nextjsobj = toMark;
+}
 
-        return ConstDataView(_nextjsobj).read<LittleEndian<T>>();
+template <typename T>
+void DbMessage::checkRead(const char* start, size_t count) const {
+    if ((_theEnd - start) < static_cast<int>(sizeof(T) * count)) {
+        uassert(18634, "Not enough data to read", false);
     }
+}
 
-    template<typename T> T DbMessage::readAndAdvance() {
-        T t = read<T>();
-        _nextjsobj += sizeof(T);
-        return t;
-    }
+template <typename T>
+T DbMessage::read() const {
+    checkRead<T>(_nextjsobj, 1);
 
-    void replyToQuery(int queryResultFlags,
-                      AbstractMessagingPort* p, Message& requestMsg,
-                      void *data, int size,
-                      int nReturned, int startingFrom,
-                      long long cursorId 
-                      ) {
-        BufBuilder b(32768);
-        b.skip(sizeof(QueryResult::Value));
-        b.appendBuf(data, size);
-        QueryResult::View qr = b.buf();
-        qr.setResultFlags(queryResultFlags);
-        qr.msgdata().setLen(b.len());
-        qr.msgdata().setOperation(opReply);
-        qr.setCursorId(cursorId);
-        qr.setStartingFrom(startingFrom);
-        qr.setNReturned(nReturned);
-        b.decouple();
-        Message resp(qr.view2ptr(), true);
-        p->reply(requestMsg, resp, requestMsg.header().getId());
-    }
+    return ConstDataView(_nextjsobj).read<LittleEndian<T>>();
+}
 
-    void replyToQuery(int queryResultFlags,
-                      AbstractMessagingPort* p, Message& requestMsg,
-                      const BSONObj& responseObj) {
-        replyToQuery(queryResultFlags,
-                     p, requestMsg,
-                     (void *) responseObj.objdata(), responseObj.objsize(), 1);
-    }
+template <typename T>
+T DbMessage::readAndAdvance() {
+    T t = read<T>();
+    _nextjsobj += sizeof(T);
+    return t;
+}
 
-    void replyToQuery( int queryResultFlags, Message &m, DbResponse &dbresponse, BSONObj obj ) {
-        Message *resp = new Message();
-        replyToQuery( queryResultFlags, *resp, obj );
-        dbresponse.response = resp;
-        dbresponse.responseTo = m.header().getId();
-    }
+void replyToQuery(int queryResultFlags,
+                  AbstractMessagingPort* p,
+                  Message& requestMsg,
+                  void* data,
+                  int size,
+                  int nReturned,
+                  int startingFrom,
+                  long long cursorId) {
+    BufBuilder b(32768);
+    b.skip(sizeof(QueryResult::Value));
+    b.appendBuf(data, size);
+    QueryResult::View qr = b.buf();
+    qr.setResultFlags(queryResultFlags);
+    qr.msgdata().setLen(b.len());
+    qr.msgdata().setOperation(opReply);
+    qr.setCursorId(cursorId);
+    qr.setStartingFrom(startingFrom);
+    qr.setNReturned(nReturned);
+    b.decouple();
+    Message resp(qr.view2ptr(), true);
+    p->reply(requestMsg, resp, requestMsg.header().getId());
+}
 
-    void replyToQuery( int queryResultFlags, Message& response, const BSONObj& resultObj ) {
-        BufBuilder bufBuilder;
-        bufBuilder.skip( sizeof( QueryResult::Value ));
-        bufBuilder.appendBuf( reinterpret_cast< void *>(
-                const_cast< char* >( resultObj.objdata() )), resultObj.objsize() );
+void replyToQuery(int queryResultFlags,
+                  AbstractMessagingPort* p,
+                  Message& requestMsg,
+                  const BSONObj& responseObj) {
+    replyToQuery(
+        queryResultFlags, p, requestMsg, (void*)responseObj.objdata(), responseObj.objsize(), 1);
+}
 
-        QueryResult::View queryResult = bufBuilder.buf();
-        bufBuilder.decouple();
+void replyToQuery(int queryResultFlags, Message& m, DbResponse& dbresponse, BSONObj obj) {
+    Message* resp = new Message();
+    replyToQuery(queryResultFlags, *resp, obj);
+    dbresponse.response = resp;
+    dbresponse.responseTo = m.header().getId();
+}
 
-        queryResult.setResultFlags(queryResultFlags);
-        queryResult.msgdata().setLen(bufBuilder.len());
-        queryResult.msgdata().setOperation( opReply );
-        queryResult.setCursorId(0);
-        queryResult.setStartingFrom(0);
-        queryResult.setNReturned(1);
+void replyToQuery(int queryResultFlags, Message& response, const BSONObj& resultObj) {
+    BufBuilder bufBuilder;
+    bufBuilder.skip(sizeof(QueryResult::Value));
+    bufBuilder.appendBuf(reinterpret_cast<void*>(const_cast<char*>(resultObj.objdata())),
+                         resultObj.objsize());
 
-        response.setData( queryResult.view2ptr(), true ); // transport will free
-    }
+    QueryResult::View queryResult = bufBuilder.buf();
+    bufBuilder.decouple();
 
+    queryResult.setResultFlags(queryResultFlags);
+    queryResult.msgdata().setLen(bufBuilder.len());
+    queryResult.msgdata().setOperation(opReply);
+    queryResult.setCursorId(0);
+    queryResult.setStartingFrom(0);
+    queryResult.setNReturned(1);
+
+    response.setData(queryResult.view2ptr(), true);  // transport will free
+}
 }