elog-gen: minor changes to reduce clang-format diffs
Perform minor changes to the elog-gen template so that the resulting
file more closely conforms to our project-wide clang-format settings.
Currently phosphor-host-ipmid checks in a copy of the output header
and this reduces the differences between the version from the build
and the version checked in (which must pass clang-format).
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ica61261a25696caf7db53f2603a2cd1407281432
diff --git a/tools/phosphor-logging/templates/elog-gen-template.mako.hpp b/tools/phosphor-logging/templates/elog-gen-template.mako.hpp
index 878f830..9d15c6b 100644
--- a/tools/phosphor-logging/templates/elog-gen-template.mako.hpp
+++ b/tools/phosphor-logging/templates/elog-gen-template.mako.hpp
@@ -4,12 +4,12 @@
// See elog-gen.py for more details
#pragma once
+#include <phosphor-logging/elog.hpp>
+#include <phosphor-logging/log.hpp>
+#include <sdbusplus/exception.hpp>
#include <string>
#include <tuple>
#include <type_traits>
-#include <sdbusplus/exception.hpp>
-#include <phosphor-logging/log.hpp>
-#include <phosphor-logging/elog.hpp>
<% exceptions = [] %>\
% for name in errors:
@@ -32,11 +32,10 @@
namespace ${s}
{
% endfor
- struct ${exception_name};
+struct ${exception_name};
% for s in reversed(ns):
} // namespace ${s}
% endfor
-
% endfor
namespace phosphor
@@ -81,7 +80,7 @@
};
% endfor
-} // namespace _${classname}
+} // namespace _${classname}
<%
example_yaml = False
if("example.xyz.openbmc_project" in name):
@@ -131,8 +130,8 @@
using ${b.split("::").pop()} = ${b};
% endfor
using metadata_types = std::tuple<${meta_string}>;
-
% if example_yaml:
+
const char* name() const noexcept override
{
return errName;
@@ -172,7 +171,7 @@
phosphor_type = sdbusplus_type.replace("sdbusplus::", "")
phosphor_type = phosphor_type.replace("Error::", "")
%>\
-
+\
% if sdbusplus_type != phosphor_type:
namespace details
{
@@ -183,7 +182,7 @@
using type = ${phosphor_type};
};
-}
+} // namespace details
%endif
% endfor