Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

moved variable to top-level scope. otherwise bad(TM) things may happen

This commit is contained in:
Jan Steemann 2012-09-11 10:45:47 +02:00
parent 135af312da
commit cfe44acda4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arangod/VocBase/index.c
View File

@ -744,7 +744,7 @@ static int InsertGeoIndex (TRI_index_t* idx, TRI_doc_mptr_t const* doc) {
/// @brief updates a document /// @brief updates a document
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static int UpdateGeoIndex (TRI_index_t* idx, TRI_doc_mptr_t const* doc, TRI_shaped_json_t const* old) { static int UpdateGeoIndex (TRI_index_t* idx, TRI_doc_mptr_t const* doc, TRI_shaped_json_t const* old) {
union { void* p; void const* c; } cnv; union { void* p; void const* c; } cnv;
GeoCoordinate gc; GeoCoordinate gc;
TRI_shaped_json_t shapedJson; TRI_shaped_json_t shapedJson;
@ -1259,6 +1259,7 @@ static int HashIndexHelper (TRI_hash_index_t const* hashIndex,
union { void* p; void const* c; } cnv; union { void* p; void const* c; } cnv;
TRI_shape_access_t const* acc; TRI_shape_access_t const* acc;
TRI_shaped_json_t shapedObject; TRI_shaped_json_t shapedObject;
TRI_shaped_json_t shapedJson;
TRI_shaper_t* shaper; TRI_shaper_t* shaper;
int res; int res;
size_t j; size_t j;
@ -1281,7 +1282,6 @@ static int HashIndexHelper (TRI_hash_index_t const* hashIndex,
// ............................................................................. // .............................................................................
else if (document != NULL) { else if (document != NULL) {
TRI_shaped_json_t shapedJson;
TRI_EXTRACT_SHAPED_JSON_MARKER(shapedJson, document->_data); TRI_EXTRACT_SHAPED_JSON_MARKER(shapedJson, document->_data);
cnv.c = document; cnv.c = document;
@ -2945,7 +2945,7 @@ static int SkiplistIndexHelper(const TRI_skiplist_index_t* skiplistIndex,
// .......................................................................... // ..........................................................................
// Assign the document to the SkiplistIndexElement structure so that it can // Assign the document to the SkiplistIndexElement structure so that it can
// be retreived later. // be retrieved later.
// .......................................................................... // ..........................................................................
cnv.c = document; cnv.c = document;
skiplistElement->data = cnv.p; skiplistElement->data = cnv.p;