Skip to content

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

Merge branch 'fixes' into develop

parents e4067dc3 5f3edcbc
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
src/Socket.c
View file @ 13e88b2a
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
* Ian Craggs - async client updates * Ian Craggs - async client updates
* Ian Craggs - fix for bug 484496 * Ian Craggs - fix for bug 484496
* Juergen Kosel, Ian Craggs - fix for issue #135 * Juergen Kosel, Ian Craggs - fix for issue #135
* Ian Craggs - issue #217
*******************************************************************************/ *******************************************************************************/
/** /**
...@@ -751,7 +752,7 @@ int Socket_continueWrite(int socket) ...@@ -751,7 +752,7 @@ int Socket_continueWrite(int socket)
add some of the buffer */ add some of the buffer */
size_t offset = pw->bytes - curbuflen; size_t offset = pw->bytes - curbuflen;
iovecs1[++curbuf].iov_len = pw->iovecs[i].iov_len - (ULONG)offset; iovecs1[++curbuf].iov_len = pw->iovecs[i].iov_len - (ULONG)offset;
iovecs1[curbuf].iov_base = pw->iovecs[i].iov_base + offset; iovecs1[curbuf].iov_base = (char*)pw->iovecs[i].iov_base + offset;
break; break;
} }
curbuflen += pw->iovecs[i].iov_len; curbuflen += pw->iovecs[i].iov_len;
......
src/samples/MQTTClient_subscribe.c
View file @ 13e88b2a
...@@ -88,6 +88,7 @@ int main(int argc, char* argv[]) ...@@ -88,6 +88,7 @@ int main(int argc, char* argv[])
ch = getchar(); ch = getchar();
} while(ch!='Q' && ch != 'q'); } while(ch!='Q' && ch != 'q');
MQTTClient_unsubscribe(client, TOPIC);
MQTTClient_disconnect(client, 10000); MQTTClient_disconnect(client, 10000);
MQTTClient_destroy(&client); MQTTClient_destroy(&client);
return rc; return rc;
......
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