submodule--helper: introduce for_each_listed_submodule()
Introduce function for_each_listed_submodule() and replace a loop in module_init() with a call to it. The new function will also be used in other parts of the system in later patches. Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Stefan Beller <sbeller@google.com> Signed-off-by: Prathamesh Chavan <pc44800@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Prathamesh Chavan committed
Oct 6, 2017 at 18:54 UTC
9f580a6260ab301916286fb6ca05f6613e9904e8
1 file changed
+35
-5
builtin/submodule--helper.c
+35
-5
@@ -14,6 +14,11 @@
14
#include "refs.h"
15
#include "connect.h"
16
17
+#define OPT_QUIET (1 << 0)
18
+
19
+typedef void (*each_submodule_fn)(const struct cache_entry *list_item,
20
+ void *cb_data);
21
+
22
static char *get_default_remote(void)
23
{
24
char *dest = NULL, *ret;
@@ -349,7 +354,23 @@ static int module_list(int argc, const char **argv, const char *prefix)
354
return 0;
355
}
356
352
-static void init_submodule(const char *path, const char *prefix, int quiet)
357
+static void for_each_listed_submodule(const struct module_list *list,
358
+ each_submodule_fn fn, void *cb_data)
359
+{
360
+ int i;
361
+ for (i = 0; i < list->nr; i++)
362
+ fn(list->entries[i], cb_data);
363
+}
364
+
365
+struct init_cb {
366
+ const char *prefix;
367
+ unsigned int flags;
368
+};
369
+
370
+#define INIT_CB_INIT { NULL, 0 }
371
+
372
+static void init_submodule(const char *path, const char *prefix,
373
+ unsigned int flags)
374
{
375
const struct submodule *sub;
376
struct strbuf sb = STRBUF_INIT;
@@ -411,7 +432,7 @@ static void init_submodule(const char *path, const char *prefix, int quiet)
432
if (git_config_set_gently(sb.buf, url))
433
die(_("Failed to register url for submodule path '%s'"),
434
displaypath);
414
- if (!quiet)
435
+ if (!(flags & OPT_QUIET))
436
fprintf(stderr,
437
_("Submodule '%s' (%s) registered for path '%s'\n"),
438
sub->name, url, displaypath);
@@ -438,12 +459,18 @@ static void init_submodule(const char *path, const char *prefix, int quiet)
459
free(upd);
460
}
461
462
+static void init_submodule_cb(const struct cache_entry *list_item, void *cb_data)
463
+{
464
+ struct init_cb *info = cb_data;
465
+ init_submodule(list_item->name, info->prefix, info->flags);
466
+}
467
+
468
static int module_init(int argc, const char **argv, const char *prefix)
469
{
470
+ struct init_cb info = INIT_CB_INIT;
471
struct pathspec pathspec;
472
struct module_list list = MODULE_LIST_INIT;
473
int quiet = 0;
446
- int i;
474
475
struct option module_init_options[] = {
476
OPT__QUIET(&quiet, N_("Suppress output for initializing a submodule")),
@@ -468,8 +495,11 @@ static int module_init(int argc, const char **argv, const char *prefix)
495
if (!argc && git_config_get_value_multi("submodule.active"))
496
module_list_active(&list);
497
471
- for (i = 0; i < list.nr; i++)
472
- init_submodule(list.entries[i]->name, prefix, quiet);
498
+ info.prefix = prefix;
499
+ if (quiet)
500
+ info.flags |= OPT_QUIET;
501
+
502
+ for_each_listed_submodule(&list, init_submodule_cb, &info);
503
504
return 0;
505
}