diff options
| author | Anders <anders.broman@ericsson.com> | 2015-06-04 16:12:04 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-06-04 15:10:15 +0000 |
| commit | fde38c099f062429dd501ab24efe4917f312b110 (patch) | |
| tree | 36992fad222adaa308ed956fd174748b9a3ea30a /epan | |
| parent | 505d3038fca41575094a91eba93f5b928eb30349 (diff) | |
| download | wireshark-fde38c099f062429dd501ab24efe4917f312b110.tar.gz | |
[MSVC 2015] Try to fix warinings turned errors.
Change-Id: Ife5aba55d6953fbd3874095f2e469a844ca8ef2e
Reviewed-on: https://code.wireshark.org/review/8762
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/proto.c | 2 | ||||
| -rw-r--r-- | epan/stream.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/epan/proto.c b/epan/proto.c index 2c4d22385e..fd95afaf47 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -650,7 +650,7 @@ static void free_GPtrArray_value(gpointer key, gpointer value, gpointer user_data _U_) { GPtrArray *ptrs = (GPtrArray *)value; - gint hfid = (gint)(long)key; + gint hfid = GPOINTER_TO_UINT(key); header_field_info *hfinfo; PROTO_REGISTRAR_GET_NTH(hfid, hfinfo); diff --git a/epan/stream.c b/epan/stream.c index 03ab54a332..bb1bbc9c45 100644 --- a/epan/stream.c +++ b/epan/stream.c @@ -92,7 +92,7 @@ static guint stream_hash_func(gconstpointer k) const stream_key_t *key = (const stream_key_t *)k; /* is_circuit is redundant to the circuit/conversation pointer */ - return ((guint)(unsigned long)key->circ.circuit) ^ key->p2p_dir; + return (GPOINTER_TO_UINT(key->circ.circuit)) ^ key->p2p_dir; } /* compare func */ @@ -238,7 +238,7 @@ typedef struct fragment_key { static guint fragment_hash_func(gconstpointer k) { const fragment_key_t *key = (const fragment_key_t *)k; - return ((guint)(unsigned long)key->stream) + ((guint)key -> framenum) + ((guint)key->offset); + return (GPOINTER_TO_UINT(key->stream)) + ((guint)key -> framenum) + ((guint)key->offset); } /* compare func */ |