From ca20c17a6742464bcf861fe856a4caddf2bfeab2 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Wed, 24 Dec 2008 14:02:50 +0100 Subject: [PATCH] Rename bloom_test_and_insert() to bloom_insert(). In order to keep statistics up to date, we always need to do the test. --- bloom.c | 8 ++++---- bloom.h | 2 +- create.c | 6 ++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/bloom.c b/bloom.c index 2aff535..b072ad1 100644 --- a/bloom.c +++ b/bloom.c @@ -96,7 +96,7 @@ static int test_and_set_bit(uint64_t bitnum, struct bloom *b) return ret; } -int bloom_test_and_insert(const uint8_t *data, size_t len, struct bloom *b) +int bloom_insert(const uint8_t *data, size_t len, struct bloom *b) { int i, ret = 0; uint32_t h = 0xb11924e1; /* some arbitrary value */ @@ -153,11 +153,11 @@ struct bloom *bloom_new(unsigned order, unsigned num_hash_functions) #ifdef TEST_BLOOM -int bloom_test_and_insert_string(const char *str, struct bloom *b) +int bloom_insert_string(const char *str, struct bloom *b) { uint32_t len = strlen(str); - return bloom_test_and_insert((const uint8_t *)str, len, b); + return bloom_insert((const uint8_t *)str, len, b); } void add_stdin(struct bloom *b) @@ -171,7 +171,7 @@ void add_stdin(struct bloom *b) continue; if (buf[len - 1] == '\n') buf[len - 1] = '\0'; - if (bloom_test_and_insert_string(buf, b)) + if (bloom_insert_string(buf, b)) false_positives++; } INFO_LOG("filter contains %llu entries\n", b->num_entries); diff --git a/bloom.h b/bloom.h index 5121606..9e71c6c 100644 --- a/bloom.h +++ b/bloom.h @@ -22,4 +22,4 @@ struct bloom { struct bloom *bloom_new(unsigned order, unsigned num_hash_functions); void bloom_free(struct bloom *b); -int bloom_test_and_insert(const uint8_t *data, size_t len, struct bloom *b); +int bloom_insert(const uint8_t *data, size_t len, struct bloom *b); diff --git a/create.c b/create.c index e3f09d4..cd000c2 100644 --- a/create.c +++ b/create.c @@ -56,8 +56,7 @@ static int insert_global_bloom(struct stat64 *s, { if (!consider_bloom(s)) return 0; - return bloom_test_and_insert(buf, GLOBAL_BLOOM_BUF_SIZE, - global_bloom_filter); + return bloom_insert(buf, GLOBAL_BLOOM_BUF_SIZE, global_bloom_filter); } static int insert_user_bloom(struct stat64 *s, @@ -65,8 +64,7 @@ static int insert_user_bloom(struct stat64 *s, { if (!consider_bloom(s)) return 0; - return bloom_test_and_insert(buf, USER_BLOOM_BUF_SIZE, - user_bloom_filter); + return bloom_insert(buf, USER_BLOOM_BUF_SIZE, user_bloom_filter); } static int add_directory(char *dirname, uint64_t *dir_num, uint64_t *parent_dir_num, -- 2.39.5