library/paho.mqtt.cpp
1
0
Fork 0
mirror of https://github.com/eclipse-paho/paho.mqtt.cpp.git synced 2025-09-15 12:58:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated local CI sctipt, buildtst.sh. Fixed cppcheck warnings.

Browse Source
This commit is contained in:
fpagliughi 2025-01-07 09:18:17 -05:00
parent 43c1dbc2ba
commit 0aec355314
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/async_client.cpp
View File

@ -31,6 +31,8 @@
#include "mqtt/response_options.h"
#include "mqtt/token.h"
#define UNUSED(x) (void)(x)
namespace mqtt {
/////////////////////////////////////////////////////////////////////////////
@ -322,7 +324,7 @@ void async_client::set_callback(callback& cb)
int rc = MQTTAsync_setConnected(cli_, this, &async_client::on_connected);
if (rc == MQTTASYNC_SUCCESS) {
rc = MQTTAsync_setCallbacks(
MQTTAsync_setCallbacks(
cli_, this, &async_client::on_connection_lost, &async_client::on_message_arrived,
nullptr /*&async_client::on_delivery_complete*/
);
@ -425,6 +427,7 @@ token_ptr async_client::connect(connect_options opts)
throw exception(rc);
}
UNUSED(tmpTok);
return connTok_;
}
@ -439,6 +442,7 @@ token_ptr async_client::connect(connect_options opts, void* userContext, iaction
else
opts.opts_.cleansession = 0;
// Keep the old connTok_ alive (see above)
auto tmpTok = connTok_;
connTok_ = token::create(token::Type::CONNECT, *this, userContext, cb);
add_token(connTok_);
@ -454,6 +458,7 @@ token_ptr async_client::connect(connect_options opts, void* userContext, iaction
throw exception(rc);
}
UNUSED(tmpTok);
return connTok_;
}
@ -534,10 +539,12 @@ delivery_token_ptr async_client::get_pending_delivery_token(int msgID) const
if (msgID > 0) {
guard g(lock_);
for (const auto& t : pendingDeliveryTokens_) {
if (t->get_message_id() == msgID)
return t;
}
const auto it = std::find_if(
pendingDeliveryTokens_.cbegin(), pendingDeliveryTokens_.cend(),
[msgID](const auto& t) { return t->get_message_id() == msgID; }
);
if (it != pendingDeliveryTokens_.end())
return *it;
}
return delivery_token_ptr();
}

10
src/topic.cpp
View File

@ -18,6 +18,8 @@
#include "mqtt/topic.h"
#include <algorithm>
#include "mqtt/async_client.h"
namespace mqtt {
@ -94,11 +96,9 @@ bool topic_filter::has_wildcards(const string& filter)
bool topic_filter::has_wildcards() const
{
for (auto& f : fields_) {
if (f == "+" || f == "#")
return true;
}
return false;
return std::any_of(fields_.cbegin(), fields_.cend(), [](const auto& f) {
return (f == "+" || f == "#");
});
}
// See if the topic matches this filter.