Mirrors_Framework/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-09-20 14:57:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reorder helper function arguments for consistency.

Browse Source
This commit is contained in:
Roger A. Light
2016-01-26 17:06:32 +00:00
parent 0a95c9a3af
commit 7709621911
9 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cpp/mosquittopp.cpp
+8 -5
View File
@@ -109,9 +109,9 @@ int topic_matches_sub(const char *sub, const char *topic, bool *result)
int subscribe_simple(
struct mosquitto_message **messages,
int msg_count,
bool retained,
const char *topic,
int qos,
bool retained,
const char *host,
int port,
const char *client_id,
@@ -122,7 +122,9 @@ int subscribe_simple(
const struct libmosquitto_will *will,
const struct libmosquitto_tls *tls)
{
return mosquitto_subscribe_simple(messages, msg_count, topic, qos, retained,
return mosquitto_subscribe_simple(
messages, msg_count, retained,
topic, qos,
host, port, client_id, keepalive, clean_session,
username, password,
will, tls);
@@ -130,10 +132,9 @@ int subscribe_simple(
mosqpp_EXPORT int subscribe_callback(
int (*callback)(struct mosquitto *, void *, const struct mosquitto_message *),
void *userdata,
const char *topic,
int qos,
void *userdata,
bool retained,
const char *host,
int port,
const char *client_id,
@@ -144,7 +145,9 @@ mosqpp_EXPORT int subscribe_callback(
const struct libmosquitto_will *will,
const struct libmosquitto_tls *tls)
{
return mosquitto_subscribe_callback(callback, topic, qos, userdata, retained,
return mosquitto_subscribe_callback(
callback, userdata,
topic, qos,
host, port, client_id, keepalive, clean_session,
username, password,
will, tls);
lib/cpp/mosquittopp.h
+2 -2
View File
@@ -44,9 +44,9 @@ mosqpp_EXPORT int topic_matches_sub(const char *sub, const char *topic, bool *re
mosqpp_EXPORT int subscribe_simple(
struct mosquitto_message **messages,
int msg_count,
bool retained,
const char *topic,
int qos=0,
bool retained=true,
const char *host="localhost",
int port=1883,
const char *client_id=NULL,
@@ -59,9 +59,9 @@ mosqpp_EXPORT int subscribe_simple(
mosqpp_EXPORT int subscribe_callback(
int (*callback)(struct mosquitto *, void *, const struct mosquitto_message *),
void *userdata,
const char *topic,
int qos=0,
void *userdata=NULL,
bool retained=true,
const char *host="localhost",
int port=1883,