1
0
Fork 0

removed many unused variables

This commit is contained in:
Jan Steemann 2012-10-17 18:50:17 +02:00
parent 4df461b783
commit 83b9001f62
4 changed files with 4 additions and 36 deletions

View File

@ -322,7 +322,7 @@ static bool IndexStaticIsEqualShapedJsonShapedJson (const TRI_shaped_json_t* lef
return false; return false;
} }
return ( memcmp(left->_data.data, right->_data.data, left->_data.length) == 0); return (memcmp(left->_data.data, right->_data.data, left->_data.length) == 0);
} // end of function isEqualShapedJsonShapedJson } // end of function isEqualShapedJsonShapedJson

View File

@ -206,13 +206,7 @@ static bool ResizeHashArrayMulti (TRI_hasharray_t* array) {
bool TRI_InitHashArray (TRI_hasharray_t* array, bool TRI_InitHashArray (TRI_hasharray_t* array,
size_t initialDocumentCount, size_t initialDocumentCount,
size_t numFields, size_t numFields,
size_t elementSize, size_t elementSize) {
uint64_t (*hashKey) (TRI_hasharray_t*, void*),
uint64_t (*hashElement) (TRI_hasharray_t*, void*),
void (*clearElement) (TRI_hasharray_t*, void*),
bool (*isEmptyElement) (TRI_hasharray_t*, void*),
bool (*isEqualKeyElement) (TRI_hasharray_t*, void*, void*),
bool (*isEqualElementElement) (TRI_hasharray_t*, void*, void*)) {
size_t initialSize; size_t initialSize;
@ -222,11 +216,6 @@ bool TRI_InitHashArray (TRI_hasharray_t* array,
assert(numFields > 0); assert(numFields > 0);
array->clearElement = clearElement;
array->isEmptyElement = isEmptyElement;
array->isEqualKeyElement = isEqualKeyElement;
array->isEqualElementElement = isEqualElementElement;
array->_numFields = numFields; array->_numFields = numFields;
array->_elementSize = elementSize; array->_elementSize = elementSize;
array->_table = NULL; array->_table = NULL;

View File

@ -50,15 +50,6 @@ extern "C" {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
typedef struct TRI_hasharray_s { typedef struct TRI_hasharray_s {
uint64_t (*hashKey) (struct TRI_hasharray_s*, void*);
uint64_t (*hashElement) (struct TRI_hasharray_s*, void*);
void (*clearElement) (struct TRI_hasharray_s*, void*);
bool (*isEmptyElement) (struct TRI_hasharray_s*, void*);
bool (*isEqualKeyElement) (struct TRI_hasharray_s*, void*, void*);
bool (*isEqualElementElement) (struct TRI_hasharray_s*, void*, void*);
size_t _numFields; // the number of fields indexes size_t _numFields; // the number of fields indexes
uint64_t _elementSize; uint64_t _elementSize;
uint64_t _nrAlloc; // the size of the table uint64_t _nrAlloc; // the size of the table
@ -110,13 +101,7 @@ TRI_hasharray_t;
bool TRI_InitHashArray (TRI_hasharray_t*, bool TRI_InitHashArray (TRI_hasharray_t*,
size_t initialDocumentCount, size_t initialDocumentCount,
size_t numFields, size_t numFields,
size_t elementSize, size_t elementSize);
uint64_t (*hashKey) (TRI_hasharray_t*, void*),
uint64_t (*hashElement) (TRI_hasharray_t*, void*),
void (*clearElement) (TRI_hasharray_t*, void*),
bool (*isEmptyElement) (TRI_hasharray_t*, void*),
bool (*isEqualKeyElement) (TRI_hasharray_t*, void*, void*),
bool (*isEqualElementElement) (TRI_hasharray_t*, void*, void*));
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief destroys an array, but does not free the pointer /// @brief destroys an array, but does not free the pointer

View File

@ -71,13 +71,7 @@ static HashIndex* CreateHashIndex (size_t numFields, size_t initialDocumentCount
if (! TRI_InitHashArray(hashIndex->hashArray, if (! TRI_InitHashArray(hashIndex->hashArray,
initialDocumentCount, initialDocumentCount,
numFields, numFields,
sizeof(HashIndexElement), sizeof(HashIndexElement))) {
NULL,
NULL,
NULL,
NULL,
NULL,
NULL)) {
HashIndex_free(hashIndex); HashIndex_free(hashIndex);
return NULL; return NULL;