Apply some missing formatting and unreachable code

stackrox · Sep 18, 2024 · 3429431 · 3429431
1 parent 41a295b
commit 3429431
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 15 deletions.
diff --git a/collector/lib/CollectorStats.h b/collector/lib/CollectorStats.h
@@ -90,7 +90,7 @@ class CollectorStats {
 
   std::array<std::atomic<int64_t>, counter_type_max> counter_ = {{}};
 
-  CollectorStats(){};
+  CollectorStats() {};
 };
 
 template <typename T>

diff --git a/collector/lib/DuplexGRPC.h b/collector/lib/DuplexGRPC.h
@@ -550,8 +550,7 @@ class DuplexClientReaderWriter : public DuplexClientWriter<W> {
     // Shutdown the client and drain the queue.
     this->Shutdown();  // ignore errors
     auto now = ToDeadline(time_point::min());
-    while (ProcessSingle(nullptr, now, nullptr))
-      ;
+    while (ProcessSingle(nullptr, now, nullptr));
   }
 
   template <typename TS = time_point>

diff --git a/collector/lib/ProcfsScraper.cpp b/collector/lib/ProcfsScraper.cpp
@@ -44,8 +44,7 @@ const char* nextfield(const char* p, const char* endp) {
   while (p < endp && *p && !std::isspace(*p)) {
     p++;
   }
-  while (p < endp && *p && std::isspace(*++p))
-    ;
+  while (p < endp && *p && std::isspace(*++p));
   return (p < endp && *p) ? p : nullptr;
 }
 

diff --git a/collector/lib/SignalServiceClient.cpp b/collector/lib/SignalServiceClient.cpp
@@ -43,8 +43,7 @@ bool SignalServiceClient::EstablishGRPCStreamSingle() {
 }
 
 void SignalServiceClient::EstablishGRPCStream() {
-  while (EstablishGRPCStreamSingle())
-    ;
+  while (EstablishGRPCStreamSingle());
   CLOG(INFO) << "Signal service client terminating.";
 }
 

diff --git a/collector/lib/SignalServiceClient.h b/collector/lib/SignalServiceClient.h
@@ -66,8 +66,8 @@ class StdoutSignalServiceClient : public ISignalServiceClient {
 
   explicit StdoutSignalServiceClient() {}
 
-  void Start(){};
-  void Stop(){};
+  void Start() {};
+  void Stop() {};
 
   SignalHandler::Result PushSignals(const SignalStreamMessage& msg);
 };

diff --git a/collector/test/HostHeuristicsTest.cpp b/collector/test/HostHeuristicsTest.cpp
@@ -51,7 +51,7 @@ class MockHostInfoHeuristics : public HostInfo {
 class MockCollectorConfig : public CollectorConfig {
  public:
   MockCollectorConfig()
-      : CollectorConfig(){};
+      : CollectorConfig() {};
 
   void SetCollectionMethod(CollectionMethod cm) {
     if (host_config_.HasCollectionMethod()) {

diff --git a/integration-tests/container/perf/scripts/init.sh b/integration-tests/container/perf/scripts/init.sh
@@ -123,6 +123,11 @@ check_headers() {
     return 0
 }
 
+if [[ "$(sysctl -n kernel.kptr_restrict)" != "0" ]]; then
+    # If this is not zero, it can interfere with most of the tools
+    sysctl -w kernel.kptr_restrict=0
+fi
+
 if [[ ! -e "/lib/modules/.installed" ]]; then
     if check_headers "${HOST_MODULES_DIR}"; then
         HEADERS_TARGET="${HOST_MODULES_DIR}/source"
@@ -139,8 +144,3 @@ else
     echo "Headers already installed"
     exit 0
 fi
-
-if [[ "$(sysctl -n kernel.kptr_restrict)" != "0" ]]; then
-    # If this is not zero, it can interfere with most of the tools
-    sysctl -w kernel.kptr_restrict=0
-fi