git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
[sliver-openvswitch.git]
/
lib
/
hmap.h
diff --git
a/lib/hmap.h
b/lib/hmap.h
index
ed2d78d
..
2867bfa
100644
(file)
--- 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.
*
* 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 *);
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. */
/* 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;
}
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
}
/* Returns the first node in 'hmap' with the given 'hash', or a null pointer if