fixed TRI_ASSERT warnings (#14789)

fceller · KVS85 · web-flow · commit 0c2fbee96c4d · 2021-09-24T18:15:48.000+03:00
* fixed TRI_ASSERT warnings

* fixed TRI_ASSERT warnings

* fixed TRI_ASSERT warnings

Co-authored-by: Vadim Kondratyev &lt;vadim@arangodb.com&gt;
diff --git a/arangod/Aql/CostEstimate.cpp b/arangod/Aql/CostEstimate.cpp
@@ -42,12 +42,14 @@ void CostEstimate::invalidate() {
   // a value of < 0 will mean that the cost estimation was not performed yet
   estimatedCost = -1.0;
   estimatedNrItems = 0;
+  // cppcheck-suppress ignoredReturnValue
   TRI_ASSERT(!isValid());
 }
 
 void CostEstimate::initialize() {
   estimatedCost = 0.0;
   estimatedNrItems = 0;
+  // cppcheck-suppress ignoredReturnValue
   TRI_ASSERT(isValid());
 }
 
diff --git a/arangod/Replication2/Streams/StreamInformationBlock.tpp b/arangod/Replication2/Streams/StreamInformationBlock.tpp
@@ -128,7 +128,9 @@ auto StreamInformationBlock<stream_descriptor<Id, Type, Tags>>::getIteratorRange
                                    [](StreamEntry<Type> const& left, LogIndex index) {
                                      return left.first < index;
                                    })),
+          // cppcheck-suppress 	selfInitialization
           start(start),
+          // cppcheck-suppress 	selfInitialization
           stop(stop) {}
   };
   return std::make_unique<Iterator>(std::move(log), start, stop);
diff --git a/lib/Basics/ReadWriteSpinLock.cpp b/lib/Basics/ReadWriteSpinLock.cpp
@@ -169,17 +169,20 @@ void ReadWriteSpinLock::unlock() noexcept {
   if (isLockedWrite()) {
     unlockWrite();
   } else {
+    // cppcheck-suppress ignoredReturnValue
     TRI_ASSERT(isLockedRead());
     unlockRead();
   }
 }
 
 void ReadWriteSpinLock::unlockRead() noexcept {
+  // cppcheck-suppress ignoredReturnValue
   TRI_ASSERT(isLockedRead());
   _state.fetch_sub(::ReaderIncrement, std::memory_order_release);
 }
 
 void ReadWriteSpinLock::unlockWrite() noexcept {
+  // cppcheck-suppress ignoredReturnValue
   TRI_ASSERT(isLockedWrite());
   _state.fetch_sub(::WriteLock, std::memory_order_release);
 }

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,14 @@ void CostEstimate::invalidate() {`
`42`	`42`	`// a value of < 0 will mean that the cost estimation was not performed yet`
`43`	`43`	`estimatedCost = -1.0;`
`44`	`44`	`estimatedNrItems = 0;`
	`45`	`+ // cppcheck-suppress ignoredReturnValue`
`45`	`46`	`TRI_ASSERT(!isValid());`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`void CostEstimate::initialize() {`
`49`	`50`	`estimatedCost = 0.0;`
`50`	`51`	`estimatedNrItems = 0;`
	`52`	`+ // cppcheck-suppress ignoredReturnValue`
`51`	`53`	`TRI_ASSERT(isValid());`
`52`	`54`	`}`
`53`	`55`
Original file line number	Diff line number	Diff line change
`@@ -169,17 +169,20 @@ void ReadWriteSpinLock::unlock() noexcept {`
`169`	`169`	`if (isLockedWrite()) {`
`170`	`170`	`unlockWrite();`
`171`	`171`	`} else {`
	`172`	`+ // cppcheck-suppress ignoredReturnValue`
`172`	`173`	`TRI_ASSERT(isLockedRead());`
`173`	`174`	`unlockRead();`
`174`	`175`	`}`
`175`	`176`	`}`
`176`	`177`
`177`	`178`	`void ReadWriteSpinLock::unlockRead() noexcept {`
	`179`	`+ // cppcheck-suppress ignoredReturnValue`
`178`	`180`	`TRI_ASSERT(isLockedRead());`
`179`	`181`	`_state.fetch_sub(::ReaderIncrement, std::memory_order_release);`
`180`	`182`	`}`
`181`	`183`
`182`	`184`	`void ReadWriteSpinLock::unlockWrite() noexcept {`
	`185`	`+ // cppcheck-suppress ignoredReturnValue`
`183`	`186`	`TRI_ASSERT(isLockedWrite());`
`184`	`187`	`_state.fetch_sub(::WriteLock, std::memory_order_release);`
`185`	`188`	`}`