[style] update formatter to clang-format-14

.github/workflows/android-app-build.yml

@@ -37,7 +37,7 @@ jobs:
       matrix:
         android-api: [24, 34]
         android-abi: [x86_64]
-        os: [macos-12, ubuntu-20.04]
+        os: [macos-12, ubuntu-22.04]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v4

.github/workflows/android-app-release.yml

@@ -35,7 +35,7 @@ on: [push, pull_request]
 
 jobs:
   build-release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v4

.github/workflows/build.yml

@@ -33,29 +33,29 @@ on: [push, pull_request]
 jobs:
 
   cancel-previous-runs:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: rokroskar/workflow-run-cleanup-action@master
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         if: "github.ref != 'refs/heads/main'"
 
   pretty:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - name: Bootstrap
         run: |
           sudo apt update
-          sudo apt --no-install-recommends install -y clang-format-9
+          sudo apt --no-install-recommends install -y clang-format-14
           python3 -m pip install yapf==0.29.0
       - name: Check
         run: |
           script/make-pretty check
 
   gcc-build:
     name: gcc-${{ matrix.gcc_ver }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         gcc_ver: [5, 6, 7, 8, 9, 10]
@@ -95,7 +95,7 @@ jobs:
 
   clang-build:
     name: clang-${{ matrix.clang_ver }}-${{ matrix.build_type }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         clang_ver: [5, 6, 7, 8, 9, 10, 11]
@@ -151,7 +151,7 @@ jobs:
           ./tests/interpreter-test
 
   android-ndk:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - name: Bootstrap
@@ -184,7 +184,7 @@ jobs:
           ninja
 
   fmt-format-check:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - name: Bootstrap

include/commissioner/commissioner.hpp

@@ -199,13 +199,13 @@ class CommissionerHandler
      * @note This will be called when A well-formed JOIN_FIN.req has been received.
      *
      */
-    virtual bool OnJoinerFinalize(const ByteArray &  aJoinerId,
+    virtual bool OnJoinerFinalize(const ByteArray   &aJoinerId,
                                   const std::string &aVendorName,
                                   const std::string &aVendorModel,
                                   const std::string &aVendorSwVersion,
-                                  const ByteArray &  aVendorStackVersion,
+                                  const ByteArray   &aVendorStackVersion,
                                   const std::string &aProvisioningUrl,
-                                  const ByteArray &  aVendorData)
+                                  const ByteArray   &aVendorData)
     {
         (void)aJoinerId;
         (void)aVendorName;
@@ -251,7 +251,7 @@ class CommissionerHandler
      */
     virtual void OnEnergyReport(const std::string &aPeerAddr,
                                 const ChannelMask &aChannelMask,
-                                const ByteArray &  aEnergyList)
+                                const ByteArray   &aEnergyList)
     {
         (void)aPeerAddr;
         (void)aChannelMask;
@@ -1055,7 +1055,7 @@ class Commissioner
      *                                 listener to the included multicast group(s) expires; In seconds.
      * @return Error::kNone, succeed, the address has been successfully registered; Otherwise, failed;
      */
-    virtual Error RegisterMulticastListener(uint8_t &                       aStatus,
+    virtual Error RegisterMulticastListener(uint8_t                        &aStatus,
                                             const std::vector<std::string> &aMulticastAddrList,
                                             uint32_t                        aTimeout) = 0;
 
@@ -1116,10 +1116,10 @@ class Commissioner
      *
      * @return Error::kNone, succeed; Otherwise, failed;
      */
-    static Error GeneratePSKc(ByteArray &        aPSKc,
+    static Error GeneratePSKc(ByteArray         &aPSKc,
                               const std::string &aPassphrase,
                               const std::string &aNetworkName,
-                              const ByteArray &  aExtendedPanId);
+                              const ByteArray   &aExtendedPanId);
 
     /**
      * @brief Compute joiner ID with its IEEE EUI-64 value.

script/bootstrap.sh

@@ -92,7 +92,7 @@ if [ "$(uname)" = "Linux" ]; then
                          lcov \
                          jsonlint
 
-    sudo apt-get --no-install-recommends install -y clang-format-9 || echo 'WARNING: could not install clang-format-9, which is useful if you plan to contribute C/C++ code to the OpenThread project.'
+    sudo apt-get --no-install-recommends install -y clang-format-14 || echo 'WARNING: could not install clang-format-14, which is useful if you plan to contribute C/C++ code to the OpenThread project.'
     python3 -m pip install yapf==0.29.0 || echo 'WARNING: could not install yapf, which is useful if you plan to contribute python code to the OpenThread project.'
 
     ## Install newest CMake
@@ -118,8 +118,8 @@ elif [ "$(uname)" = "Darwin" ]; then
                  swig@4 \
                  lcov && true
 
-    brew install llvm@9 && sudo ln -s "$(brew --prefix llvm@9)/bin/clang-format" /usr/local/bin/clang-format-9 \
-    || echo 'WARNING: could not install clang-format-9, which is useful if you plan to contribute C/C++ code to the OpenThread project.'
+    brew install llvm@14 && sudo ln -s "$(brew --prefix llvm@14)/bin/clang-format" /usr/local/bin/clang-format-14 \
+    || echo 'WARNING: could not install clang-format-14, which is useful if you plan to contribute C/C++ code to the OpenThread project.'
 
     ## Install latest cmake
     match_version "$(cmake --version | grep -E -o '[0-9].*')" "${MIN_CMAKE_VERSION}" || {

script/clang-format

@@ -39,8 +39,8 @@ die()
 # expand_aliases shell option is set using shopt.
 shopt -s expand_aliases
 
-if command -v clang-format-9 >/dev/null; then
-    alias clang-format=clang-format-9
+if command -v clang-format-14 >/dev/null; then
+    alias clang-format=clang-format-14
 elif command -v clang-format >/dev/null; then
     case "$(clang-format --version)" in
         "$CLANG_FORMAT_VERSION"*) ;;

src/app/border_agent.cpp

@@ -49,7 +49,7 @@ UnixTime::UnixTime(std::time_t aTime /* =0 */)
 Error UnixTime::FromString(UnixTime &aTime, const std::string &aTimeStr)
 {
     std::tm lTm;
-    char *  result = strptime(aTimeStr.c_str(), kFmtString.c_str(), &lTm);
+    char   *result = strptime(aTimeStr.c_str(), kFmtString.c_str(), &lTm);
     if (result != nullptr && *result == '\000')
     {
         aTime = std::mktime(&lTm);
@@ -117,7 +117,7 @@ BorderAgent::BorderAgent()
 
 BorderAgent::BorderAgent(std::string const &aAddr,
                          uint16_t           aPort,
-                         ByteArray const &  aDiscriminator,
+                         ByteArray const   &aDiscriminator,
                          std::string const &aThreadVersion,
                          BorderAgent::State aState,
                          std::string const &aNetworkName,
@@ -127,7 +127,7 @@ BorderAgent::BorderAgent(std::string const &aAddr,
                          Timestamp          aActiveTimestamp,
                          uint32_t           aPartitionId,
                          std::string const &aVendorData,
-                         ByteArray const &  aVendorOui,
+                         ByteArray const   &aVendorOui,
                          std::string const &aDomainName,
                          uint8_t            aBbrSeqNumber,
                          uint16_t           aBbrPort,

src/app/border_agent.hpp

@@ -252,7 +252,7 @@ struct BorderAgent
 
     BorderAgent(std::string const &aAddr,
                 uint16_t           aPort,
-                ByteArray const &  aDiscriminator,
+                ByteArray const   &aDiscriminator,
                 std::string const &aThreadVersion,
                 BorderAgent::State aState,
                 std::string const &aNetworkName,
@@ -262,7 +262,7 @@ struct BorderAgent
                 Timestamp          aActiveTimestamp,
                 uint32_t           aPartitionId,
                 std::string const &aVendorData,
-                ByteArray const &  aVendorOui,
+                ByteArray const   &aVendorOui,
                 std::string const &aDomainName,
                 uint8_t            aBbrSeqNumber,
                 uint16_t           aBbrPort,

src/app/br_discover.cpp

@@ -42,7 +42,7 @@ Error DiscoverBorderAgent(BorderAgentHandler aBorderAgentHandler, size_t aTimeou
 {
     static constexpr size_t             kDefaultBufferSize = 1024 * 16;
     static constexpr mdns_record_type_t kMdnsQueryType     = MDNS_RECORDTYPE_PTR;
-    static const char *                 kServiceName       = "_meshcop._udp.local";
+    static const char                  *kServiceName       = "_meshcop._udp.local";
 
     Error   error;
     uint8_t buf[kDefaultBufferSize];

src/app/cli/interpreter.cpp

@@ -326,7 +326,7 @@ template <typename T> static Error ParseInteger(T &aInteger, const std::string &
 {
     Error    error;
     uint64_t integer;
-    char *   endPtr = nullptr;
+    char    *endPtr = nullptr;
 
     integer = strtoull(aStr.c_str(), &endPtr, 0);
 
@@ -1385,7 +1385,7 @@ Interpreter::Value Interpreter::ProcessBr(const Expression &aExpr)
         int                                       mdnsSocket  = -1;
         FDGuard                                   fdgMdnsSocket;
         std::thread                               selectThread;
-        event_base *                              base;
+        event_base                               *base;
         timeval                                   tvTimeout;
         std::unique_ptr<event, void (*)(event *)> mdnsEvent(nullptr, event_free);
         std::unique_ptr<event, void (*)(event *)> cancelEvent(nullptr, event_free);

src/app/cli/interpreter.hpp

@@ -255,13 +255,13 @@ class Interpreter
      */
     int mCancelPipe[2] = {-1, -1};
 
-    static const std::map<std::string, std::string> & mUsageMap;
-    static const std::map<std::string, Evaluator> &   mEvaluatorMap;
-    static const std::vector<StringArray> &           mMultiNetworkSyntax;
-    static const std::vector<StringArray> &           mMultiJobExecution;
-    static const std::vector<StringArray> &           mInactiveCommissionerExecution;
-    static const std::vector<StringArray> &           mExportSyntax;
-    static const std::vector<StringArray> &           mImportSyntax;
+    static const std::map<std::string, std::string>  &mUsageMap;
+    static const std::map<std::string, Evaluator>    &mEvaluatorMap;
+    static const std::vector<StringArray>            &mMultiNetworkSyntax;
+    static const std::vector<StringArray>            &mMultiJobExecution;
+    static const std::vector<StringArray>            &mInactiveCommissionerExecution;
+    static const std::vector<StringArray>            &mExportSyntax;
+    static const std::vector<StringArray>            &mImportSyntax;
     static const std::map<std::string, JobEvaluator> &mJobEvaluatorMap;
 };
 

src/app/cli/interpreter_test.cpp

@@ -73,7 +73,7 @@ class InterpreterTestSuite : public testing::Test
         ~TestContext() { ClearCommissionerAppStaticExpecter(); }
 
         Interpreter                   mInterpreter;
-        Registry *                    mRegistry = nullptr;
+        Registry                     *mRegistry = nullptr;
         CommissionerAppMockPtr        mDefaultCommissionerObject{new CommissionerAppMock()};
         CommissionerAppStaticExpecter mCommissionerAppStaticExpecter;
     };

src/app/cli/job.cpp

@@ -75,8 +75,8 @@ std::string Job::GetCommandString()
     return out;
 }
 
-Job::Job(Interpreter &             aInterpreter,
-         CommissionerAppPtr &      aCommApp,
+Job::Job(Interpreter              &aInterpreter,
+         CommissionerAppPtr       &aCommApp,
          Interpreter::Expression   aExpr,
          Interpreter::JobEvaluator aEval,
          XpanId                    aXpanId)

src/app/cli/job.hpp

@@ -46,8 +46,8 @@ namespace commissioner {
 class Job
 {
 public:
-    Job(Interpreter &             aInterpreter,
-        CommissionerAppPtr &      aCommApp,
+    Job(Interpreter              &aInterpreter,
+        CommissionerAppPtr       &aCommApp,
         Interpreter::Expression   aExpr,
         Interpreter::JobEvaluator aEval,
         XpanId                    aXpanId);
@@ -63,8 +63,8 @@ class Job
     std::string        GetCommandString();
 
 private:
-    Interpreter &             mInterpreter;
-    CommissionerAppPtr &      mCommissioner;
+    Interpreter              &mInterpreter;
+    CommissionerAppPtr       &mCommissioner;
     Interpreter::Expression   mExpr;
     Interpreter::JobEvaluator mEval;
     Interpreter::Value        mValue;

src/app/commissioner_app.cpp

@@ -88,7 +88,7 @@ Error CommissionerApp::Init(const Config &aConfig)
     return error;
 }
 
-Error CommissionerApp::Start(std::string &      aExistingCommissionerId,
+Error CommissionerApp::Start(std::string       &aExistingCommissionerId,
                              const std::string &aBorderAgentAddr,
                              uint16_t           aBorderAgentPort)
 {
@@ -575,7 +575,7 @@ Error CommissionerApp::SetMeshLocalPrefix(const std::string &aPrefix, MilliSecon
     return error;
 }
 
-Error CommissionerApp::GetMeshLocalAddr(std::string &      aMeshLocalAddr,
+Error CommissionerApp::GetMeshLocalAddr(std::string       &aMeshLocalAddr,
                                         const std::string &aMeshLocalPrefix,
                                         uint16_t           aLocator16)
 {
@@ -1240,13 +1240,13 @@ void CommissionerApp::OnJoinerConnected(const ByteArray &aJoinerId, Error aError
     // TODO(wgtdkp): logging
 }
 
-bool CommissionerApp::OnJoinerFinalize(const ByteArray &  aJoinerId,
+bool CommissionerApp::OnJoinerFinalize(const ByteArray   &aJoinerId,
                                        const std::string &aVendorName,
                                        const std::string &aVendorModel,
                                        const std::string &aVendorSwVersion,
-                                       const ByteArray &  aVendorStackVersion,
+                                       const ByteArray   &aVendorStackVersion,
                                        const std::string &aProvisioningUrl,
-                                       const ByteArray &  aVendorData)
+                                       const ByteArray   &aVendorData)
 {
     (void)aVendorName;
     (void)aVendorModel;
@@ -1285,7 +1285,7 @@ void CommissionerApp::OnPanIdConflict(const std::string &aPeerAddr, const Channe
 
 void CommissionerApp::OnEnergyReport(const std::string &aPeerAddr,
                                      const ChannelMask &aChannelMask,
-                                     const ByteArray &  aEnergyList)
+                                     const ByteArray   &aEnergyList)
 {
     Address addr;