On Thu, Oct 1, 2015 at 5:02 AM, Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> 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 <ramsay@xxxxxxxxxxxxxxxxxxxx> > --- > > 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@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html