remove the extra if as it requires -Wimplicit-fallthrough=2 or 1

arangodb · jsteemann · Oct 19, 2019 · Oct 18, 2019 · Oct 18, 2019 · Oct 18, 2019
commit 553625ab7bf348ee787cc59d5f333b3057c09c4b
diff --git a/arangod/Aql/AqlValue.cpp b/arangod/Aql/AqlValue.cpp
@@ -263,7 +263,7 @@ AqlValue AqlValue::at(int64_t position, bool& mustDestroy, bool doCopy) const {
           return AqlValue(s.at(position).begin());
         }
       }
-      // intentionally falls through if
+      // intentionally falls through
       break;
     }
     case DOCVEC: {
@@ -289,7 +289,7 @@ AqlValue AqlValue::at(int64_t position, bool& mustDestroy, bool doCopy) const {
           total += it->size();
         }
       }
-      // intentionally falls through if
+      // intentionally falls through
       break;
     }
     case RANGE: {
@@ -303,7 +303,7 @@ AqlValue AqlValue::at(int64_t position, bool& mustDestroy, bool doCopy) const {
         // only look up the value if it is within array bounds
         return AqlValue(AqlValueHintInt(_data.range->at(static_cast<size_t>(position))));
       }
-      // intentionally falls through if
+      // intentionally falls through
       break;
     }
   }
@@ -339,7 +339,7 @@ AqlValue AqlValue::at(int64_t position, size_t n, bool& mustDestroy, bool doCopy
           return AqlValue(s.at(position).begin());
         }
       }
-      // intentionally falls through
8000
 if
+      // intentionally falls through
       break;
     }
     case DOCVEC: {
@@ -364,7 +364,7 @@ AqlValue AqlValue::at(int64_t position, size_t n, bool& mustDestroy, bool doCopy
           total += it->size();
         }
       }
-      // intentionally falls through if
+      // intentionally falls through
       break;
     }
     case RANGE: {
@@ -377,7 +377,7 @@ AqlValue AqlValue::at(int64_t position, size_t n, bool& mustDestroy, bool doCopy
         // only look up the value if it is within array bounds
         return AqlValue(AqlValueHintInt(_data.range->at(static_cast<size_t>(position))));
       }
-      // intentionally falls through if
+      // intentionally falls through
       break;
     }
   }
@@ -410,7 +410,7 @@ AqlValue AqlValue::getKeyAttribute(bool& mustDestroy, bool doCopy) const {
           return AqlValue(found.begin());
         }
       }
-      // intentionally falls through if
+      // intentionally falls through
       break;
     }
     case DOCVEC:
@@ -454,7 +454,7 @@ AqlValue AqlValue::getIdAttribute(CollectionNameResolver const& resolver,
           return AqlValue(found.begin());
         }
       }
-      // intentionally falls through if
+      // intentionally falls through
       break;
     }
     case DOCVEC:
@@ -492,7 +492,7 @@ AqlValue AqlValue::getFromAttribute(bool& mustDestroy, bool doCopy) const {
           return AqlValue(found.begin());
         }
       }
-      // intentionally falls through if
+      // intentionally falls through
       break;
     }
     case DOCVEC:
@@ -530,7 +530,7 @@ AqlValue AqlValue::getToAttribute(bool& mustDestroy, bool doCopy) const {
           return AqlValue(found.begin());
         }
       }
-      // intentionally falls through if
+      // intentionally falls through
       break;
     }
     case DOCVEC:
@@ -574,7 +574,7 @@ AqlValue AqlValue::get(CollectionNameResolver const& resolver,
           return AqlValue(found.begin());
         }
       }
-      // intentionally falls through if
+      // intentionally falls through
       break;
     }
     case DOCVEC:
@@ -619,7 +619,7 @@ AqlValue AqlValue::get(CollectionNameResolver const& resolver,
           return AqlValue(found.begin());
         }
       }
-      // intentionally falls through if
+      // intentionally falls through
       break;
     }
     case DOCVEC:
@@ -692,7 +692,7 @@ AqlValue AqlValue::get(CollectionNameResolver const& resolver,
           return AqlValue(s.begin());
         }
       }
-      // intentionally falls through if
+      // intentionally falls through
       break;
     }
     case DOCVEC:
@@ -762,7 +762,7 @@ double AqlValue::toDouble(bool& failed) const {
           return at(0, mustDestroy, false).toDouble(failed);
         }
       }
-      // intentionally falls through if
+      // intentionally falls through
       break;
     }
     case DOCVEC:
@@ -815,7 +815,7 @@ int64_t AqlValue::toInt64() const {
           return at(0, mustDestroy, false).toInt64();
         }
       }
-      // intentionally falls through if
+      // intentionally falls through
       break;
     }
     case DOCVEC:

diff --git a/arangod/Aql/Ast.cpp b/arangod/Aql/Ast.cpp
@@ -1794,7 +1794,7 @@ AstNode* Ast::replaceVariables(AstNode* node,
           node->setData((*it).second);
         }
       }
-      // intentionally falls through if
+      // intentionally falls through
     }
 
     return node;
@@ -2925,7 +2925,7 @@ AstNode* Ast::optimizeBinaryOperatorRelational(AstNode* node) {
       // and optimize ourselves...
       return optimizeBinaryOperatorRelational(node);
     }
-    // intentionally falls through if
+    // intentionally falls through
   }
 
   bool const rhsIsConst = rhs->isConstant();

diff --git a/arangod/Aql/AstNode.cpp b/arangod/Aql/AstNode.cpp
@@ -1200,7 +1200,7 @@ AstNode const* AstNode::castToBool(Ast* ast) const {
       default: {
       }
     }
-    // intentionally falls through if
+    // intentionally falls through
   } else if (type == NODE_TYPE_ARRAY) {
     return ast->createNodeValueBool(true);
   } else if (type == NODE_TYPE_OBJECT) {
@@ -1241,9 +1241,9 @@ AstNode const* AstNode::castToNumber(Ast* ast) const {
         }
         return ast->createNodeValueDouble(v);
       }
-        // intentionally falls through if
+        // intentionally falls through
     }
-    // intentionally falls through if
+    // intentionally falls through
   } else if (type == NODE_TYPE_ARRAY) {
     size_t const n = numMembers();
     if (n == 0) {
@@ -1254,9 +1254,9 @@ AstNode const* AstNode::castToNumber(Ast* ast) const {
       // convert only member to number
       return member->castToNumber(ast);
     }
-    // intentionally falls through if
+    // intentionally falls through
   } else if (type == NODE_TYPE_OBJECT) {
-    // intentionally falls through if
+    // intentionally falls through
   }
 
   return ast->createNodeValueInt(0);

diff --git a/arangod/Aql/OptimizerRules.cpp b/arangod/Aql/OptimizerRules.cpp
@@ -4407,7 +4407,7 @@ void arangodb::aql::distributeFilternCalcToClusterRule(Optimizer* opt,
               stopSearching = true;
               break;
             }
-            // intentionally falls through if
+            // intentionally falls through
           }
 #if 0
           // TODO: this is already prepared to push subqueries on the DB servers.
@@ -4420,7 +4420,7 @@ void arangodb::aql::distributeFilternCalcToClusterRule(Optimizer* opt,
               stopSearching = true;
               break;
             }
-            // intentionally falls through if
+            // intentionally falls through
           }
 #endif
           // no special handling for filters here
@@ -5253,7 +5253,7 @@ struct OrSimplifier {
           return true;
         }
       }
-      // intentionally falls through if
+      // intentionally falls through
     } else if (node->type == NODE_TYPE_OPERATOR_BINARY_IN) {
       auto lhs = node->getMember(0);
       auto rhs = node->getMember(1);
@@ -5264,7 +5264,7 @@ struct OrSimplifier {
           return true;
         }
       }
-      // intentionally falls through if
+      // intentionally falls through
     }
 
     return false;
@@ -5369,7 +5369,7 @@ struct OrSimplifier {
         return ast->createNodeBinaryOperator(node->type, lhsNew, rhsNew);
       }
 
