From e495b5fb6cb01c7e9ee87fc271cbd420dd5cb6b1 Mon Sep 17 00:00:00 2001 From: jsteemann Date: Mon, 6 Mar 2017 16:13:04 +0100 Subject: [PATCH] jslint && cppcheck --- arangod/GeneralServer/VppCommTask.cpp | 3 +-- js/server/tests/recovery/collection-duplicate-name.js | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/arangod/GeneralServer/VppCommTask.cpp b/arangod/GeneralServer/VppCommTask.cpp index 0ba981525c..b0628b7e2b 100644 --- a/arangod/GeneralServer/VppCommTask.cpp +++ b/arangod/GeneralServer/VppCommTask.cpp @@ -56,9 +56,8 @@ inline std::size_t validateAndCount(char const* vpStart, validationOptions.validateUtf8Strings = true; VPackValidator validator(&validationOptions); - std::size_t numPayloads = 0; - try { + std::size_t numPayloads = 0; // check for slice start to the end of Chunk // isSubPart allows the slice to be shorter than the checked buffer. do { diff --git a/js/server/tests/recovery/collection-duplicate-name.js b/js/server/tests/recovery/collection-duplicate-name.js index b781b5f03e..0f5ff3f544 100644 --- a/js/server/tests/recovery/collection-duplicate-name.js +++ b/js/server/tests/recovery/collection-duplicate-name.js @@ -35,8 +35,6 @@ var jsunity = require('jsunity'); function runSetup () { - require("console").log("Hund"); - db._drop('UnitTestsRecovery'); db._create('UnitTestsRecovery'); @@ -44,7 +42,7 @@ function runSetup () { db._create('UnitTestsRecovery'); } catch (e) { // This intentionally should fail! - if (internal.errors.ERROR_ARANGO_DUPLICATE_NAME.code == e.errorNum) { + if (internal.errors.ERROR_ARANGO_DUPLICATE_NAME.code === e.errorNum) { // Only this is a valid return code from the server return 0; } @@ -62,9 +60,8 @@ function recoverySuite () { tearDown: function () {}, testCollectionDuplicateName: function () { - require("console").log("Kartze"); var c = db._collection('UnitTestsRecovery'); - assertTrue(c != null && c != undefined); + assertTrue(c !== null && c !== undefined); } }; };