From 802c182e15f5d4d17425f42d4c14963a15794862 Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Wed, 18 Nov 2020 13:07:39 +0100 Subject: [PATCH] - coding style --- client/cmd-list-configs.cc | 6 +++--- client/cmd-list.cc | 2 +- zypp-plugin/snapper_zypp_plugin.cc | 22 +++++++++++----------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/client/cmd-list-configs.cc b/client/cmd-list-configs.cc index 5c20008d..52ab28a7 100644 --- a/client/cmd-list-configs.cc +++ b/client/cmd-list-configs.cc @@ -103,7 +103,7 @@ namespace snapper formatter.header().push_back(header_for(column)); map configs = snappers->getConfigs(); - for (const map::value_type value : configs) + for (const map::value_type& value : configs) { vector row; @@ -126,7 +126,7 @@ namespace snapper formatter.header().push_back(toString(column)); map configs = snappers->getConfigs(); - for (const map::value_type value : configs) + for (const map::value_type& value : configs) { vector row; @@ -149,7 +149,7 @@ namespace snapper json_object_object_add(formatter.root(), "configs", json_configs); map configs = snappers->getConfigs(); - for (const map::value_type value : configs) + for (const map::value_type& value : configs) { json_object* json_config = json_object_new_object(); json_object_array_add(json_configs, json_config); diff --git a/client/cmd-list.cc b/client/cmd-list.cc index 3ff10e59..9ec872ea 100644 --- a/client/cmd-list.cc +++ b/client/cmd-list.cc @@ -510,7 +510,7 @@ namespace snapper return nullptr; json_object* json_userdata = json_object_new_object(); - for (const map::value_type sub_value : tmp) + for (const map::value_type& sub_value : tmp) json_object_object_add(json_userdata, sub_value.first.c_str(), json_object_new_string(sub_value.second.c_str())); diff --git a/zypp-plugin/snapper_zypp_plugin.cc b/zypp-plugin/snapper_zypp_plugin.cc index 238a196c..e4b0c0af 100644 --- a/zypp-plugin/snapper_zypp_plugin.cc +++ b/zypp-plugin/snapper_zypp_plugin.cc @@ -50,13 +50,16 @@ using snapper::CodeLocation; #include "zypp_commit_plugin.h" #include "solvable_matcher.h" -ostream& operator <<(ostream& os, set ss) { +ostream& +operator<<(ostream& os, const set& ss) +{ bool seen_first = false; os << '{'; - for (auto s: ss) { - if (seen_first) { + for (auto s : ss) + { + if (seen_first) os << ", "; - } + os << s; seen_first = true; } @@ -81,22 +84,19 @@ public: , snapper_config("root") , bus(DBUS_BUS_SYSTEM) { - const char * s; + const char* s; s = getenv("SNAPPER_ZYPP_PLUGIN_CONFIG"); - if (s != nullptr) { + if (s) plugin_config = s; - } s = getenv("SNAPPER_ZYPP_PLUGIN_SNAPPER_CONFIG"); - if (s != nullptr) { + if (s) snapper_config = s; - } s = getenv("SNAPPER_ZYPP_PLUGIN_DBUS_SESSION"); - if (s != nullptr) { + if (s) bus = DBUS_BUS_SESSION; - } } }; -- 2.47.3