tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-22 09:17:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler warnings by not comparing signed with unsigned

Browse Source
This commit is contained in:
Alexander A. Klimov 2023-03-23 13:38:18 +01:00
parent e3eb599120
commit 6d885a4f3f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/base/netstring.cpp
View File

@ -127,7 +127,7 @@ size_t NetString::WriteStringToStream(const Stream::Ptr& stream, const String& s
* @see https://github.com/PeterScott/netstring-c/blob/master/netstring.c * @see https://github.com/PeterScott/netstring-c/blob/master/netstring.c
*/ */
String NetString::ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream, String NetString::ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream,
ssize_t maxMessageLength) size_t maxMessageLength)
{ {
namespace asio = boost::asio; namespace asio = boost::asio;
@ -167,7 +167,7 @@ String NetString::ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream,
} }
} }
if (maxMessageLength >= 0 && len > maxMessageLength) { if (len > maxMessageLength) {
std::stringstream errorMessage; std::stringstream errorMessage;
errorMessage << "Max data length exceeded: " << (maxMessageLength / 1024) << " KB"; errorMessage << "Max data length exceeded: " << (maxMessageLength / 1024) << " KB";
@ -206,7 +206,7 @@ String NetString::ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream,
* @see https://github.com/PeterScott/netstring-c/blob/master/netstring.c * @see https://github.com/PeterScott/netstring-c/blob/master/netstring.c
*/ */
String NetString::ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream, String NetString::ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream,
boost::asio::yield_context yc, ssize_t maxMessageLength) boost::asio::yield_context yc, size_t maxMessageLength)
{ {
namespace asio = boost::asio; namespace asio = boost::asio;
@ -246,7 +246,7 @@ String NetString::ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream,
} }
} }
if (maxMessageLength >= 0 && len > maxMessageLength) { if (len > maxMessageLength) {
std::stringstream errorMessage; std::stringstream errorMessage;
errorMessage << "Max data length exceeded: " << (maxMessageLength / 1024) << " KB"; errorMessage << "Max data length exceeded: " << (maxMessageLength / 1024) << " KB";

4
lib/base/netstring.hpp
View File

@ -26,9 +26,9 @@ class NetString
public: public:
static StreamReadStatus ReadStringFromStream(const Stream::Ptr& stream, String *message, StreamReadContext& context, static StreamReadStatus ReadStringFromStream(const Stream::Ptr& stream, String *message, StreamReadContext& context,
bool may_wait = false, ssize_t maxMessageLength = -1); bool may_wait = false, ssize_t maxMessageLength = -1);
static String ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream, ssize_t maxMessageLength = -1); static String ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream, size_t maxMessageLength = -1);
static String ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream, static String ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream,
boost::asio::yield_context yc, ssize_t maxMessageLength = -1); boost::asio::yield_context yc, size_t maxMessageLength = -1);
static size_t WriteStringToStream(const Stream::Ptr& stream, const String& message); static size_t WriteStringToStream(const Stream::Ptr& stream, const String& message);
static size_t WriteStringToStream(const Shared<AsioTlsStream>::Ptr& stream, const String& message); static size_t WriteStringToStream(const Shared<AsioTlsStream>::Ptr& stream, const String& message);
static size_t WriteStringToStream(const Shared<AsioTlsStream>::Ptr& stream, const String& message, boost::asio::yield_context yc); static size_t WriteStringToStream(const Shared<AsioTlsStream>::Ptr& stream, const String& message, boost::asio::yield_context yc);

2
lib/icingadb/icingadb-objects.cpp
View File

@ -542,7 +542,7 @@ void IcingaDB::UpdateAllConfigObjects()
<< "Initial config/status dump finished in " << took << " seconds."; << "Initial config/status dump finished in " << took << " seconds.";
} }
std::vector<std::vector<intrusive_ptr<ConfigObject>>> IcingaDB::ChunkObjects(std::vector<intrusive_ptr<ConfigObject>> objects, size_t chunkSize) { std::vector<std::vector<intrusive_ptr<ConfigObject>>> IcingaDB::ChunkObjects(std::vector<intrusive_ptr<ConfigObject>> objects, int chunkSize) {
std::vector<std::vector<intrusive_ptr<ConfigObject>>> chunks; std::vector<std::vector<intrusive_ptr<ConfigObject>>> chunks;
auto offset (objects.begin()); auto offset (objects.begin());
auto end (objects.end()); auto end (objects.end());

2
lib/icingadb/icingadb.hpp
View File

@ -106,7 +106,7 @@ private:
/* config & status dump */ /* config & status dump */
void UpdateAllConfigObjects(); void UpdateAllConfigObjects();
std::vector<std::vector<intrusive_ptr<ConfigObject>>> ChunkObjects(std::vector<intrusive_ptr<ConfigObject>> objects, size_t chunkSize); std::vector<std::vector<intrusive_ptr<ConfigObject>>> ChunkObjects(std::vector<intrusive_ptr<ConfigObject>> objects, int chunkSize);
void DeleteKeys(const RedisConnection::Ptr& conn, const std::vector<String>& keys, RedisConnection::QueryPriority priority); void DeleteKeys(const RedisConnection::Ptr& conn, const std::vector<String>& keys, RedisConnection::QueryPriority priority);
std::vector<String> GetTypeOverwriteKeys(const String& type); std::vector<String> GetTypeOverwriteKeys(const String& type);
std::vector<String> GetTypeDumpSignalKeys(const Type::Ptr& type); std::vector<String> GetTypeDumpSignalKeys(const Type::Ptr& type);