code style updates

src/zm_buffer.h

@@ -23,8 +23,7 @@
 #include "zm_logger.h"
 #include <cstring>
 
-class Buffer
+class Buffer {
-{
  protected:
   unsigned char *mStorage;
   unsigned int mAllocation;
@@ -33,18 +32,26 @@ protected:
   unsigned char *mTail;
 
  public:
-  Buffer() : mStorage(nullptr), mAllocation(0), mSize(0), mHead(nullptr), mTail(nullptr) {
+  Buffer() :
+    mStorage(nullptr),
+    mAllocation(0),
+    mSize(0),
+    mHead(nullptr),
+    mTail(nullptr) {
   }
   explicit Buffer(unsigned int pSize) : mAllocation(pSize), mSize(0) {
     mHead = mStorage = new unsigned char[mAllocation];
     mTail = mHead;
   }
-  Buffer(const unsigned char *pStorage, unsigned int pSize) : mAllocation(pSize), mSize(pSize) {
+  Buffer(const unsigned char *pStorage, unsigned int pSize) :
+    mAllocation(pSize), mSize(pSize) {
     mHead = mStorage = new unsigned char[mSize];
     std::memcpy(mStorage, pStorage, mSize);
     mTail = mHead + mSize;
   }
-  Buffer(const Buffer &buffer) : mAllocation(buffer.mSize), mSize(buffer.mSize) {
+  Buffer(const Buffer &buffer) :
+    mAllocation(buffer.mSize),
+    mSize(buffer.mSize) {
     mHead = mStorage = new unsigned char[mSize];
     std::memcpy(mStorage, buffer.mHead, mSize);
     mTail = mHead + mSize;
@@ -77,7 +84,8 @@ public:
   // Trim from the front of the buffer
   unsigned int consume(unsigned int count) {
     if ( count > mSize ) {
-      Warning("Attempt to consume %d bytes of buffer, size is only %d bytes", count, mSize);
+      Warning("Attempt to consume %d bytes of buffer, size is only %d bytes",
+          count, mSize);
       count = mSize;
     }
     mHead += count;
@@ -88,7 +96,8 @@ public:
   // Trim from the end of the buffer
   unsigned int shrink(unsigned int count) {
     if (count > mSize) {
-      Warning("Attempt to shrink buffer by %d bytes, size is only %d bytes", count, mSize);
+      Warning("Attempt to shrink buffer by %d bytes, size is only %d bytes",
+          count, mSize);
       count = mSize;
     }
     mSize -= count;
@@ -103,7 +112,8 @@ public:
   // Return pointer to the first pSize bytes and advance the head
   unsigned char *extract(unsigned int pSize) {
     if (pSize > mSize) {
-      Warning("Attempt to extract %d bytes of buffer, size is only %d bytes", pSize, mSize);
+      Warning("Attempt to extract %d bytes of buffer, size is only %d bytes",
+          pSize, mSize);
       pSize = mSize;
     }
     unsigned char *oldHead = mHead;
@@ -128,9 +138,9 @@ public:
   }
   void tidy(bool level=0) {
     if (mHead != mStorage) {
-      if ( mSize == 0 )
+      if (mSize == 0) {
         mHead = mTail = mStorage;
-      else if ( level ) {
+      } else if (level) {
         if (((uintptr_t)mHead-(uintptr_t)mStorage) > mSize) {
           std::memcpy(mStorage, mHead, mSize);
           mHead = mStorage;
@@ -142,34 +152,34 @@ public:
 
   Buffer &operator=(const Buffer &buffer) {
     assign(buffer);
-    return( *this );
+    return *this;
   }
   Buffer &operator+=(const Buffer &buffer) {
     append(buffer);
-    return( *this );
+    return *this;
   }
   Buffer &operator+=(unsigned int count) {
     expand(count);
-    return( *this );
+    return *this;
   }
   Buffer &operator-=(unsigned int count) {
     consume(count);
     return *this;
   }
   operator unsigned char *() const {
-    return( mHead );
+    return mHead;
   }
   operator char *() const {
-    return( (char *)mHead );
+    return reinterpret_cast<char *>(mHead);
   }
   unsigned char *operator+(int offset) const {
-    return( (unsigned char *)(mHead+offset) );
+    return (unsigned char *)(mHead+offset);
   }
   unsigned char operator[](int index) const {
-    return( *(mHead+index) );
+    return *(mHead+index);
   }
   operator int () const {
-    return( (int)mSize );
+    return static_cast<int>(mSize);
   }
   int read_into(int sd, unsigned int bytes);
 };