From b623b2faec7fbdb8facb0f37418711513d11860f Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Wed, 25 Jan 2023 12:52:12 +0100 Subject: [PATCH] - coding style --- zypp-plugin/forwarding-zypp-plugin.cc | 10 +++++----- zypp-plugin/snapper-zypp-plugin.cc | 1 + zypp-plugin/snapper-zypp-plugin.h | 1 + zypp-plugin/solvable-matcher.cc | 1 + zypp-plugin/zypp-commit-plugin.cc | 12 ++++-------- zypp-plugin/zypp-commit-plugin.h | 1 + zypp-plugin/zypp-plugin.cc | 3 +++ zypp-plugin/zypp-plugin.h | 2 ++ 8 files changed, 18 insertions(+), 13 deletions(-) diff --git a/zypp-plugin/forwarding-zypp-plugin.cc b/zypp-plugin/forwarding-zypp-plugin.cc index fc49f670..bfba0c04 100644 --- a/zypp-plugin/forwarding-zypp-plugin.cc +++ b/zypp-plugin/forwarding-zypp-plugin.cc @@ -19,16 +19,15 @@ * find current contact information at www.suse.com. */ -#include - -using namespace std; +#include #include -namespace bp = boost::process; - #include "zypp-plugin.h" +using namespace std; +namespace bp = boost::process; + /** * A middleware that can wrap an actual plugin for enhanced validation. @@ -88,6 +87,7 @@ main(int argc, char** argv) { if (argc != 2) throw runtime_error("Usage: forwarding-zypp-plugin ANOTHER_ZYPP_PLUGIN"); + ForwardingZyppPlugin plugin(argv[1]); return plugin.main(); } diff --git a/zypp-plugin/snapper-zypp-plugin.cc b/zypp-plugin/snapper-zypp-plugin.cc index 27308e8b..6fab74b0 100644 --- a/zypp-plugin/snapper-zypp-plugin.cc +++ b/zypp-plugin/snapper-zypp-plugin.cc @@ -19,6 +19,7 @@ * find current contact information at www.suse.com. */ + #include #include #include diff --git a/zypp-plugin/snapper-zypp-plugin.h b/zypp-plugin/snapper-zypp-plugin.h index cb519cd1..c2c2215b 100644 --- a/zypp-plugin/snapper-zypp-plugin.h +++ b/zypp-plugin/snapper-zypp-plugin.h @@ -22,6 +22,7 @@ #ifndef SNAPPER_ZYPP_COMMIT_PLUGIN_H #define SNAPPER_ZYPP_COMMIT_PLUGIN_H + #include "zypp-commit-plugin.h" #include "solvable-matcher.h" diff --git a/zypp-plugin/solvable-matcher.cc b/zypp-plugin/solvable-matcher.cc index ae1cdde0..b02647cf 100644 --- a/zypp-plugin/solvable-matcher.cc +++ b/zypp-plugin/solvable-matcher.cc @@ -19,6 +19,7 @@ * find current contact information at www.suse.com. */ + #include "solvable-matcher.h" #include diff --git a/zypp-plugin/zypp-commit-plugin.cc b/zypp-plugin/zypp-commit-plugin.cc index aa4e0903..55f5e5dc 100644 --- a/zypp-plugin/zypp-commit-plugin.cc +++ b/zypp-plugin/zypp-commit-plugin.cc @@ -26,21 +26,17 @@ ZyppPlugin::Message ZyppCommitPlugin::dispatch(const Message& msg) { - if (msg.command == "PLUGINBEGIN") { + if (msg.command == "PLUGINBEGIN") return plugin_begin(msg); - } - if (msg.command == "PLUGINEND") { + if (msg.command == "PLUGINEND") return plugin_end(msg); - } - if (msg.command == "COMMITBEGIN") { + if (msg.command == "COMMITBEGIN") return commit_begin(msg); - } - if (msg.command == "COMMITEND") { + if (msg.command == "COMMITEND") return commit_end(msg); - } return ZyppPlugin::dispatch(msg); } diff --git a/zypp-plugin/zypp-commit-plugin.h b/zypp-plugin/zypp-commit-plugin.h index 1282e345..03860570 100644 --- a/zypp-plugin/zypp-commit-plugin.h +++ b/zypp-plugin/zypp-commit-plugin.h @@ -22,6 +22,7 @@ #ifndef ZYPP_COMMIT_PLUGIN_H #define ZYPP_COMMIT_PLUGIN_H + #include "zypp-plugin.h" diff --git a/zypp-plugin/zypp-plugin.cc b/zypp-plugin/zypp-plugin.cc index 0867930d..b7027cd6 100644 --- a/zypp-plugin/zypp-plugin.cc +++ b/zypp-plugin/zypp-plugin.cc @@ -19,6 +19,7 @@ * find current contact information at www.suse.com. */ + #include #include #include @@ -38,9 +39,11 @@ ZyppPlugin::main() Message msg = read_message(pin); if (pin.eof()) break; + Message reply = dispatch(msg); write_message(pout, reply); } + return 0; } diff --git a/zypp-plugin/zypp-plugin.h b/zypp-plugin/zypp-plugin.h index 22de4c9c..bbe86860 100644 --- a/zypp-plugin/zypp-plugin.h +++ b/zypp-plugin/zypp-plugin.h @@ -22,10 +22,12 @@ #ifndef ZYPP_PLUGIN_H #define ZYPP_PLUGIN_H + #include #include #include + class ZyppPlugin { public: -- 2.47.3