threads / patch / 35525

patchsend-pack.c: mark a file-local function static

Subject: [PATCH] send-pack.c: mark a file-local function static

## tl;dr

3 messages between Dec 12, 2013 and Dec 13, 2013. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Ramsay Jones· Dec 12, 2013, 23:15 UTC · lore

Commit f2c681cf ("send-pack: support pushing from a shallow clone via http", 05-12-2013) adds the 'advertise_shallow_grafts_buf' function as an external symbol. This symbol does not require more than file visibility.

Noticed by sparse. ("'advertise_shallow_grafts_buf' was not declared. Should it be static?")

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

Hi Duy,

If you need to re-roll the patches in your 'nd/shallow-clone' branch, could you please squash this into your patch. Thanks!

BTW, I have not been following these patches, but I noticed that the 'remove_nonexistent_ours_in_pack()' function has no callers. (There are two commented out callers - but they seem to have *always* been commented out ;-) ). So, step 5 is no longer required? :-D

ATB, Ramsay Jones

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

Show changes to send-pack.c +1 −1

diff --git a/send-pack.c b/send-pack.c
index 2a199cc..6129b0f 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -183,7 +183,7 @@ static int advertise_shallow_grafts_cb(const struct commit_graft *graft, void *c
 	return 0;
 }
 
-void advertise_shallow_grafts_buf(struct strbuf *sb)
+static void advertise_shallow_grafts_buf(struct strbuf *sb)
 {
 	if (!is_repository_shallow())
 		return;

-- 
1.8.5

Duy Nguyen· Dec 13, 2013, 00:58 UTC · re: Ramsay Jones · lore

Re: [PATCH] send-pack.c: mark a file-local function static

On Fri, Dec 13, 2013 at 6:15 AM, Ramsay Jones <ramsay@ramsay1.demon.co.uk> wrote:

> BTW, I have not been following these patches, but I noticed that the
> 'remove_nonexistent_ours_in_pack()' function has no callers. (There are
> two commented out callers - but they seem to have *always* been commented
> out ;-) ). So, step 5 is no longer required? :-D

It's more of an optimization than a requirement, to avoid expensive calculation later. Uncommenting is possible but I need to pass the pack file name around a bit.

-- 
Duy

Ramsay Jones· Dec 13, 2013, 22:50 UTC · re: Duy Nguyen · lore

Re: [PATCH] send-pack.c: mark a file-local function static

On 13/12/13 00:58, Duy Nguyen wrote:

Show 11 quoted lines

> On Fri, Dec 13, 2013 at 6:15 AM, Ramsay Jones
> <ramsay@ramsay1.demon.co.uk> wrote:
>> BTW, I have not been following these patches, but I noticed that the
>> 'remove_nonexistent_ours_in_pack()' function has no callers. (There are
>> two commented out callers - but they seem to have *always* been commented
>> out ;-) ). So, step 5 is no longer required? :-D
> 
> It's more of an optimization than a requirement, to avoid expensive
> calculation later. Uncommenting is possible but I need to pass the
> pack file name around a bit.
>

Ah, OK.

(I should probably refrain from commenting on code I haven't read ... :-P )

ATB, Ramsay Jones