Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86d524fa authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "test_vendor: Update clang-formatting"

parents f08d6079 30bb90ac
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -109,5 +109,5 @@ class AsyncManager {

  std::mutex synchronization_mutex_;
};
}
}  // namespace test_vendor_lib
#endif  // TEST_VENDOR_LIB_ASYNC_MANAGER_H_
+1 −1
Original line number Diff line number Diff line
@@ -517,4 +517,4 @@ void AsyncManager::Synchronize(const CriticalCallback& critical) {
  std::unique_lock<std::mutex> guard(synchronization_mutex_);
  critical();
}
}
}  // namespace test_vendor_lib
+5 −4
Original line number Diff line number Diff line
@@ -77,8 +77,9 @@ int TestChannelTransport::Accept(int listen_fd_) {
  socklen_t sockaddr_in_size = sizeof(struct sockaddr_in);
  memset(&test_channel_address, 0, sockaddr_in_size);

  OSI_NO_INTR(accept_fd = accept(listen_fd_, reinterpret_cast<sockaddr*>(
                                                 &test_channel_address),
  OSI_NO_INTR(accept_fd =
                  accept(listen_fd_,
                         reinterpret_cast<sockaddr*>(&test_channel_address),
                         &sockaddr_in_size));
  if (accept_fd < 0) {
    LOG_INFO(LOG_TAG, "Error accepting test channel connection errno=%d (%s).",
@@ -139,4 +140,4 @@ void TestChannelTransport::RegisterCommandHandler(
  command_handler_ = callback;
}

}  // namespace test_vendor_lib {
}  // namespace test_vendor_lib
+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ const std::string kLowerMask = "00:00:ff:ff:ff:ff";
const std::string kZeros = "00:00:00:00:00:00";
const vector<uint8_t> kZeros_octets = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
const vector<uint8_t> kTestAddr1_octets = {0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12};
}
}  // namespace

namespace test_vendor_lib {