diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-02-19 16:57:39 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-02-19 21:47:04 +0000 |
| commit | eb9d2b00922c109c932eb339b2b2c92f04df06dd (patch) | |
| tree | 7051b55e734dec18eb1f572e6d45a90cd20ea4cc /wsutil | |
| parent | 472687b5e1554fd0b7051eb2ee17ca03b9e6211c (diff) | |
Fix implicit conversion from 64 to 32 bits
Change size_t to something that is guaranteed to fit in a socklen_t.
Fix incorrect AC_DEFINE too.
Change-Id: I710f32fb1e5bd4f51843d380aa8ed8b6acd98c02
Reviewed-on: https://code.wireshark.org/review/14009
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/inet_addr-int.h | 4 | ||||
| -rw-r--r-- | wsutil/inet_addr.c | 4 | ||||
| -rw-r--r-- | wsutil/inet_addr.h | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/wsutil/inet_addr-int.h b/wsutil/inet_addr-int.h index 631787dfca..c71b1cd4ad 100644 --- a/wsutil/inet_addr-int.h +++ b/wsutil/inet_addr-int.h @@ -28,6 +28,10 @@ #include <arpa/inet.h> #endif +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif + #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> /* needed to define AF_ values on UNIX */ #endif diff --git a/wsutil/inet_addr.c b/wsutil/inet_addr.c index b5f4cea62e..d56c955def 100644 --- a/wsutil/inet_addr.c +++ b/wsutil/inet_addr.c @@ -36,7 +36,7 @@ _inet_pton(int af, const gchar *src, gpointer dst) } const gchar * -ws_inet_ntop4(gconstpointer src, gchar *dst, gsize dst_size) +ws_inet_ntop4(gconstpointer src, gchar *dst, guint dst_size) { return inet_ntop(AF_INET, src, dst, dst_size); } @@ -48,7 +48,7 @@ ws_inet_pton4(const gchar *src, guint32 *dst) } const gchar * -ws_inet_ntop6(gconstpointer src, gchar *dst, gsize dst_size) +ws_inet_ntop6(gconstpointer src, gchar *dst, guint dst_size) { return inet_ntop(AF_INET6, src, dst, dst_size); } diff --git a/wsutil/inet_addr.h b/wsutil/inet_addr.h index 330f6e0d88..6cf43a1cd9 100644 --- a/wsutil/inet_addr.h +++ b/wsutil/inet_addr.h @@ -29,13 +29,13 @@ #include <epan/ipv6.h> WS_DLL_PUBLIC const gchar * -ws_inet_ntop4(gconstpointer src, gchar *dst, gsize dst_size); +ws_inet_ntop4(gconstpointer src, gchar *dst, guint dst_size); WS_DLL_PUBLIC gboolean ws_inet_pton4(const gchar *src, guint32 *dst); WS_DLL_PUBLIC const gchar * -ws_inet_ntop6(gconstpointer src, gchar *dst, gsize dst_size); +ws_inet_ntop6(gconstpointer src, gchar *dst, guint dst_size); WS_DLL_PUBLIC gboolean ws_inet_pton6(const gchar *src, struct e_in6_addr *dst); |