-      // intentionally falls through if
+      // intentionally falls through
     }
 
     return const_cast<AstNode*>(node);

diff --git a/arangod/Cluster/HeartbeatThread.cpp b/arangod/Cluster/HeartbeatThread.cpp
@@ -652,7 +652,7 @@ void HeartbeatThread::runSingleServer() {
 
         if (result.successful()) {  // successful leadership takeover
           leader = myIdBuilder.slice();
-          // intentionally falls through if to case 2
+          // intentionally falls through to case 2
         } else if (result.httpCode() == TRI_ERROR_HTTP_PRECONDITION_FAILED) {
           // we did not become leader, someone else is, response contains
           // current value in agency

diff --git a/arangod/GeneralServer/HttpCommTask.cpp b/arangod/GeneralServer/HttpCommTask.cpp
@@ -571,7 +571,7 @@ ResponseCode HttpCommTask<T>::handleAuthHeader(HttpRequest& req) {
         return rest::ResponseCode::UNAUTHORIZED;
       }
 
-      // intentionally falls through if
+      // intentionally falls through
     } catch (arangodb::basics::Exception const& ex) {
       // translate error
       if (ex.code() == TRI_ERROR_USER_NOT_FOUND) {

diff --git a/arangod/MMFiles/MMFilesCleanupThread.cpp b/arangod/MMFiles/MMFilesCleanupThread.cpp
@@ -165,7 +165,7 @@ void MMFilesCleanupThread::cleanupCollection(arangodb::LogicalCollection* collec
         if (!unloadChecked && !isInShutdown) {
           return false;
         }
-        // intentionally falls through if
+        // intentionally falls through
       } else {
         // retry in next iteration
         unloadChecked = false;

diff --git a/arangod/MMFiles/MMFilesCollection.cpp b/arangod/MMFiles/MMFilesCollection.cpp
@@ -2540,7 +2540,7 @@ int MMFilesCollection::lockRead(bool useDeadlockDetector,
           LOG_TOPIC("29637", TRACE, arangodb::Logger::ENGINES)
               << "waiting for read-lock on collection '"
               << _logicalCollection.name() << "'";
-          // intentionally falls through if
+          // intentionally falls through
         } else if (++iterations >= 5) {
           // periodically check for deadlocks
           TRI_ASSERT(wasBlocked);
@@ -2837,7 +2837,7 @@ LocalDocumentId MMFilesCollection::reuseOrCreateLocalDocumentId(OperationOptions
     if (marker->hasLocalDocumentId()) {
       return marker->getLocalDocumentId();
     }
-    // intentionally falls through if
+    // intentionally falls through
   }
 
   // new operation, no recovery -> generate a new LocalDocumentId

diff --git a/arangod/MMFiles/MMFilesDatafile.cpp b/arangod/MMFiles/MMFilesDatafile.cpp
@@ -520,7 +520,7 @@ int MMFilesDatafile::reserveElement(uint32_t size, MMFilesMarker** position,
       return TRI_ERROR_ARANGO_DOCUMENT_TOO_LARGE;
     }
 
-    // intentionally falls through if
+    // intentionally falls through
   }
 
   // add the marker, leave enough room for the footer

diff --git a/arangod/MMFiles/MMFilesWalSlots.cpp b/arangod/MMFiles/MMFilesWalSlots.cpp
@@ -554,7 +554,7 @@ int MMFilesWalSlots::closeLogfile(MMFilesWalSlot::TickType& lastCommittedTick, b
           // new one
           _logfile = nullptr;
 
-          // intentionally falls through if
+          // intentionally falls through
         }
 
         TRI_IF_FAILURE("LogfileManagerGetWriteableLogfile") {

diff --git a/arangod/RestHandler/RestReplicationHandler.cpp b/arangod/RestHandler/RestReplicationHandler.cpp
@@ -957,7 +957,7 @@ Result RestReplicationHandler::processRestoreCollection(VPackSlice const& collec
                       std::string("unable to drop collection '") + name +
                           "': " + res.errorMessage());
       }
-      // intentionally falls through if
+      // intentionally falls through
     } else {
       return Result(TRI_ERROR_ARANGO_DUPLICATE_NAME,
                     std::string("unable to create collection '") + name +

diff --git a/arangod/V8Server/v8-collection.cpp b/arangod/V8Server/v8-collection.cpp
@@ -2112,7 +2112,7 @@ static void JS_StatusVocbaseCol(v8::FunctionCallbackInfo<v8::Value> const& args)
       TRI_V8_RETURN(v8::Number::New(isolate, (int)TRI_VOC_COL_STATUS_DELETED));
     }
   }
-  // intentionally falls through if
+  // intentionally falls through
 
   auto status = collection->status();
 
@@ -2196,7 +2196,7 @@ static void JS_TypeVocbaseCol(v8::FunctionCallbackInfo<v8::Value> const& args) {
       TRI_V8_RETURN(v8::Number::New(isolate, (int)(collection->type())));
     }
   }
-  // intentionally falls through if
+  // intentionally falls through
 
   auto type = collection->type();
 

diff --git a/arangod/V8Server/v8-user-structures.cpp b/arangod/V8Server/v8-user-structures.cpp
@@ -737,7 +737,7 @@ static int ObjectToJson(v8::Isolate* isolate, TRI_json_t* result,
         }
       }
 
-      // intentionally falls through if
+      // intentionally falls through
     }
 
     int hashval = o->GetIdentityHash();

