Merge branch 'fixes' into develop

src/Socket.c

@@ -15,6 +15,7 @@
  *    Ian Craggs - async client updates
  *    Ian Craggs - fix for bug 484496
  *    Juergen Kosel, Ian Craggs - fix for issue #135
+ *    Ian Craggs - issue #217
  *******************************************************************************/
 
 /**
@@ -751,7 +752,7 @@ int Socket_continueWrite(int socket)
 				add some of the buffer */
 			size_t offset = pw->bytes - curbuflen;
 			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;
 		}
 		curbuflen += pw->iovecs[i].iov_len;

src/samples/MQTTClient_subscribe.c

@@ -88,6 +88,7 @@ int main(int argc, char* argv[])
         ch = getchar();
     } while(ch!='Q' && ch != 'q');
 
+    MQTTClient_unsubscribe(client, TOPIC);
     MQTTClient_disconnect(client, 10000);
     MQTTClient_destroy(&client);
     return rc;