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 commit 'b5d57fc87925cb3c029de19d0a94de5ca07ae28e'
[sliver-openvswitch.git]
/
lib
/
hmap.h
diff --git
a/lib/hmap.h
b/lib/hmap.h
index
9d07e84
..
9b6d8c7
100644
(file)
--- a/
lib/hmap.h
+++ b/
lib/hmap.h
@@
-65,7
+65,8
@@
struct hmap {
};
/* Initializer for an empty hash map. */
};
/* Initializer for an empty hash map. */
-#define HMAP_INITIALIZER(HMAP) { &(HMAP)->one, NULL, 0, 0 }
+#define HMAP_INITIALIZER(HMAP) \
+ { (struct hmap_node **const) &(HMAP)->one, NULL, 0, 0 }
/* Initialization. */
void hmap_init(struct hmap *);
/* Initialization. */
void hmap_init(struct hmap *);
@@
-247,7
+248,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