Skip to content

Commit cdd03bc

Browse files
committed
Merge branch 'ss/submodule-foreach-cb' into pu
* ss/submodule-foreach-cb: submodule--helper.c: Rename 'cb_foreach' to 'foreach_cb'
2 parents c57f413 + d00a5bd commit cdd03bc

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

builtin/submodule--helper.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -444,19 +444,19 @@ static void for_each_listed_submodule(const struct module_list *list,
444444
fn(list->entries[i], cb_data);
445445
}
446446

447-
struct cb_foreach {
447+
struct foreach_cb {
448448
int argc;
449449
const char **argv;
450450
const char *prefix;
451451
int quiet;
452452
int recursive;
453453
};
454-
#define CB_FOREACH_INIT { 0 }
454+
#define FOREACH_CB_INIT { 0 }
455455

456456
static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
457457
void *cb_data)
458458
{
459-
struct cb_foreach *info = cb_data;
459+
struct foreach_cb *info = cb_data;
460460
const char *path = list_item->name;
461461
const struct object_id *ce_oid = &list_item->oid;
462462

@@ -557,7 +557,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
557557

558558
static int module_foreach(int argc, const char **argv, const char *prefix)
559559
{
560-
struct cb_foreach info = CB_FOREACH_INIT;
560+
struct foreach_cb info = FOREACH_CB_INIT;
561561
struct pathspec pathspec;
562562
struct module_list list = MODULE_LIST_INIT;
563563

0 commit comments

Comments
 (0)