From c40bfe6557beb69d91b3775a1d8a08eeed45db34 Mon Sep 17 00:00:00 2001 From: jsteemann Date: Thu, 10 Dec 2015 22:40:40 +0100 Subject: [PATCH] cppcheck --- arangod/Replication/Syncer.h | 3 +++ arangod/RestHandler/RestReplicationHandler.cpp | 1 - arangod/Storage/Options.cpp | 2 +- arangod/VocBase/cleanup.cpp | 3 +-- arangod/VocBase/vocbase.cpp | 2 +- lib/Basics/VPackStringBufferAdapter.h | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/arangod/Replication/Syncer.h b/arangod/Replication/Syncer.h index 32ee3d510b..ed81258364 100644 --- a/arangod/Replication/Syncer.h +++ b/arangod/Replication/Syncer.h @@ -74,6 +74,9 @@ namespace triagens { // ----------------------------------------------------------------------------- public: + + Syncer (Syncer const&) = delete; + Syncer& operator= (Syncer const&) = delete; //////////////////////////////////////////////////////////////////////////////// /// @brief constructor diff --git a/arangod/RestHandler/RestReplicationHandler.cpp b/arangod/RestHandler/RestReplicationHandler.cpp index a8c34411cc..7d2caed778 100644 --- a/arangod/RestHandler/RestReplicationHandler.cpp +++ b/arangod/RestHandler/RestReplicationHandler.cpp @@ -1690,7 +1690,6 @@ void RestReplicationHandler::handleCommandClusterInventory () { TRI_ERROR_CLUSTER_READING_PLAN_AGENCY); } else { - map::iterator it; VPackBuilder resultBuilder; resultBuilder.openObject(); resultBuilder.add("collections", VPackValue(VPackValueType::Array)); diff --git a/arangod/Storage/Options.cpp b/arangod/Storage/Options.cpp index 4075332e27..75eb44d690 100644 --- a/arangod/Storage/Options.cpp +++ b/arangod/Storage/Options.cpp @@ -73,7 +73,7 @@ struct ExcludeHandlerImpl : public VPackAttributeExcludeHandler { }; struct CustomTypeHandlerImpl : public VPackCustomTypeHandler { - CustomTypeHandlerImpl (triagens::arango::CollectionNameResolver const* resolver) + explicit CustomTypeHandlerImpl (triagens::arango::CollectionNameResolver const* resolver) : resolver(resolver) { } diff --git a/arangod/VocBase/cleanup.cpp b/arangod/VocBase/cleanup.cpp index bad1639e09..8079b16e65 100644 --- a/arangod/VocBase/cleanup.cpp +++ b/arangod/VocBase/cleanup.cpp @@ -116,9 +116,8 @@ static void CleanupDocumentCollection (TRI_vocbase_col_t* collection, // check if the collection is still in the "unloading" state. if not, // then someone has already triggered a reload or a deletion of the collection - bool isUnloading = false; if (TRI_TRY_READ_LOCK_STATUS_VOCBASE_COL(collection)) { - isUnloading = (collection->_status == TRI_VOC_COL_STATUS_UNLOADING); + bool isUnloading = (collection->_status == TRI_VOC_COL_STATUS_UNLOADING); TRI_READ_UNLOCK_STATUS_VOCBASE_COL(collection); if (! isUnloading) { diff --git a/arangod/VocBase/vocbase.cpp b/arangod/VocBase/vocbase.cpp index 6d696c11a6..2203d1bdcf 100644 --- a/arangod/VocBase/vocbase.cpp +++ b/arangod/VocBase/vocbase.cpp @@ -547,7 +547,7 @@ static TRI_vocbase_col_t* AddCollection (TRI_vocbase_t* vocbase, LOG_ERROR("duplicate entry for collection name '%s'", name); LOG_ERROR("collection id %llu has same name as already added collection %llu", (unsigned long long) cid, - (unsigned long long) ((TRI_vocbase_col_t*) found)->_cid); + (unsigned long long) static_cast(found)->_cid); TRI_Free(TRI_UNKNOWN_MEM_ZONE, collection); TRI_set_errno(TRI_ERROR_ARANGO_DUPLICATE_NAME); diff --git a/lib/Basics/VPackStringBufferAdapter.h b/lib/Basics/VPackStringBufferAdapter.h index 3a356d9e33..fe634f295b 100644 --- a/lib/Basics/VPackStringBufferAdapter.h +++ b/lib/Basics/VPackStringBufferAdapter.h @@ -35,7 +35,7 @@ namespace triagens { class VPackStringBufferAdapter final : public VPackSink { public: - VPackStringBufferAdapter (TRI_string_buffer_t* buffer) + explicit VPackStringBufferAdapter (TRI_string_buffer_t* buffer) : _buffer(buffer) { }