[PATCH] sha1_file.c: make parse_sha1_header_extended() static

Ramsay Jones· Apr 16, 2015, 12:25 UTC · lore

commit 9e1f5bc0 ("sha1_file.c: support reading from a loose object of unknown type", 15-04-2015) added a new externally visible function which does not require more than file scope. This causes sparse to issue a warning message about this symbol. In order to suppress the warning, add the static qualifier to the function definition.

[An alternative solution, if this symbol should have external scope, is to add an external declaration for the function to the "cache.h" header file (next to the one for parse_sha1_header()).]

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---

Hi Karthik,

If you need to re-roll your patches in the 'kn/cat-file-literally' branch, could you please squash this, or something like it, into the relevant patch.

Thanks!

ATB, Ramsay Jones

 sha1_file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to sha1_file.c +1 −1

diff --git a/sha1_file.c b/sha1_file.c
index 267399d..2b81534 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1642,7 +1642,7 @@ static void *unpack_sha1_rest(git_zstream *stream, void *buffer, unsigned long s
  * too permissive for what we want to check. So do an anal
  * object header parse by hand.
  */
-int parse_sha1_header_extended(const char *hdr, struct object_info *oi,
+static int parse_sha1_header_extended(const char *hdr, struct object_info *oi,
 			       unsigned int flags)
 {
 	struct strbuf typename = STRBUF_INIT;

-- 
2.3.0

Karthik Nayak· Apr 17, 2015, 02:03 UTC · re: Ramsay Jones · lore

Re: [PATCH] sha1_file.c: make parse_sha1_header_extended() static

On April 16, 2015 5:55:25 PM GMT+05:30, Ramsay Jones <ramsay@ramsay1.demon.co.uk> wrote:

Show 19 quoted lines

>
>commit 9e1f5bc0 ("sha1_file.c: support reading from a loose object of
>unknown type", 15-04-2015) added a new externally visible function
>which does not require more than file scope. This causes sparse to
>issue a warning message about this symbol. In order to suppress the
>warning, add the static qualifier to the function definition.
>
>[An alternative solution, if this symbol should have external scope,
>is to add an external declaration for the function to the "cache.h"
>header file (next to the one for parse_sha1_header()).]
>
>Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
>---
>
>Hi Karthik,
>
>If you need to re-roll your patches in the 'kn/cat-file-literally'
>branch, could you please squash this, or something like it, into
>the relevant patch.

Thanks for this Ramsay, will be re rolling, will squash it into my commit.

Regards Karthik

Show 27 quoted lines

>
>Thanks!
>
>ATB,
>Ramsay Jones
>
> sha1_file.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/sha1_file.c b/sha1_file.c
>index 267399d..2b81534 100644
>--- a/sha1_file.c
>+++ b/sha1_file.c
>@@ -1642,7 +1642,7 @@ static void *unpack_sha1_rest(git_zstream
>*stream, void *buffer, unsigned long s
>  * too permissive for what we want to check. So do an anal
>  * object header parse by hand.
>  */
>-int parse_sha1_header_extended(const char *hdr, struct object_info
>*oi,
>+static int parse_sha1_header_extended(const char *hdr, struct
>object_info *oi,
> 			       unsigned int flags)
> {
> 	struct strbuf typename = STRBUF_INIT;
>-- 
>2.3.0

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

patchsha1_file.c: make parse_sha1_header_extended() static