Improve IEC binary and SI decimal prefix handling

[fio.git] / lib / bloom.c

diff --git a/lib/bloom.c b/lib/bloom.c
index c2e6c11f2e1444020ae18225f8277938827c37f9..fa38db9551469f2eaaef29b5bce51bee2e71e487 100644 (file)
--- a/lib/bloom.c
+++ b/lib/bloom.c
@@ -60,8 +60,6 @@ static struct bloom_hash hashes[] = {
 
 #define N_HASHES       5
 
-#define MIN_ENTRIES    1073741824UL
-
 struct bloom *bloom_new(uint64_t entries)
 {
        struct bloom *b;
@@ -72,7 +70,6 @@ struct bloom *bloom_new(uint64_t entries)
        b = malloc(sizeof(*b));
        b->nentries = entries;
        no_uints = (entries + BITS_PER_INDEX - 1) / BITS_PER_INDEX;
-       no_uints = max((unsigned long) no_uints, MIN_ENTRIES);
        b->map = calloc(no_uints, sizeof(uint32_t));
        if (!b->map) {
                free(b);
@@ -118,7 +115,8 @@ bool bloom_set(struct bloom *b, uint32_t *data, unsigned int nwords)
        return __bloom_check(b, data, nwords * sizeof(uint32_t), true);
 }
 
-bool bloom_set_string(struct bloom *b, const char *data, unsigned int len)
+bool bloom_string(struct bloom *b, const char *data, unsigned int len,
+                 bool set)
 {
-       return __bloom_check(b, data, len, true);
+       return __bloom_check(b, data, len, set);
 }