# [PATCH] submodule-parallel-fetch: make some file local symbols static 4 messages from 2015-10-01 to 2015-10-02. Participants: Ramsay Jones, Stefan Beller, Junio C Hamano. Thread: https://gitlist.dev/t/40467 ## Ramsay Jones, 2015-10-01 12:02 Subject: [PATCH] submodule-parallel-fetch: make some file local symbols static Message-ID: <560D20E2.4060601@ramsayjones.plus.com> URL: https://gitlist.dev/e/560D20E2.4060601%40ramsayjones.plus.com ``` Commits 0fc1fdb0 ("fetch_populated_submodules: use new parallel job processing", 28-09-2015) and 60f24f52 ("run-command: add an asynchronous parallel child processor", 28-09-2015) both introduce external symbols which only require file scope visibility. In order to reduce the visibility, apply the static keyword to their declarations. Signed-off-by: Ramsay Jones --- Hi Stefan, No, despite the same subject, this is not the same patch that I sent you last week! :-D Could you please squash parts of this into the patches corresponding to the above mentioned commits. Thanks! BTW, I would once again suggest that you could move the definition of get_next_submodule() to be above/before fetch_populated_submodules() so that you can remove the forward declaration. ATB, Ramsay Jones run-command.c | 2 +- submodule.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/run-command.c b/run-command.c index 341b23b..347d22e 100644 --- a/run-command.c +++ b/run-command.c @@ -865,7 +865,7 @@ int capture_command(struct child_process *cmd, struct strbuf *buf, size_t hint) return finish_command(cmd); } -struct parallel_processes { +static struct parallel_processes { void *data; int max_processes; diff --git a/submodule.c b/submodule.c index bd6e208..638efb5 100644 --- a/submodule.c +++ b/submodule.c @@ -622,8 +622,8 @@ struct submodule_parallel_fetch { }; #define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0} -int get_next_submodule(void *data, struct child_process *cp, - struct strbuf *err); +static int get_next_submodule(void *data, struct child_process *cp, + struct strbuf *err); static int fetch_start_failure(void *data, struct child_process *cp, struct strbuf *err) @@ -682,8 +682,8 @@ out: return spf.result; } -int get_next_submodule(void *data, struct child_process *cp, - struct strbuf *err) +static int get_next_submodule(void *data, struct child_process *cp, + struct strbuf *err) { int ret = 0; struct submodule_parallel_fetch *spf = data; -- 2.6.0 ``` ## Stefan Beller, 2015-10-01 17:05 Subject: Re: [PATCH] submodule-parallel-fetch: make some file local symbols static Message-ID: URL: https://gitlist.dev/e/CAGZ79kZzLtK7%2BrHRG_misaa9%3DfWF%2BoyeryBa%2BkbD3F%2BEB%3D3LMQ%40mail.gmail.com In-Reply-To: <560D20E2.4060601@ramsayjones.plus.com> ``` On Thu, Oct 1, 2015 at 5:02 AM, Ramsay Jones wrote: > > Commits 0fc1fdb0 ("fetch_populated_submodules: use new parallel job > processing", 28-09-2015) and 60f24f52 ("run-command: add an asynchronous > parallel child processor", 28-09-2015) both introduce external symbols > which only require file scope visibility. In order to reduce the > visibility, apply the static keyword to their declarations. > > Signed-off-by: Ramsay Jones > --- > > Hi Stefan, > > No, despite the same subject, this is not the same patch that I sent > you last week! :-D > > Could you please squash parts of this into the patches corresponding > to the above mentioned commits. I am sorry for the need to send this second patch. :( > > Thanks! > > BTW, I would once again suggest that you could move the definition of > get_next_submodule() to be above/before fetch_populated_submodules() > so that you can remove the forward declaration. > > ATB, > Ramsay Jones > > run-command.c | 2 +- > submodule.c | 8 ++++---- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/run-command.c b/run-command.c > index 341b23b..347d22e 100644 > --- a/run-command.c > +++ b/run-command.c > @@ -865,7 +865,7 @@ int capture_command(struct child_process *cmd, struct strbuf *buf, size_t hint) > return finish_command(cmd); > } > > -struct parallel_processes { > +static struct parallel_processes { will pickup in a reroll > void *data; > > int max_processes; > diff --git a/submodule.c b/submodule.c > index bd6e208..638efb5 100644 > --- a/submodule.c > +++ b/submodule.c > @@ -622,8 +622,8 @@ struct submodule_parallel_fetch { > }; > #define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0} > > -int get_next_submodule(void *data, struct child_process *cp, > - struct strbuf *err); > +static int get_next_submodule(void *data, struct child_process *cp, > + struct strbuf *err); I thought I had this in yesterdays reroll (v6). Oh you're referring to the version from the 28th (I forgot to label them v5 I suppose). I will also get rid of the forward declaration. > > static int fetch_start_failure(void *data, struct child_process *cp, > struct strbuf *err) > @@ -682,8 +682,8 @@ out: > return spf.result; > } > > -int get_next_submodule(void *data, struct child_process *cp, > - struct strbuf *err) > +static int get_next_submodule(void *data, struct child_process *cp, > + struct strbuf *err) > { > int ret = 0; > struct submodule_parallel_fetch *spf = data; > -- > 2.6.0 > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ``` ## Ramsay Jones, 2015-10-01 18:43 Subject: Re: [PATCH] submodule-parallel-fetch: make some file local symbols static Message-ID: <560D7EE2.8060403@ramsayjones.plus.com> URL: https://gitlist.dev/e/560D7EE2.8060403%40ramsayjones.plus.com In-Reply-To: ``` On 01/10/15 18:05, Stefan Beller wrote: > On Thu, Oct 1, 2015 at 5:02 AM, Ramsay Jones > wrote: >> [snip] >> diff --git a/run-command.c b/run-command.c >> index 341b23b..347d22e 100644 >> --- a/run-command.c >> +++ b/run-command.c >> @@ -865,7 +865,7 @@ int capture_command(struct child_process *cmd, struct strbuf *buf, size_t hint) >> return finish_command(cmd); >> } >> >> -struct parallel_processes { >> +static struct parallel_processes { > > will pickup in a reroll Thanks > >> void *data; >> >> int max_processes; >> diff --git a/submodule.c b/submodule.c >> index bd6e208..638efb5 100644 >> --- a/submodule.c >> +++ b/submodule.c >> @@ -622,8 +622,8 @@ struct submodule_parallel_fetch { >> }; >> #define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0} >> >> -int get_next_submodule(void *data, struct child_process *cp, >> - struct strbuf *err); >> +static int get_next_submodule(void *data, struct child_process *cp, >> + struct strbuf *err); > > I thought I had this in yesterdays reroll (v6). Oh you're referring to > the version > from the 28th (I forgot to label them v5 I suppose). Ah! I thought I'd seen it on the list. (I thought I was going crazy) ;-) Sorry, my fault. I just assumed that today's pu branch would have your latest patches - I didn't actually check that. Note that the first hunk, above, is actually new (I hadn't noticed it before). > > I will also get rid of the forward declaration. Thanks! ATB, Ramsay Jones > >> >> static int fetch_start_failure(void *data, struct child_process *cp, >> struct strbuf *err) >> @@ -682,8 +682,8 @@ out: >> return spf.result; >> } >> >> -int get_next_submodule(void *data, struct child_process *cp, >> - struct strbuf *err) >> +static int get_next_submodule(void *data, struct child_process *cp, >> + struct strbuf *err) >> { >> int ret = 0; >> struct submodule_parallel_fetch *spf = data; >> -- ``` ## Junio C Hamano, 2015-10-02 17:45 Subject: Re: [PATCH] submodule-parallel-fetch: make some file local symbols static Message-ID: URL: https://gitlist.dev/e/xmqqmvw15flx.fsf%40gitster.mtv.corp.google.com In-Reply-To: <560D7EE2.8060403@ramsayjones.plus.com> ``` Ramsay Jones writes: >> I thought I had this in yesterdays reroll (v6). Oh you're referring to >> the version >> from the 28th (I forgot to label them v5 I suppose). > > Ah! I thought I'd seen it on the list. (I thought I was going crazy) ;-) > Sorry, my fault. I just assumed that today's pu branch would have your > latest patches - I didn't actually check that. Sometimes I take a one-day vacation ;-) Thanks. ```