From cd1d3765a918b0d562e9cf5c0f7c19cefbb92765 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Sat, 23 Nov 2013 16:28:21 -0800
Subject: [PATCH] cleaned up const semantics and DRYed up appendBitMask

---
 libraries/shared/src/SharedUtil.cpp                  | 2 +-
 libraries/shared/src/SharedUtil.h                    | 2 +-
 libraries/voxel-server-library/src/VoxelNodeData.cpp | 2 +-
 libraries/voxel-server-library/src/VoxelNodeData.h   | 2 +-
 libraries/voxels/src/VoxelPacket.cpp                 | 9 +--------
 libraries/voxels/src/VoxelPacket.h                   | 2 +-
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index 99b24979cc..8c56c250e0 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -60,7 +60,7 @@ bool shouldDo(float desiredInterval, float deltaTime) {
     return randFloat() < deltaTime / desiredInterval;
 }
 
-void outputBufferBits(unsigned char* buffer, int length, bool withNewLine) {
+void outputBufferBits(const unsigned char* buffer, int length, bool withNewLine) {
     for (int i = 0; i < length; i++) {
         outputBits(buffer[i], false);
     }
diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h
index 8f04ee15d5..29298ab944 100644
--- a/libraries/shared/src/SharedUtil.h
+++ b/libraries/shared/src/SharedUtil.h
@@ -52,7 +52,7 @@ bool randomBoolean();
 
 bool shouldDo(float desiredInterval, float deltaTime);
 
-void outputBufferBits(unsigned char* buffer, int length, bool withNewLine = true);
+void outputBufferBits(const unsigned char* buffer, int length, bool withNewLine = true);
 void outputBits(unsigned char byte, bool withNewLine = true);
 void printVoxelCode(unsigned char* voxelCode);
 int numberOfOnes(unsigned char byte);
diff --git a/libraries/voxel-server-library/src/VoxelNodeData.cpp b/libraries/voxel-server-library/src/VoxelNodeData.cpp
index 363f58fc8b..6b7b704bf1 100644
--- a/libraries/voxel-server-library/src/VoxelNodeData.cpp
+++ b/libraries/voxel-server-library/src/VoxelNodeData.cpp
@@ -105,7 +105,7 @@ void VoxelNodeData::resetVoxelPacket() {
     _voxelPacketWaiting = false;
 }
 
-void VoxelNodeData::writeToPacket(unsigned char* buffer, int bytes) {
+void VoxelNodeData::writeToPacket(const unsigned char* buffer, int bytes) {
     memcpy(_voxelPacketAt, buffer, bytes);
     _voxelPacketAvailableBytes -= bytes;
     _voxelPacketAt += bytes;
diff --git a/libraries/voxel-server-library/src/VoxelNodeData.h b/libraries/voxel-server-library/src/VoxelNodeData.h
index c21b99a308..373a6e0886 100644
--- a/libraries/voxel-server-library/src/VoxelNodeData.h
+++ b/libraries/voxel-server-library/src/VoxelNodeData.h
@@ -28,7 +28,7 @@ public:
 
     void resetVoxelPacket();  // resets voxel packet to after "V" header
 
-    void writeToPacket(unsigned char* buffer, int bytes); // writes to end of packet
+    void writeToPacket(const unsigned char* buffer, int bytes); // writes to end of packet
 
     const unsigned char* getPacket() const { return _voxelPacket; }
     int getPacketLength() const { return (MAX_VOXEL_PACKET_SIZE - _voxelPacketAvailableBytes); }
diff --git a/libraries/voxels/src/VoxelPacket.cpp b/libraries/voxels/src/VoxelPacket.cpp
index 80060853f1..657f2a99be 100644
--- a/libraries/voxels/src/VoxelPacket.cpp
+++ b/libraries/voxels/src/VoxelPacket.cpp
@@ -106,14 +106,7 @@ void VoxelPacket::endLevel() {
 }
 
 bool VoxelPacket::appendBitMask(unsigned char bitmask) {
-    bool success = false;
-    if (_bytesAvailable > 0) {
-        _buffer[_bytesInUse] = bitmask;
-        _bytesInUse++;
-        _bytesAvailable--; 
-        success = true;
-    }
-    return success;
+    return append(bitmask);
 }
 
 bool VoxelPacket::appendColor(const nodeColor& color) {
diff --git a/libraries/voxels/src/VoxelPacket.h b/libraries/voxels/src/VoxelPacket.h
index dca796de23..66591bd568 100644
--- a/libraries/voxels/src/VoxelPacket.h
+++ b/libraries/voxels/src/VoxelPacket.h
@@ -66,7 +66,7 @@ public:
     int getUncompressedByteOffset(int offsetFromEnd = 0) const { return _bytesInUse - offsetFromEnd; }
 
     /// get access to the finalized data (it may be compressed or rewritten into optimal form)
-    unsigned char* getFinalizedData() { return &_buffer[0]; }
+    const unsigned char* getFinalizedData() { return &_buffer[0]; }
     /// get size of the finalized data (it may be compressed or rewritten into optimal form)
     int getFinalizedSize() const { return _bytesInUse; }