From: "Đoàn Trần Công Danh" <congdanhqx@gmail.com> To: git@vger.kernel.org Cc: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>, "Ramsay Jones" <ramsay@ramsayjones.plus.com>, "Johannes Schindelin" <Johannes.Schindelin@gmx.de>, "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net> Subject: [PATCH v3 4/4] progress.c: silence cgcc suggestion about internal linkage Date: Mon, 27 Apr 2020 21:22:37 +0700 [thread overview] Message-ID: <d66d9aa677944205cdd5af77192c35ec929692ea.1587996766.git.congdanhqx@gmail.com> (raw) In-Reply-To: <cover.1587996765.git.congdanhqx@gmail.com> Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> --- Notes: Unify all declaration together and keep them under an ifdef. With the hope that no other static analysis tools complain. progress.c | 2 +- progress.h | 8 ++++++++ t/helper/test-progress.c | 9 +-------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/progress.c b/progress.c index 19805ac646..75633e9c5e 100644 --- a/progress.c +++ b/progress.c @@ -8,6 +8,7 @@ * published by the Free Software Foundation. */ +#define GIT_TEST_PROGRESS_ONLY #include "cache.h" #include "gettext.h" #include "progress.h" @@ -52,7 +53,6 @@ static volatile sig_atomic_t progress_update; */ int progress_testing; uint64_t progress_test_ns = 0; -void progress_test_force_update(void); /* To silence -Wmissing-prototypes */ void progress_test_force_update(void) { progress_update = 1; diff --git a/progress.h b/progress.h index 847338911f..f1913acf73 100644 --- a/progress.h +++ b/progress.h @@ -3,6 +3,14 @@ struct progress; +#ifdef GIT_TEST_PROGRESS_ONLY + +extern int progress_testing; +extern uint64_t progress_test_ns; +void progress_test_force_update(void); + +#endif + void display_throughput(struct progress *progress, uint64_t total); void display_progress(struct progress *progress, uint64_t n); struct progress *start_progress(const char *title, uint64_t total); diff --git a/t/helper/test-progress.c b/t/helper/test-progress.c index 42b96cb103..5d05cbe789 100644 --- a/t/helper/test-progress.c +++ b/t/helper/test-progress.c @@ -13,20 +13,13 @@ * * See 't0500-progress-display.sh' for examples. */ +#define GIT_TEST_PROGRESS_ONLY #include "test-tool.h" #include "gettext.h" #include "parse-options.h" #include "progress.h" #include "strbuf.h" -/* - * These are defined in 'progress.c', but are not exposed in 'progress.h', - * because they are exclusively for testing. - */ -extern int progress_testing; -extern uint64_t progress_test_ns; -void progress_test_force_update(void); - int cmd__progress(int argc, const char **argv) { int total = 0; -- 2.26.2.526.g744177e7f7
next prev parent reply other threads:[~2020-04-27 14:23 UTC|newest] Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-23 13:47 [PATCH 0/4] fix make sparse warning Đoàn Trần Công Danh 2020-04-23 13:47 ` [PATCH 1/4] C: s/0/NULL/ for pointer type Đoàn Trần Công Danh 2020-04-24 0:39 ` Ramsay Jones 2020-04-24 0:54 ` Junio C Hamano 2020-04-24 1:09 ` Danh Doan 2020-04-24 1:54 ` Junio C Hamano 2020-05-14 21:37 ` Luc Van Oostenryck 2020-04-23 13:47 ` [PATCH 2/4] compat/regex: silence `make sparse` warning Đoàn Trần Công Danh 2020-04-24 0:51 ` Ramsay Jones 2020-04-24 1:04 ` Danh Doan 2020-04-23 13:47 ` [PATCH 3/4] graph.c: limit linkage of internal variable Đoàn Trần Công Danh 2020-04-24 0:52 ` Ramsay Jones 2020-04-23 13:47 ` [PATCH 4/4] progress.c: silence cgcc suggestion about internal linkage Đoàn Trần Công Danh 2020-04-24 0:58 ` Ramsay Jones 2020-04-24 5:54 ` Jeff King 2020-04-23 13:47 ` [PATCH 5/4] fmt-merge-msg.c: fix `make sparse` on next Đoàn Trần Công Danh 2020-04-23 23:10 ` [PATCH 0/4] fix make sparse warning Ramsay Jones 2020-04-23 23:58 ` Danh Doan 2020-04-24 16:38 ` Ramsay Jones 2020-04-24 15:12 ` [PATCH v2 0/4] Fix Sparse Warning Đoàn Trần Công Danh 2020-04-24 15:12 ` [PATCH v2 1/4] test-parse-pathspec-file.c: s/0/NULL/ for pointer type Đoàn Trần Công Danh 2020-04-24 15:12 ` [PATCH v2 2/4] compat/regex: include alloca.h before undef it Đoàn Trần Công Danh 2020-04-24 16:56 ` Ramsay Jones 2020-04-24 17:09 ` Danh Doan 2020-04-24 18:29 ` Ramsay Jones 2020-04-24 22:34 ` Danh Doan 2020-04-25 20:28 ` Ramsay Jones 2020-04-26 0:54 ` Danh Doan 2020-04-26 1:10 ` Danh Doan 2020-04-26 16:17 ` Ramsay Jones 2020-04-26 19:38 ` Ramsay Jones 2020-04-26 22:37 ` Junio C Hamano 2020-04-27 1:08 ` Danh Doan 2020-04-27 16:28 ` Ramsay Jones 2020-04-27 16:46 ` Danh Doan 2020-04-27 17:21 ` Ramsay Jones 2020-04-24 15:12 ` [PATCH v2 3/4] graph.c: limit linkage of internal variable Đoàn Trần Công Danh 2020-04-24 15:12 ` [PATCH v2 4/4] progress.c: silence cgcc suggestion about internal linkage Đoàn Trần Công Danh 2020-04-24 16:40 ` [PATCH v2 0/4] Fix Sparse Warning Ramsay Jones 2020-04-25 13:13 ` [PATCH 0/4] fix make sparse warning Johannes Schindelin 2020-04-26 3:32 ` Danh Doan 2020-04-26 16:24 ` Ramsay Jones 2020-05-01 20:02 ` Johannes Schindelin 2020-04-27 14:22 ` [PATCH v3 0/4] Partial fix `make sparse` Đoàn Trần Công Danh 2020-04-27 14:22 ` [PATCH v3 1/4] test-parse-pathspec-file.c: s/0/NULL/ for pointer type Đoàn Trần Công Danh 2020-04-27 14:22 ` [PATCH v3 2/4] compat/regex: move stdlib.h up in inclusion chain Đoàn Trần Công Danh 2020-04-27 16:41 ` Ramsay Jones 2020-04-27 14:22 ` [PATCH v3 3/4] graph.c: limit linkage of internal variable Đoàn Trần Công Danh 2020-04-27 14:22 ` Đoàn Trần Công Danh [this message] 2020-05-01 20:09 ` [PATCH v3 4/4] progress.c: silence cgcc suggestion about internal linkage Johannes Schindelin 2020-04-27 16:35 ` [PATCH v3 0/4] Partial fix `make sparse` Ramsay Jones
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 * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=d66d9aa677944205cdd5af77192c35ec929692ea.1587996766.git.congdanhqx@gmail.com \ --to=congdanhqx@gmail.com \ --cc=Johannes.Schindelin@gmx.de \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=peff@peff.net \ --cc=ramsay@ramsayjones.plus.com \ --subject='Re: [PATCH v3 4/4] progress.c: silence cgcc suggestion about internal linkage' \ /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
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 NNTP newsgroup(s).