X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fhash%2Fhash.h;h=0400e6a3b29bbc4505e707ed5231ed197ad6f22a;hp=1f8ccbf06212e3b3b7b98ce32ee07659c717a8df;hb=a94286219597d8123188aaff0aaa55dba5104a05;hpb=142afe327024262a0eaa0731bcf31def91c146e0

diff --git a/ccan/hash/hash.h b/ccan/hash/hash.h
index 1f8ccbf0..0400e6a3 100644
--- a/ccan/hash/hash.h
+++ b/ccan/hash/hash.h
@@ -1,8 +1,8 @@
 #ifndef CCAN_HASH_H
 #define CCAN_HASH_H
+#include "config.h"
 #include <stdint.h>
 #include <stdlib.h>
-#include "config.h"
 #include <ccan/build_assert/build_assert.h>
 
 /* Stolen mostly from: lookup3.c, by Bob Jenkins, May 2006, Public Domain.
@@ -29,9 +29,10 @@
  * See also: hash64, hash_stable.
  *
  * Example:
- *	#include "hash/hash.h"
+ *	#include <ccan/hash/hash.h>
  *	#include <err.h>
  *	#include <stdio.h>
+ *	#include <string.h>
  *
  *	// Simple demonstration: idential strings will have the same hash, but
  *	// two different strings will probably not.
@@ -74,9 +75,10 @@
  *	hash64_stable
  *
  * Example:
- *	#include "hash/hash.h"
+ *	#include <ccan/hash/hash.h>
  *	#include <err.h>
  *	#include <stdio.h>
+ *	#include <string.h>
  *
  *	int main(int argc, char *argv[])
  *	{
@@ -89,8 +91,8 @@
  *	}
  */
 #define hash_stable(p, num, base)					\
-	(EXPR_BUILD_ASSERT(sizeof(*(p)) == 8 || sizeof(*(p)) == 4	\
-			   || sizeof(*(p)) == 2 || sizeof(*(p)) == 1) +	\
+	(BUILD_ASSERT_OR_ZERO(sizeof(*(p)) == 8 || sizeof(*(p)) == 4	\
+			      || sizeof(*(p)) == 2 || sizeof(*(p)) == 1) + \
 	 sizeof(*(p)) == 8 ? hash_stable_64((p), (num), (base))		\
 	 : sizeof(*(p)) == 4 ? hash_stable_32((p), (num), (base))	\
 	 : sizeof(*(p)) == 2 ? hash_stable_16((p), (num), (base))	\
@@ -159,6 +161,7 @@ static inline uint32_t hash_string(const char *string)
  *	#include <ccan/hash/hash.h>
  *	#include <err.h>
  *	#include <stdio.h>
+ *	#include <string.h>
  *
  *	// Simple demonstration: idential strings will have the same hash, but
  *	// two different strings will probably not.
@@ -204,6 +207,7 @@ static inline uint32_t hash_string(const char *string)
  *	#include <ccan/hash/hash.h>
  *	#include <err.h>
  *	#include <stdio.h>
+ *	#include <string.h>
  *
  *	int main(int argc, char *argv[])
  *	{
@@ -216,8 +220,8 @@ static inline uint32_t hash_string(const char *string)
  *	}
  */
 #define hash64_stable(p, num, base)					\
-	(EXPR_BUILD_ASSERT(sizeof(*(p)) == 8 || sizeof(*(p)) == 4	\
-			   || sizeof(*(p)) == 2 || sizeof(*(p)) == 1) +	\
+	(BUILD_ASSERT_OR_ZERO(sizeof(*(p)) == 8 || sizeof(*(p)) == 4	\
+			      || sizeof(*(p)) == 2 || sizeof(*(p)) == 1) + \
 	 sizeof(*(p)) == 8 ? hash64_stable_64((p), (num), (base))	\
 	 : sizeof(*(p)) == 4 ? hash64_stable_32((p), (num), (base))	\
 	 : sizeof(*(p)) == 2 ? hash64_stable_16((p), (num), (base))	\
@@ -233,8 +237,8 @@ static inline uint32_t hash_string(const char *string)
  * This is either hash() or hash64(), on 32/64 bit long machines.
  */
 #define hashl(p, num, base)						\
-	(EXPR_BUILD_ASSERT(sizeof(long) == sizeof(uint32_t)		\
-			   || sizeof(long) == sizeof(uint64_t)) +	\
+	(BUILD_ASSERT_OR_ZERO(sizeof(long) == sizeof(uint32_t)		\
+			      || sizeof(long) == sizeof(uint64_t)) +	\
 	(sizeof(long) == sizeof(uint64_t)				\
 	 ? hash64((p), (num), (base)) : hash((p), (num), (base))))
 
@@ -263,7 +267,7 @@ uint64_t hash64_stable_8(const void *key, size_t n, uint64_t base);
  * network or saved to disk).
  *
  * Example:
- *	#include "hash/hash.h"
+ *	#include <ccan/hash/hash.h>
  *
  *	// Code to keep track of memory regions.
  *	struct region {
@@ -276,17 +280,17 @@ uint64_t hash64_stable_8(const void *key, size_t n, uint64_t base);
  *
  *	static void add_region(struct region *r)
  *	{
- *		unsigned int h = hash_pointer(r->start);
+ *		unsigned int h = hash_pointer(r->start, 0);
  *
  *		r->chain = region_hash[h];
  *		region_hash[h] = r->chain;
  *	}
  *
- *	static void find_region(const void *start)
+ *	static struct region *find_region(const void *start)
  *	{
  *		struct region *r;
  *
- *		for (r = region_hash[hash_pointer(start)]; r; r = r->chain)
+ *		for (r = region_hash[hash_pointer(start, 0)]; r; r = r->chain)
  *			if (r->start == start)
  *				return r;
  *		return NULL;