diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-28 10:38:02 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-28 17:20:46 +0000 |
| commit | 7354dc67737fdeb105656f5cec055da627bb9c29 (patch) | |
| tree | 7cc2b5f975d5e32eb94cd1344b259ea1b24018d6 /sql/item_inetfunc.cc | |
| parent | 509928718d52a14739fcfb2ebf0e68b4c8e01be5 (diff) | |
| download | mariadb-git-7354dc67737fdeb105656f5cec055da627bb9c29.tar.gz | |
MDEV-13384 - misc Windows warnings fixed
Diffstat (limited to 'sql/item_inetfunc.cc')
| -rw-r--r-- | sql/item_inetfunc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_inetfunc.cc b/sql/item_inetfunc.cc index 6a09747fa1a..7f3ec3829f4 100644 --- a/sql/item_inetfunc.cc +++ b/sql/item_inetfunc.cc @@ -211,7 +211,7 @@ String *Item_func_inet_str_base::val_str_ascii(String *buffer) IPv4-part differently on different platforms. */ -static bool str_to_ipv4(const char *str, int str_length, in_addr *ipv4_address) +static bool str_to_ipv4(const char *str, size_t str_length, in_addr *ipv4_address) { if (str_length < 7) { @@ -236,7 +236,7 @@ static bool str_to_ipv4(const char *str, int str_length, in_addr *ipv4_address) int dot_count= 0; char c= 0; - while (((p - str) < str_length) && *p) + while (((p - str) < (int)str_length) && *p) { c= *p++; @@ -493,7 +493,7 @@ static bool str_to_ipv6(const char *str, int str_length, in6_addr *ipv6_address) return false; } - int bytes_to_move= dst - gap_ptr; + int bytes_to_move= (int)(dst - gap_ptr); for (int i= 1; i <= bytes_to_move; ++i) { |