diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-05-13 12:19:20 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-05-13 12:19:20 -0700 |
commit | 2e72299ec66c1963836f544fe8485853807b8f28 (patch) | |
tree | 45f26c5adfc79f7068f90a23e24a938aaeb3f15d | |
parent | Merge branch 'jk/ci-only-on-selected-branches' (diff) | |
parent | bloom: fix `make sparse` warning (diff) | |
download | tgif-2e72299ec66c1963836f544fe8485853807b8f28.tar.xz |
Merge branch 'dd/bloom-sparse-fix'
Code clean-up.
* dd/bloom-sparse-fix:
bloom: fix `make sparse` warning
-rw-r--r-- | bloom.c | 4 | ||||
-rw-r--r-- | bloom.h | 2 | ||||
-rw-r--r-- | t/helper/test-bloom.c | 2 | ||||
-rwxr-xr-x | t/t0095-bloom.sh | 2 | ||||
-rwxr-xr-x | t/t4216-log-bloom.sh | 2 |
5 files changed, 6 insertions, 6 deletions
@@ -9,7 +9,7 @@ define_commit_slab(bloom_filter_slab, struct bloom_filter); -struct bloom_filter_slab bloom_filters; +static struct bloom_filter_slab bloom_filters; struct pathmap_hash_entry { struct hashmap_entry entry; @@ -273,4 +273,4 @@ int bloom_filter_contains(const struct bloom_filter *filter, } return 1; -}
\ No newline at end of file +} @@ -87,4 +87,4 @@ int bloom_filter_contains(const struct bloom_filter *filter, const struct bloom_key *key, const struct bloom_filter_settings *settings); -#endif
\ No newline at end of file +#endif diff --git a/t/helper/test-bloom.c b/t/helper/test-bloom.c index 77eb27adac..456f5ea7f9 100644 --- a/t/helper/test-bloom.c +++ b/t/helper/test-bloom.c @@ -3,7 +3,7 @@ #include "test-tool.h" #include "commit.h" -struct bloom_filter_settings settings = DEFAULT_BLOOM_FILTER_SETTINGS; +static struct bloom_filter_settings settings = DEFAULT_BLOOM_FILTER_SETTINGS; static void add_string_to_filter(const char *data, struct bloom_filter *filter) { struct bloom_key key; diff --git a/t/t0095-bloom.sh b/t/t0095-bloom.sh index 8f9eef116d..809ec7b0b8 100755 --- a/t/t0095-bloom.sh +++ b/t/t0095-bloom.sh @@ -114,4 +114,4 @@ test_expect_success EXPENSIVE 'get bloom filter for commit with 513 changes' ' test_cmp expect actual ' -test_done
\ No newline at end of file +test_done diff --git a/t/t4216-log-bloom.sh b/t/t4216-log-bloom.sh index c7011f33e2..21b68dd6c8 100755 --- a/t/t4216-log-bloom.sh +++ b/t/t4216-log-bloom.sh @@ -152,4 +152,4 @@ test_expect_success 'Use Bloom filters if they exist in the latest but not all c test_bloom_filters_used_when_some_filters_are_missing "-- A/B" ' -test_done
\ No newline at end of file +test_done |