Skip to content

P
paho.mqtt.c
Commit 38e1e955 authored by Ian Craggs's avatar Ian Craggs
Browse files
Options

Merge branch 'develop' into mqttv5

parents 7cc0e3fa 4cf648db
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/MQTTAsync.c
View file @ 38e1e955
...@@ -2370,7 +2370,7 @@ int MQTTAsync_connect(MQTTAsync handle, const MQTTAsync_connectOptions* options) ...@@ -2370,7 +2370,7 @@ int MQTTAsync_connect(MQTTAsync handle, const MQTTAsync_connectOptions* options)
} }
else else
{ {
m->c->will->payloadlen = strlen(options->will->message); m->c->will->payloadlen = (int)strlen(options->will->message);
source = (void*)options->will->message; source = (void*)options->will->message;
} }
m->c->will->payload = malloc(m->c->will->payloadlen); m->c->will->payload = malloc(m->c->will->payloadlen);
...@@ -2451,7 +2451,7 @@ int MQTTAsync_connect(MQTTAsync handle, const MQTTAsync_connectOptions* options) ...@@ -2451,7 +2451,7 @@ int MQTTAsync_connect(MQTTAsync handle, const MQTTAsync_connectOptions* options)
if (options->password) if (options->password)
{ {
m->c->password = MQTTStrdup(options->password); m->c->password = MQTTStrdup(options->password);
m->c->passwordlen = strlen(options->password); m->c->passwordlen = (int)strlen(options->password);
} }
else if (options->struct_version >= 5 && options->binarypwd.data) else if (options->struct_version >= 5 && options->binarypwd.data)
{ {
......
src/MQTTClient.c
View file @ 38e1e955
...@@ -1110,7 +1110,7 @@ static MQTTResponse MQTTClient_connectURI(MQTTClient handle, MQTTClient_connectO ...@@ -1110,7 +1110,7 @@ static MQTTResponse MQTTClient_connectURI(MQTTClient handle, MQTTClient_connectO
} }
else else
{ {
m->c->will->payloadlen = strlen(options->will->message); m->c->will->payloadlen = (int)strlen(options->will->message);
source = (void*)options->will->message; source = (void*)options->will->message;
} }
m->c->will->payload = malloc(m->c->will->payloadlen); m->c->will->payload = malloc(m->c->will->payloadlen);
...@@ -1184,7 +1184,7 @@ static MQTTResponse MQTTClient_connectURI(MQTTClient handle, MQTTClient_connectO ...@@ -1184,7 +1184,7 @@ static MQTTResponse MQTTClient_connectURI(MQTTClient handle, MQTTClient_connectO
if (options->password) if (options->password)
{ {
m->c->password = MQTTStrdup(options->password); m->c->password = MQTTStrdup(options->password);
m->c->passwordlen = strlen(options->password); m->c->passwordlen = (int)strlen(options->password);
} }
else if (options->struct_version >= 5 && options->binarypwd.data) else if (options->struct_version >= 5 && options->binarypwd.data)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment