From: Jan Moskyto Matejka <mq@ucw.cz>
Date: Fri, 19 Feb 2016 14:51:16 +0000 (+0100)
Subject: Hash: typecast error fix
X-Git-Tag: v2.0.0-pre0~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a815d62d5902fb84c28c77726dbe94fc7528bf36;p=thirdparty%2Fbird.git

Hash: typecast error fix
---

diff --git a/lib/hash.h b/lib/hash.h
index f4a953a31..b06414661 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -184,7 +184,8 @@ mem_hash(void *p, int s)
   const char *pp = p;
   const u64 multiplier = 0xb38bc09a61202731ULL;
   u64 value = 0x001047d54778bcafULL;
-  for (int i=0;i<s;i++)
+  int i;
+  for (i=0;i<s;i++)
     value = value*multiplier + pp[i];
 
   return ((value >> 32) ^ (value & 0xffffffff));
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 9777a2d2e..7d9605c26 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -946,7 +946,7 @@ rta_alloc_hash(void)
 static inline uint
 rta_hash(rta *a)
 {
-  return mem_hash(a + offsetof(rta, src), sizeof(rta) - offsetof(rta, src)) ^
+  return mem_hash(((void *)a) + offsetof(rta, src), sizeof(rta) - offsetof(rta, src)) ^
 	 mpnh_hash(a->nexthops) ^ ea_hash(a->eattrs);
 }