From 3145a543d97d0e7cf1725ee68fd66b06a7fcc0c9 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Tue, 17 Sep 2013 17:34:47 -0700
Subject: [PATCH] fixed CR feedback

---
 .../voxel-server-library/src/VoxelServer.cpp     | 16 +++++++---------
 libraries/voxel-server-library/src/VoxelServer.h |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/libraries/voxel-server-library/src/VoxelServer.cpp b/libraries/voxel-server-library/src/VoxelServer.cpp
index 9ff2c44066..257f9b2640 100644
--- a/libraries/voxel-server-library/src/VoxelServer.cpp
+++ b/libraries/voxel-server-library/src/VoxelServer.cpp
@@ -50,7 +50,7 @@ VoxelServer::VoxelServer(Assignment::Command command, Assignment::Location locat
     _argv = NULL;
     _dontKillOnMissingDomain = false;
 
-    _PACKETS_PER_CLIENT_PER_INTERVAL = 10;
+    _packetsPerClientPerInterval = 10;
     _wantVoxelPersist = true;
     _wantLocalDomain = false;
     _debugVoxelSending = false;
@@ -72,7 +72,7 @@ VoxelServer::VoxelServer(const unsigned char* dataBuffer, int numBytes) : Assign
     _argv = NULL;
     _dontKillOnMissingDomain = false;
 
-    _PACKETS_PER_CLIENT_PER_INTERVAL = 10;
+    _packetsPerClientPerInterval = 10;
     _wantVoxelPersist = true;
     _wantLocalDomain = false;
     _debugVoxelSending = false;
@@ -250,11 +250,11 @@ void VoxelServer::run() {
     const char* PACKETS_PER_SECOND = "--packetsPerSecond";
     const char* packetsPerSecond = getCmdOption(_argc, _argv, PACKETS_PER_SECOND);
     if (packetsPerSecond) {
-        _PACKETS_PER_CLIENT_PER_INTERVAL = atoi(packetsPerSecond)/INTERVALS_PER_SECOND;
-        if (_PACKETS_PER_CLIENT_PER_INTERVAL < 1) {
-            _PACKETS_PER_CLIENT_PER_INTERVAL = 1;
+        _packetsPerClientPerInterval = atoi(packetsPerSecond) / INTERVALS_PER_SECOND;
+        if (_packetsPerClientPerInterval < 1) {
+            _packetsPerClientPerInterval = 1;
         }
-        printf("packetsPerSecond=%s PACKETS_PER_CLIENT_PER_INTERVAL=%d\n", packetsPerSecond, _PACKETS_PER_CLIENT_PER_INTERVAL);
+        printf("packetsPerSecond=%s PACKETS_PER_CLIENT_PER_INTERVAL=%d\n", packetsPerSecond, _packetsPerClientPerInterval);
     }
     
     // for now, initialize the environments with fixed values
@@ -342,9 +342,7 @@ void VoxelServer::run() {
         }
     }
     
-    if (_jurisdiction) {
-        delete _jurisdiction;
-    }
+    delete _jurisdiction;
     
     if (_jurisdictionSender) {
         _jurisdictionSender->terminate();
diff --git a/libraries/voxel-server-library/src/VoxelServer.h b/libraries/voxel-server-library/src/VoxelServer.h
index 3a7d0e5c48..6eb412ea68 100644
--- a/libraries/voxel-server-library/src/VoxelServer.h
+++ b/libraries/voxel-server-library/src/VoxelServer.h
@@ -53,7 +53,7 @@ public:
     void lockTree() {  pthread_mutex_lock(&_treeLock); }
     void unlockTree() {  pthread_mutex_unlock(&_treeLock); }
     
-    int getPacketsPerClientPerInterval() const { return _PACKETS_PER_CLIENT_PER_INTERVAL; }
+    int getPacketsPerClientPerInterval() const { return _packetsPerClientPerInterval; }
     bool getSendMinimalEnvironment() const { return _sendMinimalEnvironment; }
     EnvironmentData* getEnvironmentData(int i) { return &_environmentData[i]; }
     int getEnvironmentDataCount() const { return sizeof(_environmentData)/sizeof(EnvironmentData); }
@@ -64,7 +64,7 @@ private:
     bool _dontKillOnMissingDomain;
 
     char _voxelPersistFilename[MAX_FILENAME_LENGTH];
-    int _PACKETS_PER_CLIENT_PER_INTERVAL;
+    int _packetsPerClientPerInterval;
     VoxelTree _serverTree; // this IS a reaveraging tree 
     bool _wantVoxelPersist;
     bool _wantLocalDomain;