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/vlan_interface.cpp b/vlan_interface.cpp
index e7854de..6ef1a0c 100644
--- a/vlan_interface.cpp
+++ b/vlan_interface.cpp
@@ -1,6 +1,7 @@
+#include "config.h"
+
#include "vlan_interface.hpp"
-#include "config.h"
#include "ethernet_interface.hpp"
#include "network_manager.hpp"
@@ -21,15 +22,13 @@
using namespace sdbusplus::xyz::openbmc_project::Common::Error;
VlanInterface::VlanInterface(sdbusplus::bus::bus& bus,
- const std::string& objPath,
- bool dhcpEnabled,
- uint32_t vlanID,
- EthernetInterface& intf,
- Manager& parent ) :
- VlanIface(bus,objPath.c_str()),
- DeleteIface(bus,objPath.c_str()),
- EthernetInterface(bus, objPath, dhcpEnabled, parent, false),
- parentInterface(intf)
+ const std::string& objPath, bool dhcpEnabled,
+ uint32_t vlanID, EthernetInterface& intf,
+ Manager& parent) :
+ VlanIface(bus, objPath.c_str()),
+ DeleteIface(bus, objPath.c_str()),
+ EthernetInterface(bus, objPath, dhcpEnabled, parent, false),
+ parentInterface(intf)
{
id(vlanID);
VlanIface::interfaceName(EthernetInterface::interfaceName());
@@ -52,16 +51,19 @@
catch (std::ios_base::failure& e)
{
log<level::ERR>("Unable to open the VLAN device file",
- entry("FILE=%s", confPath.c_str()),
- entry("ERROR=%s", e.what()));
+ entry("FILE=%s", confPath.c_str()),
+ entry("ERROR=%s", e.what()));
elog<InternalFailure>();
-
}
- stream << "[" << "NetDev" << "]\n";
+ stream << "["
+ << "NetDev"
+ << "]\n";
stream << "Name=" << EthernetInterface::interfaceName() << "\n";
- stream << "Kind=vlan" << "\n";
- stream << "[VLAN]" << "\n";
+ stream << "Kind=vlan"
+ << "\n";
+ stream << "[VLAN]"
+ << "\n";
stream << "Id=" << id() << "\n";
stream.close();
}
@@ -71,5 +73,5 @@
parentInterface.deleteVLANObject(EthernetInterface::interfaceName());
}
-}//namespace network
-}//namespace phosphor
+} // namespace network
+} // namespace phosphor