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

Commit 53d12da5 authored by Henri Chataing's avatar Henri Chataing
Browse files

RootCanal: Minor fixes 

- Replace ASSERT => LOG_ALWAYS_FATAL
- Replace include of os/log.h => log.h
- Iterate loop by reference

Test: m root-canal
Change-Id: I0b9978fcff2b4b9e6a50373d9f3f661fbc53ce06
parent 39a4eebe

tools/rootcanal/lib/hci/class_of_device.cc

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <sstream>

#include <vector>



#include "os/log.h"

#include "log.h"



namespace bluetooth {

namespace hci {

tools/rootcanal/model/controller/le_advertiser.cc

+1 −1
Original line number Diff line number Diff line
@@ -1464,7 +1464,7 @@ void LinkLayerController::LeAdvertising() { 
            type = model::packets::LegacyAdvertisingType::ADV_NONCONN_IND;

            break;

          default:

            ASSERT(

            LOG_ALWAYS_FATAL(

                "unexpected raw advertising event properties;"

                " please check the extended advertising parameter validation");

            break;

tools/rootcanal/model/setup/phy_layer.cc

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ void PhyLayer::Register(std::shared_ptr<PhyDevice> device) { 
}



void PhyLayer::Unregister(PhyDevice::Identifier id) {

  for (auto device : phy_devices_) {

  for (auto& device : phy_devices_) {

    if (device->id == id) {

      device->Unregister(this);

      phy_devices_.remove(device);
@@ -38,7 +38,7 @@ void PhyLayer::Unregister(PhyDevice::Identifier id) { 
}



void PhyLayer::UnregisterAll() {

  for (auto device : phy_devices_) {

  for (auto& device : phy_devices_) {

    device->Unregister(this);

  }

  phy_devices_.clear();