[PATCH 1/2] ref-filter: mark a file-local symbol as static

[PATCH 1/2] ref-filter: mark a file-local symbol as static

[Ramsay Jones]

Commit fcfba37337 ('ref-filter: make "--contains <id>" less chatty if
<id> is invalid', 2018-02-23) added the add_str_to_commit_list()
function, which causes sparse to issue a "... not declared. Should it
be static?" warning for that symbol.

In order to suppress the warning, mark that function as static.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---
 ref-filter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ref-filter.c b/ref-filter.c
index f375e7670..69bf7b587 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -2000,7 +2000,7 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata)
 	free(to_clear);
 }
 
-int add_str_to_commit_list(struct string_list_item *item, void *commit_list)
+static int add_str_to_commit_list(struct string_list_item *item, void *commit_list)
 {
 	struct object_id oid;
 	struct commit *commit;
-- 
2.16.0

Re: [PATCH 1/2] ref-filter: mark a file-local symbol as static

[Jonathan Nieder]

Hi,

Ramsay Jones wrote:

> Commit fcfba37337 ('ref-filter: make "--contains <id>" less chatty if
> <id> is invalid', 2018-02-23) added the add_str_to_commit_list()
> function, which causes sparse to issue a "... not declared. Should it
> be static?" warning for that symbol.

Thanks for catching it!

> In order to suppress the warning, mark that function as static.

Isn't this closer to

	Indeed, the function is only used in this one compilation
	unit. Mark it static.

?  In other words, sparse's warning is accurate, and this is not about
trying to quiet a false positive but about addressing a true positive.

> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
>  ref-filter.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Thanks,
Jonathan

Re: [PATCH 1/2] ref-filter: mark a file-local symbol as static

[Ramsay Jones]

On 02/03/18 03:59, Jonathan Nieder wrote:
> Hi,
> 
> Ramsay Jones wrote:
> 
>> Commit fcfba37337 ('ref-filter: make "--contains <id>" less chatty if
>> <id> is invalid', 2018-02-23) added the add_str_to_commit_list()
>> function, which causes sparse to issue a "... not declared. Should it
>> be static?" warning for that symbol.
> 
> Thanks for catching it!
> 
>> In order to suppress the warning, mark that function as static.
> 
> Isn't this closer to
> 
> 	Indeed, the function is only used in this one compilation
> 	unit. Mark it static.
> 
> ?  In other words, sparse's warning is accurate, and this is not about
> trying to quiet a false positive but about addressing a true positive.

I thought that was implied by the commit subject line. :-D

However, it certainly doesn't hurt to be more explicit.

Junio, do you want me to re-roll, or would you mind tweaking the
commit message while queueing?

Thanks!

ATB,
Ramsay Jones

Re: [PATCH 1/2] ref-filter: mark a file-local symbol as static

[Junio C Hamano]

Ramsay Jones <ramsay@ramsayjones.plus.com> writes:

> Junio, do you want me to re-roll, or would you mind tweaking the
> commit message while queueing?

Perfect timing ;-)  I was about to get to these two patches.  Here
is what is queued.

commit 2d7cb07e3718d0af6547e2abb35f9cff9b10c1f5
Author: Ramsay Jones <ramsay@ramsayjones.plus.com>
Date:   Fri Mar 2 02:54:02 2018 +0000

    ref-filter: mark a file-local symbol as static
    
    Commit fcfba37337 ('ref-filter: make "--contains <id>" less chatty if
    <id> is invalid', 2018-02-23) added the add_str_to_commit_list()
    function, which causes sparse to issue a "... not declared. Should it
    be static?" warning for that symbol.
    
    Indeed, the function is only used in this one compilation unit. Mark
    it static.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ref-filter.c b/ref-filter.c
index aa282a27f4..ed993d32d8 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -2000,7 +2000,7 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata)
 	free(to_clear);
 }
 
-int add_str_to_commit_list(struct string_list_item *item, void *commit_list)
+static int add_str_to_commit_list(struct string_list_item *item, void *commit_list)
 {
 	struct object_id oid;
 	struct commit *commit;

Re: [PATCH 1/2] ref-filter: mark a file-local symbol as static

[Ramsay Jones]

On 02/03/18 17:19, Junio C Hamano wrote:
> Ramsay Jones <ramsay@ramsayjones.plus.com> writes:
> 
>> Junio, do you want me to re-roll, or would you mind tweaking the
>> commit message while queueing?
> 
> Perfect timing ;-)  I was about to get to these two patches.  Here
> is what is queued.

Thanks!

ATB,
Ramsay Jones

> commit 2d7cb07e3718d0af6547e2abb35f9cff9b10c1f5
> Author: Ramsay Jones <ramsay@ramsayjones.plus.com>
> Date:   Fri Mar 2 02:54:02 2018 +0000
> 
>     ref-filter: mark a file-local symbol as static
>     
>     Commit fcfba37337 ('ref-filter: make "--contains <id>" less chatty if
>     <id> is invalid', 2018-02-23) added the add_str_to_commit_list()
>     function, which causes sparse to issue a "... not declared. Should it
>     be static?" warning for that symbol.
>     
>     Indeed, the function is only used in this one compilation unit. Mark
>     it static.
>     
>     Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
>     Signed-off-by: Junio C Hamano <gitster@pobox.com>
> 
> diff --git a/ref-filter.c b/ref-filter.c
> index aa282a27f4..ed993d32d8 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -2000,7 +2000,7 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata)
>  	free(to_clear);
>  }
>  
> -int add_str_to_commit_list(struct string_list_item *item, void *commit_list)
> +static int add_str_to_commit_list(struct string_list_item *item, void *commit_list)
>  {
>  	struct object_id oid;
>  	struct commit *commit;
> 
>