From 6bf0840562dd140d01699c0f22120876bf3a132a Mon Sep 17 00:00:00 2001
From: elevankoff <yegor.levankov@yandex.com>
Date: Mon, 24 May 2021 17:24:29 +0000
Subject: [PATCH] More decorative fixes

---
 src/Common/MemoryInfoOS.cpp          | 22 +++++-----
 src/Common/ProcessorStatisticsOS.cpp | 61 +++++++++++++++-------------
 src/Common/ProcessorStatisticsOS.h   |  1 -
 3 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/src/Common/MemoryInfoOS.cpp b/src/Common/MemoryInfoOS.cpp
index 17036d115e8..8cf2a0b44f4 100644
--- a/src/Common/MemoryInfoOS.cpp
+++ b/src/Common/MemoryInfoOS.cpp
@@ -16,18 +16,18 @@ namespace DB
 
 namespace
 {
-template<typename T>
-void readIntTextAndSkipWhitespaceIfAny(T & x, ReadBuffer & buf)
-{
-    readIntText(x, buf);
-    skipWhitespaceIfAny(buf);
-}
+    template<typename T>
+    void readIntTextAndSkipWhitespaceIfAny(T & x, ReadBuffer & buf)
+    {
+        readIntText(x, buf);
+        skipWhitespaceIfAny(buf);
+    }
 
-void readStringUntilWhitespaceAndSkipWhitespaceIfAny(String & s, ReadBuffer & buf)
-{
-    readStringUntilWhitespace(s, buf);
-    skipWhitespaceIfAny(buf);
-}
+    void readStringUntilWhitespaceAndSkipWhitespaceIfAny(String & s, ReadBuffer & buf)
+    {
+        readStringUntilWhitespace(s, buf);
+        skipWhitespaceIfAny(buf);
+    }
 }
 
 static constexpr auto meminfo_filename = "/proc/meminfo";
diff --git a/src/Common/ProcessorStatisticsOS.cpp b/src/Common/ProcessorStatisticsOS.cpp
index 0deea56e7fc..69bce5f5b51 100644
--- a/src/Common/ProcessorStatisticsOS.cpp
+++ b/src/Common/ProcessorStatisticsOS.cpp
@@ -23,36 +23,36 @@ namespace DB
 
 namespace
 {
-template<typename T>
-void readIntTextAndSkipWhitespaceIfAny(T & x, ReadBuffer & buf)
-{
-    readIntText(x, buf);
-    skipWhitespaceIfAny(buf);
-}
+    template<typename T>
+    void readIntTextAndSkipWhitespaceIfAny(T & x, ReadBuffer & buf)
+    {
+        readIntText(x, buf);
+        skipWhitespaceIfAny(buf);
+    }
 
-void readStringAndSkipWhitespaceIfAny(String & s, ReadBuffer & buf)
-{
-    readString(s, buf);
-    skipWhitespaceIfAny(buf);
-}
+    void readStringAndSkipWhitespaceIfAny(String & s, ReadBuffer & buf)
+    {
+        readString(s, buf);
+        skipWhitespaceIfAny(buf);
+    }
 
-void readStringUntilWhitespaceAndSkipWhitespaceIfAny(String & s, ReadBuffer & buf)
-{
-    readStringUntilWhitespace(s, buf);
-    skipWhitespaceIfAny(buf);
-}
+    void readStringUntilWhitespaceAndSkipWhitespaceIfAny(String & s, ReadBuffer & buf)
+    {
+        readStringUntilWhitespace(s, buf);
+        skipWhitespaceIfAny(buf);
+    }
 
-void readCharAndSkipWhitespaceIfAny(char & c, ReadBuffer & buf)
-{
-    readChar(c, buf);
-    skipWhitespaceIfAny(buf);
-}
+    void readCharAndSkipWhitespaceIfAny(char & c, ReadBuffer & buf)
+    {
+        readChar(c, buf);
+        skipWhitespaceIfAny(buf);
+    }
 
-void readFloatAndSkipWhitespaceIfAny(float & f, ReadBuffer & buf)
-{
-    readFloatText(f, buf);
-    skipWhitespaceIfAny(buf);
-}
+    void readFloatAndSkipWhitespaceIfAny(float & f, ReadBuffer & buf)
+    {
+        readFloatText(f, buf);
+        skipWhitespaceIfAny(buf);
+    }
 }
 
 static constexpr auto loadavg_filename = "/proc/loadavg";
@@ -140,7 +140,8 @@ void ProcessorStatisticsOS::readProcTimeAndProcesses(ProcTime & proc_time, ProcS
     proc_time.guest /= USER_HZ;
     proc_time.guest_nice /= USER_HZ;
 
-    do {
+    do
+    {
         readStringUntilWhitespaceAndSkipWhitespaceIfAny(field_name, procst_in);
         readStringAndSkipWhitespaceIfAny(field_val, procst_in);
     } while (field_name != String("processes"));
@@ -163,8 +164,10 @@ void ProcessorStatisticsOS::readFreq(ProcFreq & freq)
     int cpu_count = 0;
     freq.max = freq.min = freq.avg = 0;
 
-    do {
-        do {
+    do
+    {
+        do
+        {
             readStringAndSkipWhitespaceIfAny(field_name, cpuinfo_in);
         } while (!cpuinfo_in.eof() && field_name != String("cpu MHz"));
 
diff --git a/src/Common/ProcessorStatisticsOS.h b/src/Common/ProcessorStatisticsOS.h
index f29e5156bfe..70edfceb2ca 100644
--- a/src/Common/ProcessorStatisticsOS.h
+++ b/src/Common/ProcessorStatisticsOS.h
@@ -18,7 +18,6 @@ namespace DB
 class ProcessorStatisticsOS
 {
 public:
-
     struct ProcLoadavg
     {
         float avg1;