diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-06 12:55:58 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-06 12:55:58 +0000 |
| commit | 6c279ad6a71c63cb595fde7c951aadb31c3dbebc (patch) | |
| tree | 3603f88e1b3bd1e622edb182cccd882dd31ddc8a /sql-common/mysql_async.c | |
| parent | f271100836d8a91a775894ec36b869a66a3145e5 (diff) | |
| download | mariadb-git-6c279ad6a71c63cb595fde7c951aadb31c3dbebc.tar.gz | |
MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from 'size_t' to 'type', possible loss of data)
Handle string length as size_t, consistently (almost always:))
Change function prototypes to accept size_t, where in the past
ulong or uint were used. change local/member variables to size_t
when appropriate.
This fix excludes rocksdb, spider,spider, sphinx and connect for now.
Diffstat (limited to 'sql-common/mysql_async.c')
| -rw-r--r-- | sql-common/mysql_async.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql-common/mysql_async.c b/sql-common/mysql_async.c index 1bac16edd1e..a19955c49de 100644 --- a/sql-common/mysql_async.c +++ b/sql-common/mysql_async.c @@ -135,7 +135,7 @@ my_recv_async(struct mysql_async_context *b, my_socket fd, for (;;) { - res= recv(fd, buf, size, IF_WIN(0, MSG_DONTWAIT)); + res= recv(fd, buf, (int)size, IF_WIN(0, MSG_DONTWAIT)); if (res >= 0 || IS_BLOCKING_ERROR()) return res; b->events_to_wait_for= MYSQL_WAIT_READ; @@ -163,7 +163,7 @@ my_send_async(struct mysql_async_context *b, my_socket fd, for (;;) { - res= send(fd, buf, size, IF_WIN(0, MSG_DONTWAIT)); + res= send(fd, buf, (int)size, IF_WIN(0, MSG_DONTWAIT)); if (res >= 0 || IS_BLOCKING_ERROR()) return res; b->events_to_wait_for= MYSQL_WAIT_WRITE; |