From 2628afb4267a5227a6291a686a3715d8e281cfb2 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 27 Aug 2014 22:46:26 +0200 Subject: [PATCH] cleanup --- arangod/V8Server/v8-collection.cpp | 50 +++++++++++++----------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/arangod/V8Server/v8-collection.cpp b/arangod/V8Server/v8-collection.cpp index a35edbcda9..872265a85b 100644 --- a/arangod/V8Server/v8-collection.cpp +++ b/arangod/V8Server/v8-collection.cpp @@ -126,7 +126,6 @@ static inline bool ExtractWaitForSync (v8::Arguments const& argv, return (argv.Length() >= index && TRI_ObjectToBoolean(argv[index - 1])); } - //////////////////////////////////////////////////////////////////////////////// /// @brief extract the update policy from a boolean parameter //////////////////////////////////////////////////////////////////////////////// @@ -135,7 +134,6 @@ static inline TRI_doc_update_policy_e ExtractUpdatePolicy (bool overwrite) { return (overwrite ? TRI_DOC_UPDATE_LAST_WRITE : TRI_DOC_UPDATE_ERROR); } - //////////////////////////////////////////////////////////////////////////////// /// @brief create a v8 collection id value from the internal collection id //////////////////////////////////////////////////////////////////////////////// @@ -268,7 +266,6 @@ static v8::Handle ParseDocumentOrDocumentHandle (TRI_vocbase_t* vocba TRI_ASSERT(collection != nullptr); - v8::Handle empty; return scope.Close(v8::Handle()); } @@ -307,7 +304,7 @@ static int ParseKeyAndRef (v8::Handle const arg, size_t pos = key.find('/'); if (pos != string::npos) { - key = key.substr(pos+1); + key = key.substr(pos + 1); } return TRI_ERROR_NO_ERROR; } @@ -356,14 +353,14 @@ static v8::Handle DocumentVocbaseColCoordinator (TRI_vocbase_col_t co // For the error processing we have to distinguish whether we are in // the ".exists" case (generateDocument==false) or the ".document" case // (generateDocument==true). - TRI_json_t* json = 0; + TRI_json_t* json = nullptr; if (generateDocument) { json = TRI_JsonString(TRI_UNKNOWN_MEM_ZONE, resultBody.c_str()); } if (responseCode >= triagens::rest::HttpResponse::BAD) { - if (!TRI_IsArrayJson(json)) { + if (! TRI_IsArrayJson(json)) { if (generateDocument) { - if (0 != json) { + if (nullptr != json) { TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json); } TRI_V8_EXCEPTION(scope, TRI_ERROR_INTERNAL); @@ -375,15 +372,15 @@ static v8::Handle DocumentVocbaseColCoordinator (TRI_vocbase_col_t co if (generateDocument) { int errorNum = 0; string errorMessage; - if (0 != json) { + if (nullptr != json) { TRI_json_t* subjson = TRI_LookupArrayJson(json, "errorNum"); - if (0 != subjson && TRI_IsNumberJson(subjson)) { + if (nullptr != subjson && TRI_IsNumberJson(subjson)) { errorNum = static_cast(subjson->_value._number); } subjson = TRI_LookupArrayJson(json, "errorMessage"); - if (0 != subjson && TRI_IsStringJson(subjson)) { + if (nullptr != subjson && TRI_IsStringJson(subjson)) { errorMessage = string(subjson->_value._string.data, - subjson->_value._string.length-1); + subjson->_value._string.length - 1); } TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json); } @@ -396,14 +393,14 @@ static v8::Handle DocumentVocbaseColCoordinator (TRI_vocbase_col_t co if (generateDocument) { v8::Handle ret = TRI_ObjectJson(json); - if (0 != json) { + if (nullptr != json) { TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json); } return scope.Close(ret); } else { // Note that for this case we will never get a 304 "NOT_MODIFIED" - if (json != 0) { + if (json != nullptr) { TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json); } return scope.Close(v8::True()); @@ -450,7 +447,7 @@ static v8::Handle DocumentVocbaseCol (bool useCollection, V8ResolverGuard resolver(vocbase); v8::Handle err = ParseDocumentOrDocumentHandle(vocbase, resolver.getResolver(), col, key, rid, argv[0]); - LocalCollectionGuard g(useCollection ? 0 : const_cast(col)); + LocalCollectionGuard g(useCollection ? nullptr : const_cast(col)); if (key == nullptr) { TRI_V8_EXCEPTION(scope, TRI_ERROR_ARANGO_DOCUMENT_HANDLE_BAD); @@ -630,7 +627,7 @@ static v8::Handle ExistsVocbaseCol (bool useCollection, V8ResolverGuard resolver(vocbase); v8::Handle err = ParseDocumentOrDocumentHandle(vocbase, resolver.getResolver(), col, key, rid, argv[0]); - LocalCollectionGuard g(useCollection ? 0 : const_cast(col)); + LocalCollectionGuard g(useCollection ? nullptr : const_cast(col)); if (key == nullptr) { TRI_V8_EXCEPTION(scope, TRI_ERROR_ARANGO_DOCUMENT_HANDLE_BAD); @@ -757,20 +754,20 @@ static v8::Handle ModifyVocbaseColCoordinator ( // 400/404 json = TRI_JsonString(TRI_UNKNOWN_MEM_ZONE, resultBody.c_str()); if (responseCode >= triagens::rest::HttpResponse::BAD) { - if (!TRI_IsArrayJson(json)) { - if (0 != json) { + if (! TRI_IsArrayJson(json)) { + if (nullptr != json) { TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json); } TRI_V8_EXCEPTION(scope, TRI_ERROR_INTERNAL); } int errorNum = 0; TRI_json_t* subjson = TRI_LookupArrayJson(json, "errorNum"); - if (0 != subjson && TRI_IsNumberJson(subjson)) { + if (TRI_IsNumberJson(subjson)) { errorNum = static_cast(subjson->_value._number); } string errorMessage; subjson = TRI_LookupArrayJson(json, "errorMessage"); - if (0 != subjson && TRI_IsStringJson(subjson)) { + if (TRI_IsStringJson(subjson)) { errorMessage = string(subjson->_value._string.data, subjson->_value._string.length-1); } @@ -793,7 +790,6 @@ static v8::Handle ModifyVocbaseColCoordinator ( } } - //////////////////////////////////////////////////////////////////////////////// /// @brief replaces a document //////////////////////////////////////////////////////////////////////////////// @@ -869,7 +865,7 @@ static v8::Handle ReplaceVocbaseCol (bool useCollection, V8ResolverGuard resolver(vocbase); v8::Handle err = ParseDocumentOrDocumentHandle(vocbase, resolver.getResolver(), col, key, rid, argv[0]); - LocalCollectionGuard g(useCollection ? 0 : const_cast(col)); + LocalCollectionGuard g(useCollection ? nullptr : const_cast(col)); if (key == nullptr) { TRI_V8_EXCEPTION(scope, TRI_ERROR_ARANGO_DOCUMENT_HANDLE_BAD); @@ -1326,21 +1322,21 @@ static v8::Handle RemoveVocbaseColCoordinator (TRI_vocbase_col_t cons TRI_json_t* json = TRI_JsonString(TRI_UNKNOWN_MEM_ZONE, resultBody.c_str()); if (responseCode >= triagens::rest::HttpResponse::BAD) { if (! TRI_IsArrayJson(json)) { - if (0 != json) { + if (nullptr != json) { TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json); } TRI_V8_EXCEPTION(scope, TRI_ERROR_INTERNAL); } int errorNum = 0; TRI_json_t* subjson = TRI_LookupArrayJson(json, "errorNum"); - if (0 != subjson && TRI_IsNumberJson(subjson)) { + if (TRI_IsNumberJson(subjson)) { errorNum = static_cast(subjson->_value._number); } string errorMessage; subjson = TRI_LookupArrayJson(json, "errorMessage"); - if (0 != subjson && TRI_IsStringJson(subjson)) { + if (TRI_IsStringJson(subjson)) { errorMessage = string(subjson->_value._string.data, - subjson->_value._string.length-1); + subjson->_value._string.length - 1); } TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json); @@ -1428,7 +1424,7 @@ static v8::Handle RemoveVocbaseCol (bool useCollection, V8ResolverGuard resolver(vocbase); v8::Handle err = ParseDocumentOrDocumentHandle(vocbase, resolver.getResolver(), col, key, rid, argv[0]); - LocalCollectionGuard g(useCollection ? 0 : const_cast(col)); + LocalCollectionGuard g(useCollection ? nullptr : const_cast(col)); if (key == nullptr) { TRI_V8_EXCEPTION(scope, TRI_ERROR_ARANGO_DOCUMENT_HANDLE_BAD); @@ -1606,7 +1602,6 @@ static v8::Handle JS_DropVocbaseCol (v8::Arguments const& argv) { return scope.Close(v8::Undefined()); } - //////////////////////////////////////////////////////////////////////////////// /// @brief checks whether a document exists /// @startDocuBlock documentsCollectionExists @@ -1869,7 +1864,6 @@ static v8::Handle JS_FiguresVocbaseCol (v8::Arguments const& argv) { return scope.Close(result); } - //////////////////////////////////////////////////////////////////////////////// /// @brief loads a collection /// @startDocuBlock collectionLoad