clang-format: Update to match docs repo
Update the .clang-format file and run clang-format-6.0.
This .clang-format matches the example one in
https://github.com/openbmc/docs/blob/master/cpp-style-and-conventions.md#clang-formatting
Change-Id: Ia331c9a5b040e1a3c45a0ebf1b8d776d93b05ae5
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/network_manager.cpp b/network_manager.cpp
index 9617ff7..c1b0ba6 100644
--- a/network_manager.cpp
+++ b/network_manager.cpp
@@ -1,6 +1,7 @@
+#include "config.h"
+
#include "network_manager.hpp"
-#include "config.h"
#include "ipaddress.hpp"
#include "network_config.hpp"
#include "timer.hpp"
@@ -30,10 +31,9 @@
using namespace sdbusplus::xyz::openbmc_project::Common::Error;
Manager::Manager(sdbusplus::bus::bus& bus, const char* objPath,
- const std::string& path):
+ const std::string& path) :
details::VLANCreateIface(bus, objPath, true),
- bus(bus),
- objectPath(objPath)
+ bus(bus), objectPath(objPath)
{
fs::path confDir(path);
setConfDir(confDir);
@@ -71,7 +71,7 @@
}
auto fileName = systemd::config::networkFilePrefix + interface +
- systemd::config::networkFileSuffix;
+ systemd::config::networkFileSuffix;
fs::path filePath = confDir;
filePath /= fileName;
@@ -84,7 +84,7 @@
{
bmc::writeDHCPDefault(filePath.string(), interface);
log<level::INFO>("Created the default network file.",
- entry("INTERFACE=%s", interface.c_str()));
+ entry("INTERFACE=%s", interface.c_str()));
isCreated = true;
}
}
@@ -109,12 +109,11 @@
elog<InternalFailure>();
}
}
-
}
void Manager::createInterfaces()
{
- //clear all the interfaces first
+ // clear all the interfaces first
interfaces.clear();
auto interfaceStrList = getInterfaces();
@@ -130,7 +129,7 @@
// to create the vlaninterface or normal physical interface.
if (index != std::string::npos)
{
- //it is vlan interface
+ // it is vlan interface
auto interfaceName = interface.substr(0, index);
auto vlanid = interface.substr(index + 1);
uint32_t vlanInt = std::stoul(vlanid);
@@ -143,20 +142,14 @@
auto dhcp = getDHCPValue(confDir, interface);
- auto intf = std::make_shared<phosphor::network::EthernetInterface>(
- bus,
- objPath.string(),
- dhcp,
- *this);
-
+ auto intf = std::make_shared<phosphor::network::EthernetInterface>(
+ bus, objPath.string(), dhcp, *this);
intf->createIPAddressObjects();
- this->interfaces.emplace(std::make_pair(
- std::move(interface), std::move(intf)));
-
+ this->interfaces.emplace(
+ std::make_pair(std::move(interface), std::move(intf)));
}
-
}
void Manager::createChildObjects()
@@ -172,12 +165,11 @@
// create the system conf object.
systemConf = std::make_unique<phosphor::network::SystemConfiguration>(
- bus, objPath.string(), *this);
+ bus, objPath.string(), *this);
// create the dhcp conf object.
objPath /= "dhcp";
dhcpConf = std::make_unique<phosphor::network::dhcp::Configuration>(
- bus, objPath.string(), *this);
-
+ bus, objPath.string(), *this);
}
void Manager::vLAN(IntfName interfaceName, uint32_t id)
@@ -187,7 +179,7 @@
void Manager::reset()
{
- if(!createDefaultNetworkFiles(true))
+ if (!createDefaultNetworkFiles(true))
{
log<level::ERR>("Network Factory Reset failed.");
return;
@@ -199,14 +191,13 @@
// Need to merge the below function with the code which writes the
// config file during factory reset.
-//TODO openbmc/openbmc#1751
+// TODO openbmc/openbmc#1751
void Manager::writeToConfigurationFile()
{
// write all the static ip address in the systemd-network conf file
for (const auto& intf : interfaces)
{
intf.second->writeConfigurationFile();
-
}
restartTimers();
}
@@ -217,16 +208,16 @@
if (refreshObjectTimer && restartTimer)
{
// start the restart timer.
- auto restartTime = duration_cast<microseconds>(
- phosphor::network::restartTimeout);
+ auto restartTime =
+ duration_cast<microseconds>(phosphor::network::restartTimeout);
restartTimer->startTimer(restartTime);
// start the refresh timer.
- auto refreshTime = duration_cast<microseconds>(
- phosphor::network::refreshTimeout);
+ auto refreshTime =
+ duration_cast<microseconds>(phosphor::network::refreshTimeout);
refreshObjectTimer->startTimer(refreshTime);
}
}
-}//namespace network
-}//namespace phosphor
+} // namespace network
+} // namespace phosphor