diff --git a/arangod/V8Server/v8-vocbase.cpp b/arangod/V8Server/v8-vocbase.cpp
@@ -892,7 +892,7 @@ static void JS_QueriesPropertiesAql(v8::FunctionCallbackInfo<v8::Value> const& a
           obj->Get(TRI_V8_ASCII_STRING(isolate, "maxQueryStringLength")))));
     }
 
-    // intentionally falls through if
+    // intentionally falls through
   }
 
   // return current settings

diff --git a/arangod/VocBase/Methods/Transactions.cpp b/arangod/VocBase/Methods/Transactions.cpp
@@ -210,7 +210,7 @@ Result executeTransactionJS(v8::Isolate* isolate, v8::Handle<v8::Value> const& a
             std::string(" There is no array in '") + attributeName + "'";
         return false;
       }
-      // intentionally falls through if
+      // intentionally falls through
     }
     return true;
   };

diff --git a/lib/Basics/Utf8Helper.cpp b/lib/Basics/Utf8Helper.cpp
@@ -825,7 +825,7 @@ char* TRI_normalize_utf16_to_NFC(uint16_t const* utf16, size_t inLength, size_t*
         mustFree = true;
         continue;
       }
-      // intentionally falls through if
+      // intentionally falls through
     }
 
     if (mustFree) {

diff --git a/lib/Basics/tri-strings.cpp b/lib/Basics/tri-strings.cpp
@@ -768,7 +768,7 @@ char* TRI_UnescapeUtf8String(char const* in, size_t inLength, size_t* outLength,
       TRI_Free(buffer);
       buffer = utf8_nfc;
     }
-    // intentionally falls through if
+    // intentionally falls through
   }
 
   return buffer;

diff --git a/lib/V8/v8-buffer.cpp b/lib/V8/v8-buffer.cpp
@@ -1569,7 +1569,7 @@ static void MapGetIndexedBuffer(uint32_t idx,
         TRI_V8_RETURN(v8::Handle<v8::Value>());
       }
       self = TRI_GetObject(context, parent);
-      // intentionally falls through if
+      // intentionally falls through
     }
   }
 
@@ -1603,7 +1603,7 @@ static void MapSetIndexedBuffer(uint32_t idx, v8::Local<v8::Value> value,
         TRI_V8_RETURN(v8::Handle<v8::Value>());
       }
       self = TRI_GetObject(context, parent);
-      // intentionally falls through if
+      // intentionally falls through
     }
   }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
           }
-          // intentionally falls through if
+          // intentionally falls through
         }
         int hashval = o->GetIdentityHash();
@@ Expand Down @@