From d1eac88d18ae7dd11033dba87b6aebb220da9064 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 29 Mar 2018 10:34:05 -0400 Subject: Enable clang-format Fix up errors and enable clang-format during CI builds. Change-Id: I4176b81f8b85a287af9354165e09ff66aeb9fb29 Signed-off-by: Brad Bishop --- src/event_entry.hpp | 66 +++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 35 deletions(-) (limited to 'src/event_entry.hpp') diff --git a/src/event_entry.hpp b/src/event_entry.hpp index 7be66d9..e39f1e2 100644 --- a/src/event_entry.hpp +++ b/src/event_entry.hpp @@ -13,8 +13,8 @@ namespace events using namespace phosphor::dbus::monitoring; -using EntryIface = sdbusplus::server::object::object < - sdbusplus::xyz::openbmc_project::Logging::server::Event >; +using EntryIface = sdbusplus::server::object::object< + sdbusplus::xyz::openbmc_project::Logging::server::Event>; /** @class Entry * @brief OpenBMC Event entry implementation. @@ -23,39 +23,35 @@ using EntryIface = sdbusplus::server::object::object < */ class Entry : public EntryIface { - public: - Entry() = delete; - Entry(const Entry&) = delete; - Entry& operator=(const Entry&) = delete; - Entry(Entry&&) = delete; - Entry& operator=(Entry&&) = delete; - virtual ~Entry() = default; - - /** @brief Constructor to put object onto bus at a dbus path. - * @param[in] path - Path to attach at. - * @param[in] eventId - The event entry id. - * @param[in] timestamp - timestamp when the event created. - * @param[in] msg - The message of the event. - * @param[in] metaData - The event metadata. - */ - Entry( - const std::string& path, - uint64_t eventTimestamp, - std::string&& msg, - std::vector&& metaData) : - EntryIface(SDBusPlus::getBus(), path.c_str(), true), - objectPath(path) - { - timestamp(eventTimestamp); - message(msg); - additionalData(metaData); - // Emit deferred signal. - this->emit_object_added(); - } - - /** @brief Path of Object. */ - std::string objectPath; - + public: + Entry() = delete; + Entry(const Entry&) = delete; + Entry& operator=(const Entry&) = delete; + Entry(Entry&&) = delete; + Entry& operator=(Entry&&) = delete; + virtual ~Entry() = default; + + /** @brief Constructor to put object onto bus at a dbus path. + * @param[in] path - Path to attach at. + * @param[in] eventId - The event entry id. + * @param[in] timestamp - timestamp when the event created. + * @param[in] msg - The message of the event. + * @param[in] metaData - The event metadata. + */ + Entry(const std::string& path, uint64_t eventTimestamp, std::string&& msg, + std::vector&& metaData) : + EntryIface(SDBusPlus::getBus(), path.c_str(), true), + objectPath(path) + { + timestamp(eventTimestamp); + message(msg); + additionalData(metaData); + // Emit deferred signal. + this->emit_object_added(); + } + + /** @brief Path of Object. */ + std::string objectPath; }; } // namespace events -- cgit v1.2.1