From: Ramsay Jones <ramsay@ramsayjones.plus.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"Jeff King" <peff@peff.net>,
"GIT Mailing-list" <git@vger.kernel.org>
Subject: Subject: [PATCH] bloom: fix `make sparse` warning
Date: Fri, 8 May 2020 00:51:02 +0100 [thread overview]
Message-ID: <01ff8217-bd38-e7e4-58b1-81645ba9282a@ramsayjones.plus.com> (raw)
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
* We need a `final_new_line` to make our source code as text file, per
POSIX and C specification.
* `bloom_filters` should be limited to interal linkage only
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---
Hi Junio,
This patch by Danh seems to have slipped through the cracks, so I decided
to pass it along. The original version of this patch (which I don't seem
to be able to find) clashed with one of Jeff's series [1], because they
both fixed up a 'No newline at end of file' issue with test-bloom.c.
Also as Danh points out [2], the original patch didn't fix up the test
files.
Anyway, this fixes up some 8 sparse warnings on 'master' and 'next':
$ diff sp-out sp-out1
17d16
< bloom.h:90:6: warning: no newline at end of file
20,22d18
< bloom.c:276:1: warning: no newline at end of file
< bloom.h:90:6: warning: no newline at end of file
< bloom.c:12:26: warning: symbol 'bloom_filters' was not declared. Should it be static?
33d28
< bloom.h:90:6: warning: no newline at end of file
163d157
< bloom.h:90:6: warning: no newline at end of file
366,367d359
< ./bloom.h:90:6: warning: no newline at end of file
< t/helper/test-bloom.c:6:30: warning: symbol 'settings' was not declared. Should it be static?
$
... along with a further warning on 'pu', due to the 'ds/line-log-on-bloom'
branch adding another '#include "bloom.h"'.
[1] https://lore.kernel.org/git/20200423205851.GA1633985@coredump.intra.peff.net/
[2] https://lore.kernel.org/git/20200424010047.GD1949@danh.dev/
ATB,
Ramsay Jones
bloom.c | 4 ++--
bloom.h | 2 +-
t/helper/test-bloom.c | 2 +-
t/t0095-bloom.sh | 2 +-
t/t4216-log-bloom.sh | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bloom.c b/bloom.c
index dd9bab9bbd..ee025e0c61 100644
--- a/bloom.c
+++ b/bloom.c
@@ -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
+}
diff --git a/bloom.h b/bloom.h
index b935186425..e0e59e0754 100644
--- a/bloom.h
+++ b/bloom.h
@@ -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
--
2.26.2
next reply other threads:[~2020-05-07 23:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 23:51 Ramsay Jones [this message]
2020-05-08 12:15 ` Subject: [PATCH] bloom: fix `make sparse` warning Derrick Stolee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=01ff8217-bd38-e7e4-58b1-81645ba9282a@ramsayjones.plus.com \
--to=ramsay@ramsayjones.plus.com \
--cc=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).