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.hpp b/vlan_interface.hpp
index e1feda7..3ef98eb 100644
--- a/vlan_interface.hpp
+++ b/vlan_interface.hpp
@@ -17,7 +17,6 @@
class EthernetInterface;
class Manager;
-
using DeleteIface = sdbusplus::xyz::openbmc_project::Object::server::Delete;
using VlanIface = sdbusplus::xyz::openbmc_project::Network::server::VLAN;
@@ -29,52 +28,48 @@
public DeleteIface,
public EthernetInterface
{
- public:
- VlanInterface() = delete;
- VlanInterface(const VlanInterface&) = delete;
- VlanInterface& operator=(const VlanInterface&) = delete;
- VlanInterface(VlanInterface&&) = delete;
- VlanInterface& operator=(VlanInterface&&) = delete;
- virtual ~VlanInterface() = default;
+ public:
+ VlanInterface() = delete;
+ VlanInterface(const VlanInterface&) = delete;
+ VlanInterface& operator=(const VlanInterface&) = delete;
+ VlanInterface(VlanInterface&&) = delete;
+ VlanInterface& operator=(VlanInterface&&) = delete;
+ virtual ~VlanInterface() = default;
- /** @brief Constructor to put object onto bus at a dbus path.
- * @param[in] bus - Bus to attach to.
- * @param[in] objPath - Path to attach at.
- * @param[in] dhcpEnabled - DHCP enable value.
- * @param[in] vlanID - vlan identifier.
- * @param[in] intf - ethernet interface object.
- * @param[in] manager - network manager object.
- */
- VlanInterface(sdbusplus::bus::bus& bus,
- const std::string& objPath,
- bool dhcpEnabled,
- uint32_t vlanID,
- EthernetInterface& intf,
- Manager& manager);
+ /** @brief Constructor to put object onto bus at a dbus path.
+ * @param[in] bus - Bus to attach to.
+ * @param[in] objPath - Path to attach at.
+ * @param[in] dhcpEnabled - DHCP enable value.
+ * @param[in] vlanID - vlan identifier.
+ * @param[in] intf - ethernet interface object.
+ * @param[in] manager - network manager object.
+ */
+ VlanInterface(sdbusplus::bus::bus& bus, const std::string& objPath,
+ bool dhcpEnabled, uint32_t vlanID, EthernetInterface& intf,
+ Manager& manager);
- /** @brief Delete this d-bus object.
- */
- void delete_() override;
+ /** @brief Delete this d-bus object.
+ */
+ void delete_() override;
- /** @brief writes the device configuration.
- systemd reads this configuration file
- and creates the vlan interface.*/
- void writeDeviceFile();
+ /** @brief writes the device configuration.
+ systemd reads this configuration file
+ and creates the vlan interface.*/
+ void writeDeviceFile();
- /** @brief copy the mac address from the parent interface.*/
- void updateMacAddress()
- {
- MacAddressIntf::mACAddress(parentInterface.mACAddress());
- }
+ /** @brief copy the mac address from the parent interface.*/
+ void updateMacAddress()
+ {
+ MacAddressIntf::mACAddress(parentInterface.mACAddress());
+ }
- private:
+ private:
+ /** @brief VLAN Identifier. */
+ using VlanIface::id;
- /** @brief VLAN Identifier. */
- using VlanIface::id;
+ EthernetInterface& parentInterface;
- EthernetInterface& parentInterface;
-
- friend class TestVlanInterface;
+ friend class TestVlanInterface;
};
} // namespace network