aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-isakmp.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-01-22 14:00:11 -0800
committerGuy Harris <guy@alum.mit.edu>2016-01-22 22:00:41 +0000
commite8d0d3763a7d480ff905825a1cf847fa47482c87 (patch)
treead04853767d84fae37ed8b747f83c67fbdb5deea /epan/dissectors/packet-isakmp.c
parentf78d7616b568782952a45cd2b8b08c74fe43a614 (diff)
Try to fix compiler warnings.
Parenthesize differently and, while we're at it, don't use the useless gsize data type - C has had size_t since C89, use it. gsize's only purpose is to use in APIs defined to take gsize arguments. Change-Id: I7d68273e7e0f0e71947d3505cb283bfa216fce03 Reviewed-on: https://code.wireshark.org/review/13488 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-isakmp.c')
-rw-r--r--epan/dissectors/packet-isakmp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index 40206a7eef..983f7913f3 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -5154,17 +5154,17 @@ isakmp_equal_func(gconstpointer ic1, gconstpointer ic2) {
static guint ikev2_key_hash_func(gconstpointer k) {
const ikev2_uat_data_key_t *key = (const ikev2_uat_data_key_t*)k;
guint hash, *key_segs;
- gsize key_segcount, i;
+ size_t key_segcount, i;
hash = 0;
/* XOR our icookie down to the size of a guint */
- key_segcount = (gsize)(key->spii_len) / sizeof(guint);
+ key_segcount = ((size_t)key->spii_len) / sizeof(guint);
key_segs = (guint *)key->spii;
for (i = 0; i < key_segcount; i++) {
hash ^= key_segs[i];
}
- key_segcount = (gsize)(key->spir_len) / sizeof(guint);
+ key_segcount = ((size_t)key->spir_len) / sizeof(guint);
key_segs = (guint *)key->spir;
for (i = 0; i < key_segcount; i++) {
hash ^= key_segs[i];