From 215f500b0e4645d1abffb2770c8365d0713f00e9 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Fri, 23 May 2014 11:05:25 +0200 Subject: [PATCH] Fix compiler warnings. Refs #5823 --- lib/db_ido/dbconnection.cpp | 2 +- lib/icinga/externalcommandprocessor.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp index 6505e1574..493733d97 100644 --- a/lib/db_ido/dbconnection.cpp +++ b/lib/db_ido/dbconnection.cpp @@ -191,7 +191,7 @@ void DbConnection::CleanUpHandler(void) { "systemcommands", "start_time" } }; - for (int i = 0; i < sizeof(tables) / sizeof(tables[0]); i++) { + for (size_t i = 0; i < sizeof(tables) / sizeof(tables[0]); i++) { double max_age = GetCleanup()->Get(tables[i].name + "_age"); if (max_age == 0) diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp index 10b994f8d..1d4b13287 100644 --- a/lib/icinga/externalcommandprocessor.cpp +++ b/lib/icinga/externalcommandprocessor.cpp @@ -82,13 +82,13 @@ static Value ExternalCommandAPIWrapper(const String& command, const Dictionary:: return true; } -static void RegisterCommand(const String& command, const ExternalCommandCallback& callback, size_t minArgs = 0, size_t maxArgs = -1) +static void RegisterCommand(const String& command, const ExternalCommandCallback& callback, size_t minArgs = 0, size_t maxArgs = UINT_MAX) { boost::mutex::scoped_lock lock(GetMutex()); ExternalCommandInfo eci; eci.Callback = callback; eci.MinArgs = minArgs; - eci.MaxArgs = (maxArgs == -1) ? minArgs : maxArgs; + eci.MaxArgs = (maxArgs == UINT_MAX) ? minArgs : maxArgs; GetCommands()[command] = eci; ApiFunction::Ptr afunc = make_shared(boost::bind(&ExternalCommandAPIWrapper, command, _2)); -- 2.40.0