X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fhmap.h;h=2867bfa0b1ffa3f9a8c8b21dca63632a0e9e81e4;hb=6e5877ecdacf66905afd2481d0025d3fd7d9132f;hp=ed2d78d34daf8adf286975c52fdceb6c6f72c5dd;hpb=43d1478b1690ecd0ef6b63890bc13438c1914e47;p=openvswitch diff --git a/lib/hmap.h b/lib/hmap.h index ed2d78d3..2867bfa0 100644 --- a/lib/hmap.h +++ b/lib/hmap.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -130,6 +130,8 @@ static inline struct hmap_node *hmap_first_in_bucket(const struct hmap *, size_t hash); static inline struct hmap_node *hmap_next_in_bucket(const struct hmap_node *); +bool hmap_contains(const struct hmap *, const struct hmap_node *); + /* Iteration. */ /* Iterates through every node in HMAP. */ @@ -245,7 +247,7 @@ hmap_next_with_hash__(const struct hmap_node *node, size_t hash) while (node != NULL && node->hash != hash) { node = node->next; } - return (struct hmap_node *) node; + return CONST_CAST(struct hmap_node *, node); } /* Returns the first node in 'hmap' with the given 'hash', or a null pointer if