submodule: rename helper functions to avoid ambiguity

periperidip · gitster · commit 180b154b0900 · 2020-08-12T14:12:58.000-07:00
The helper functions: show_submodule_summary(),
prepare_submodule_summary() and print_submodule_summary() are used by
the builtin_diff() function in diff.c to generate a summary of
submodules in the context of a diff. Functions with similar names are to
be introduced in the upcoming port of submodule's summary subcommand.

So, rename the helper functions to '*_diff_submodule_summary()' to avoid
ambiguity.

Mentored-by: Christian Couder &lt;chriscool@tuxfamily.org&gt;
Mentored-by: Kaartic Sivaraam &lt;kaartic.sivaraam@gmail.com&gt;
Signed-off-by: Shourya Shukla &lt;shouryashukla.oo@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/diff.c b/diff.c
@@ -3429,7 +3429,7 @@ static void builtin_diff(const char *name_a,
 	if (o->submodule_format == DIFF_SUBMODULE_LOG &&
 	    (!one->mode || S_ISGITLINK(one->mode)) &&
 	    (!two->mode || S_ISGITLINK(two->mode))) {
-		show_submodule_summary(o, one->path ? one->path : two->path,
+		show_submodule_diff_summary(o, one->path ? one->path : two->path,
 				&one->oid, &two->oid,
 				two->dirty_submodule);
 		return;
diff --git a/submodule.c b/submodule.c
@@ -438,7 +438,7 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt,
 	 */
 }
 
-static int prepare_submodule_summary(struct rev_info *rev, const char *path,
+static int prepare_submodule_diff_summary(struct rev_info *rev, const char *path,
 		struct commit *left, struct commit *right,
 		struct commit_list *merge_bases)
 {
@@ -459,7 +459,7 @@ static int prepare_submodule_summary(struct rev_info *rev, const char *path,
 	return prepare_revision_walk(rev);
 }
 
-static void print_submodule_summary(struct repository *r, struct rev_info *rev, struct diff_options *o)
+static void print_submodule_diff_summary(struct repository *r, struct rev_info *rev, struct diff_options *o)
 {
 	static const char format[] = "  %m %s";
 	struct strbuf sb = STRBUF_INIT;
@@ -610,7 +610,7 @@ static void show_submodule_header(struct diff_options *o,
 	strbuf_release(&sb);
 }
 
-void show_submodule_summary(struct diff_options *o, const char *path,
+void show_submodule_diff_summary(struct diff_options *o, const char *path,
 		struct object_id *one, struct object_id *two,
 		unsigned dirty_submodule)
 {
@@ -632,12 +632,12 @@ void show_submodule_summary(struct diff_options *o, const char *path,
 		goto out;
 
 	/* Treat revision walker failure the same as missing commits */
-	if (prepare_submodule_summary(&rev, path, left, right, merge_bases)) {
+	if (prepare_submodule_diff_summary(&rev, path, left, right, merge_bases)) {
 		diff_emit_submodule_error(o, "(revision walker failed)\n");
 		goto out;
 	}
 
-	print_submodule_summary(sub, &rev, o);
+	print_submodule_diff_summary(sub, &rev, o);
 
 out:
 	if (merge_bases)
diff --git a/submodule.h b/submodule.h
@@ -69,7 +69,7 @@ int parse_submodule_update_strategy(const char *value,
 				    struct submodule_update_strategy *dst);
 const char *submodule_strategy_to_string(const struct submodule_update_strategy *s);
 void handle_ignore_submodules_arg(struct diff_options *, const char *);
-void show_submodule_summary(struct diff_options *o, const char *path,
+void show_submodule_diff_summary(struct diff_options *o, const char *path,
 			    struct object_id *one, struct object_id *two,
 			    unsigned dirty_submodule);
 void show_submodule_inline_diff(struct diff_options *o, const char *path,

Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt,`
`438`	`438`	`*/`
`439`	`439`	`}`
`440`	`440`
`441`		`-static int prepare_submodule_summary(struct rev_info rev, const char path,`
	`441`	`+static int prepare_submodule_diff_summary(struct rev_info rev, const char path,`
`442`	`442`	`struct commit left, struct commit right,`
`443`	`443`	`struct commit_list *merge_bases)`
`444`	`444`	`{`
`@@ -459,7 +459,7 @@ static int prepare_submodule_summary(struct rev_info rev, const char path,`
`459`	`459`	`return prepare_revision_walk(rev);`
`460`	`460`	`}`
`461`	`461`
`462`		`-static void print_submodule_summary(struct repository r, struct rev_info rev, struct diff_options *o)`
	`462`	`+static void print_submodule_diff_summary(struct repository r, struct rev_info rev, struct diff_options *o)`
`463`	`463`	`{`
`464`	`464`	`static const char format[] = " %m %s";`
`465`	`465`	`struct strbuf sb = STRBUF_INIT;`
`@@ -610,7 +610,7 @@ static void show_submodule_header(struct diff_options *o,`
`610`	`610`	`strbuf_release(&sb);`
`611`	`611`	`}`
`612`	`612`
`613`		`-void show_submodule_summary(struct diff_options o, const char path,`
	`613`	`+void show_submodule_diff_summary(struct diff_options o, const char path,`
`614`	`614`	`struct object_id one, struct object_id two,`
`615`	`615`	`unsigned dirty_submodule)`
`616`	`616`	`{`
`@@ -632,12 +632,12 @@ void show_submodule_summary(struct diff_options o, const char path,`
`632`	`632`	`goto out;`
`633`	`633`
`634`	`634`	`/* Treat revision walker failure the same as missing commits */`
`635`		`- if (prepare_submodule_summary(&rev, path, left, right, merge_bases)) {`
	`635`	`+ if (prepare_submodule_diff_summary(&rev, path, left, right, merge_bases)) {`
`636`	`636`	`diff_emit_submodule_error(o, "(revision walker failed)\n");`
`637`	`637`	`goto out;`
`638`	`638`	`}`
`639`	`639`
`640`		`- print_submodule_summary(sub, &rev, o);`
	`640`	`+ print_submodule_diff_summary(sub, &rev, o);`
`641`	`641`
`642`	`642`	`out:`
`643`	`643`	`if (merge_bases)`