Fix compiler warnings by removing unused variables

Author: Al2Klimov

icinga-app/icinga.cpp

@@ -551,7 +551,7 @@ static int Main()
 	int rc = 1;
 
 	if (autocomplete) {
-		CLICommand::ShowCommands(argc, argv, &visibleDesc, &hiddenDesc,
+		CLICommand::ShowCommands(argc, argv, &visibleDesc,
 			&GlobalArgumentCompletion, true, autoindex);
 		rc = 0;
 	} else if (command) {

lib/base/process.cpp

@@ -210,7 +210,7 @@ static Value ProcessSpawnImpl(struct msghdr *msgh, const Dictionary::Ptr& reques
 	return response;
 }
 
-static Value ProcessKillImpl(struct msghdr *msgh, const Dictionary::Ptr& request)
+static Value ProcessKillImpl(const Dictionary::Ptr& request)
 {
 	pid_t pid = request->Get("pid");
 	int signum = request->Get("signum");
@@ -226,7 +226,7 @@ static Value ProcessKillImpl(struct msghdr *msgh, const Dictionary::Ptr& request
 	return response;
 }
 
-static Value ProcessWaitPIDImpl(struct msghdr *msgh, const Dictionary::Ptr& request)
+static Value ProcessWaitPIDImpl(const Dictionary::Ptr& request)
 {
 	pid_t pid = request->Get("pid");
 
@@ -309,9 +309,9 @@ static void ProcessHandler()
 		if (command == "spawn")
 			response = ProcessSpawnImpl(&msg, request);
 		else if (command == "waitpid")
-			response = ProcessWaitPIDImpl(&msg, request);
+			response = ProcessWaitPIDImpl(request);
 		else if (command == "kill")
-			response = ProcessKillImpl(&msg, request);
+			response = ProcessKillImpl(request);
 		else
 			response = Empty;
 

lib/base/tlsutility.cpp

@@ -1004,7 +1004,6 @@ int GetCertificateVersion(const std::shared_ptr<X509>& cert)
 
 String GetSignatureAlgorithm(const std::shared_ptr<X509>& cert)
 {
-	int alg;
 	int sign_alg;
 	X509_PUBKEY *key;
 	X509_ALGOR *algor;
@@ -1013,7 +1012,7 @@ String GetSignatureAlgorithm(const std::shared_ptr<X509>& cert)
 
 	X509_PUBKEY_get0_param(nullptr, nullptr, 0, &algor, key); //TODO: Error handling
 
-	alg = OBJ_obj2nid (algor->algorithm);
+	OBJ_obj2nid (algor->algorithm);
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 	sign_alg = OBJ_obj2nid((cert.get())->sig_alg->algorithm);

lib/cli/clicommand.cpp

@@ -220,7 +220,6 @@ bool CLICommand::ParseCommand(int argc, char **argv, po::options_description& vi
 }
 
 void CLICommand::ShowCommands(int argc, char **argv, po::options_description *visibleDesc,
-	po::options_description *hiddenDesc,
 	ArgumentCompletionCallback globalArgCompletionCallback,
 	bool autocomplete, int autoindex)
 {

lib/cli/clicommand.hpp

@@ -59,7 +59,6 @@ class CLICommand : public Object
 
 	static void ShowCommands(int argc, char **argv,
 		boost::program_options::options_description *visibleDesc = nullptr,
-		boost::program_options::options_description *hiddenDesc = nullptr,
 		ArgumentCompletionCallback globalArgCompletionCallback = nullptr,
 		bool autocomplete = false, int autoindex = -1);
 

lib/cli/daemoncommand.cpp

@@ -767,8 +767,10 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
 	// Whether we already forwarded a termination signal to the seamless worker
 	bool requestedTermination = false;
 
+#ifdef HAVE_SYSTEMD
 	// Whether we already notified systemd about our termination
 	bool notifiedTermination = false;
+#endif /* HAVE_SYSTEMD */
 
 	for (;;) {
 #ifdef HAVE_SYSTEMD

lib/cli/nodesetupcommand.cpp

@@ -88,12 +88,12 @@ int NodeSetupCommand::Run(const boost::program_options::variables_map& vm, const
 	}
 
 	if (vm.count("master"))
-		return SetupMaster(vm, ap);
+		return SetupMaster(vm);
 	else
-		return SetupNode(vm, ap);
+		return SetupNode(vm);
 }
 
-int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap)
+int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& vm)
 {
 	/* Ignore not required parameters */
 	if (vm.count("ticket"))
@@ -250,7 +250,7 @@ int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& v
 	return 0;
 }
 
-int NodeSetupCommand::SetupNode(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap)
+int NodeSetupCommand::SetupNode(const boost::program_options::variables_map& vm)
 {
 	/* require at least one endpoint. Ticket is optional. */
 	if (!vm.count("endpoint")) {

lib/cli/nodesetupcommand.hpp

@@ -27,8 +27,8 @@ class NodeSetupCommand final : public CLICommand
 	int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 private:
-	static int SetupMaster(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap);
-	static int SetupNode(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap);
+	static int SetupMaster(const boost::program_options::variables_map& vm);
+	static int SetupNode(const boost::program_options::variables_map& vm);
 };
 
 }

lib/compat/compatlogger.cpp

@@ -52,10 +52,10 @@ void CompatLogger::Start(bool runtimeCreated)
 	Checkable::OnNewCheckResult.connect([this](const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, const MessageOrigin::Ptr&) {
 		CheckResultHandler(checkable, cr);
 	});
-	Checkable::OnNotificationSentToUser.connect([this](const Notification::Ptr& notification, const Checkable::Ptr& checkable,
+	Checkable::OnNotificationSentToUser.connect([this](const Notification::Ptr&, const Checkable::Ptr& checkable,
 		const User::Ptr& user, const NotificationType& type, const CheckResult::Ptr& cr, const String& author,
 		const String& commentText, const String& commandName, const MessageOrigin::Ptr&) {
-		NotificationSentHandler(notification, checkable, user, type, cr, author, commentText, commandName);
+		NotificationSentHandler(checkable, user, type, cr, author, commentText, commandName);
 	});
 
 	Downtime::OnDowntimeTriggered.connect([this](const Downtime::Ptr& downtime) { TriggerDowntimeHandler(downtime); });
@@ -238,7 +238,7 @@ void CompatLogger::RemoveDowntimeHandler(const Downtime::Ptr& downtime)
 /**
  * @threadsafety Always.
  */
-void CompatLogger::NotificationSentHandler(const Notification::Ptr& notification, const Checkable::Ptr& checkable,
+void CompatLogger::NotificationSentHandler(const Checkable::Ptr& checkable,
 	const User::Ptr& user, NotificationType notification_type, CheckResult::Ptr const& cr,
 	const String& author, const String& comment_text, const String& command_name)
 {

lib/compat/compatlogger.hpp

@@ -35,7 +35,7 @@ class CompatLogger final : public ObjectImpl<CompatLogger>
 	void Flush();
 
 	void CheckResultHandler(const Checkable::Ptr& service, const CheckResult::Ptr& cr);
-	void NotificationSentHandler(const Notification::Ptr& notification, const Checkable::Ptr& service,
+	void NotificationSentHandler(const Checkable::Ptr& service,
 		const User::Ptr& user, NotificationType notification_type, CheckResult::Ptr const& cr,
 		const String& author, const String& comment_text, const String& command_name);
 	void FlappingChangedHandler(const Checkable::Ptr& checkable);