diff options
author | Lennart Poettering <lennart@poettering.net> | 2015-06-18 18:29:11 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2015-06-18 18:29:11 +0200 |
commit | 39765e5f92510ae5d5aa1be39e77d2c5cf2e94a6 (patch) | |
tree | 3b2a1c67f2a5c3bada9b902fa9997f2f9c485620 /src/basic | |
parent | 478b6f86a68184146b99cfc6dda746b447f115bc (diff) | |
parent | 8f8a5213a9ad89f1ebab6efb19377ed9df512ee6 (diff) |
Merge pull request #289 from michich/hashmap-small-cleanup
a tiny hashmap cleanup
Diffstat (limited to 'src/basic')
-rw-r--r-- | src/basic/hashmap.c | 2 | ||||
-rw-r--r-- | src/basic/hashmap.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c index 0ee2f3bd31..e5f05f36f8 100644 --- a/src/basic/hashmap.c +++ b/src/basic/hashmap.c @@ -1798,8 +1798,6 @@ void *ordered_hashmap_next(OrderedHashmap *h, const void *key) { struct ordered_hashmap_entry *e; unsigned hash, idx; - assert(key); - if (!h) return NULL; diff --git a/src/basic/hashmap.h b/src/basic/hashmap.h index 5723f09ca9..2af23024de 100644 --- a/src/basic/hashmap.h +++ b/src/basic/hashmap.h @@ -65,7 +65,6 @@ typedef struct { } Iterator; #define _IDX_ITERATOR_FIRST (UINT_MAX - 1) -#define _IDX_ITERATOR_NIL (UINT_MAX) #define ITERATOR_FIRST ((Iterator) { .idx = _IDX_ITERATOR_FIRST, .next_key = NULL }) typedef unsigned long (*hash_func_t)(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]); |