From bf3b01474372f78aae0d4573a8a5323f8fdbb586 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 30 Apr 2013 10:16:04 -0700 Subject: [PATCH] code review cleanup --- libraries/shared/src/SharedUtil.cpp | 26 ++++++++++++++------------ libraries/shared/src/SharedUtil.h | 6 ++++-- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp index d7f2fdde73..6410bcfa09 100644 --- a/libraries/shared/src/SharedUtil.cpp +++ b/libraries/shared/src/SharedUtil.cpp @@ -54,7 +54,7 @@ bool randomBoolean() { void outputBufferBits(unsigned char* buffer, int length, bool withNewLine) { for (int i = 0; i < length; i++) { - outputBits(buffer[i],false); + outputBits(buffer[i], false); } if (withNewLine) { printLog("\n"); @@ -377,28 +377,30 @@ void printVoxelCode(unsigned char* voxelCode) { // the second array is a sorted key for the value, the third array is the index for the value in it original // non-sorted array // returns -1 if size exceeded -int insertIntoSortedArrays(void* value, float key, int originalIndex, - void** valueArray, float* keyArray, int* originalIndexArray, int currentCount, int maxCount) { +int insertIntoSortedArrays( + void* value, float key, int originalIndex, + void** valueArray, float* keyArray, int* originalIndexArray, + int currentCount, int maxCount) { if (currentCount < maxCount) { - int i=0; + int i = 0; if (currentCount > 0) { - while (i keyArray[i]) { + while (i < currentCount && key > keyArray[i]) { i++; } // i is our desired location // shift array elements to the right if (i < currentCount && i+1 < maxCount) { - memcpy(&valueArray[i+1],&valueArray[i],sizeof(void*) * (currentCount-i)); - memcpy(&keyArray[i+1],&keyArray[i],sizeof(float) * (currentCount-i)); - memcpy(&originalIndexArray[i+1],&originalIndexArray[i],sizeof(int) * (currentCount-i)); + memcpy(&valueArray[i + 1], &valueArray[i], sizeof(void*) * (currentCount - i)); + memcpy(&keyArray[i + 1], &keyArray[i], sizeof(float) * (currentCount - i)); + memcpy(&originalIndexArray[i + 1], &originalIndexArray[i], sizeof(int) * (currentCount - i)); } } // place new element at i - valueArray[i]=value; - keyArray[i]=key; - originalIndexArray[i]=originalIndex; - return currentCount+1; + valueArray[i] = value; + keyArray[i] = key; + originalIndexArray[i] = originalIndex; + return currentCount + 1; } return -1; // error case } diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h index d887cbe956..2b0c1d195b 100644 --- a/libraries/shared/src/SharedUtil.h +++ b/libraries/shared/src/SharedUtil.h @@ -71,7 +71,9 @@ bool createVoxelEditMessage(unsigned char command, short int sequence, void usleep(int waitTime); #endif -int insertIntoSortedArrays(void* value, float key, int originalIndex, - void** valueArray, float* keyArray, int* originalIndexArray, int currentCount, int maxCount); +int insertIntoSortedArrays( + void* value, float key, int originalIndex, + void** valueArray, float* keyArray, int* originalIndexArray, + int currentCount, int maxCount); #endif /* defined(__hifi__SharedUtil__) */