Skip to content

Commit 2e72299

Browse files
committed
Merge branch 'dd/bloom-sparse-fix'
Code clean-up. * dd/bloom-sparse-fix: bloom: fix `make sparse` warning
2 parents dd4a287 + 066b70a commit 2e72299

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

bloom.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
define_commit_slab(bloom_filter_slab, struct bloom_filter);
1111

12-
struct bloom_filter_slab bloom_filters;
12+
static struct bloom_filter_slab bloom_filters;
1313

1414
struct pathmap_hash_entry {
1515
struct hashmap_entry entry;
@@ -273,4 +273,4 @@ int bloom_filter_contains(const struct bloom_filter *filter,
273273
}
274274

275275
return 1;
276-
}
276+
}

bloom.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@ int bloom_filter_contains(const struct bloom_filter *filter,
8787
const struct bloom_key *key,
8888
const struct bloom_filter_settings *settings);
8989

90-
#endif
90+
#endif

t/helper/test-bloom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "test-tool.h"
44
#include "commit.h"
55

6-
struct bloom_filter_settings settings = DEFAULT_BLOOM_FILTER_SETTINGS;
6+
static struct bloom_filter_settings settings = DEFAULT_BLOOM_FILTER_SETTINGS;
77

88
static void add_string_to_filter(const char *data, struct bloom_filter *filter) {
99
struct bloom_key key;

t/t0095-bloom.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,4 @@ test_expect_success EXPENSIVE 'get bloom filter for commit with 513 changes' '
114114
test_cmp expect actual
115115
'
116116

117-
test_done
117+
test_done

t/t4216-log-bloom.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,4 +152,4 @@ test_expect_success 'Use Bloom filters if they exist in the latest but not all c
152152
test_bloom_filters_used_when_some_filters_are_missing "-- A/B"
153153
'
154154

155-
test_done
155+
test_done

0 commit comments

Comments
 (0)