revision: drop some unused "revs" parameters

peff · gitster · commit 9163399535c4 · 2019-03-20T18:34:08.000+09:00
There are several internal helpers that take a rev_info struct but don't
actually look at it. While one could argue that all helpers in
revision.c should take a rev_info struct for consistency, dropping the
unused parameter makes it clear that they don't actually depend on any
other rev options.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/revision.c b/revision.c
@@ -1894,7 +1894,7 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi
 	return 0;
 }
 
-static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
+static void read_pathspec_from_stdin(struct strbuf *sb,
 				     struct argv_array *prune)
 {
 	while (strbuf_getline(sb, stdin) != EOF)
@@ -1928,7 +1928,7 @@ static void read_revisions_from_stdin(struct rev_info *revs,
 			die("bad revision '%s'", sb.buf);
 	}
 	if (seen_dashdash)
-		read_pathspec_from_stdin(revs, &sb, prune);
+		read_pathspec_from_stdin(&sb, prune);
 
 	strbuf_release(&sb);
 	warn_on_object_refname_ambiguity = save_warning;
@@ -2748,7 +2748,7 @@ static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs,
 	return st;
 }
 
-static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
+static int mark_redundant_parents(struct commit *commit)
 {
 	struct commit_list *h = reduce_heads(commit->parents);
 	int i = 0, marked = 0;
@@ -2784,7 +2784,7 @@ static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
 	return marked;
 }
 
-static int mark_treesame_root_parents(struct rev_info *revs, struct commit *commit)
+static int mark_treesame_root_parents(struct commit *commit)
 {
 	struct commit_list *p;
 	int marked = 0;
@@ -2976,8 +2976,8 @@ static struct commit_list **simplify_one(struct rev_info *revs, struct commit *c
 	 * Detect and simplify both cases.
 	 */
 	if (1 < cnt) {
-		int marked = mark_redundant_parents(revs, commit);
-		marked += mark_treesame_root_parents(revs, commit);
+		int marked = mark_redundant_parents(commit);
+		marked += mark_treesame_root_parents(commit);
 		if (marked)
 			marked -= leave_one_treesame_to_parent(revs, commit);
 		if (marked)

Original file line number	Diff line number	Diff line change
`@@ -1894,7 +1894,7 @@ int handle_revision_arg(const char arg_, struct rev_info revs, int flags, unsi`
`1894`	`1894`	`return 0;`
`1895`	`1895`	`}`
`1896`	`1896`
`1897`		`-static void read_pathspec_from_stdin(struct rev_info revs, struct strbuf sb,`
	`1897`	`+static void read_pathspec_from_stdin(struct strbuf *sb,`
`1898`	`1898`	`struct argv_array *prune)`
`1899`	`1899`	`{`
`1900`	`1900`	`while (strbuf_getline(sb, stdin) != EOF)`
`@@ -1928,7 +1928,7 @@ static void read_revisions_from_stdin(struct rev_info *revs,`
`1928`	`1928`	`die("bad revision '%s'", sb.buf);`
`1929`	`1929`	`}`
`1930`	`1930`	`if (seen_dashdash)`
`1931`		`- read_pathspec_from_stdin(revs, &sb, prune);`
	`1931`	`+ read_pathspec_from_stdin(&sb, prune);`
`1932`	`1932`
`1933`	`1933`	`strbuf_release(&sb);`
`1934`	`1934`	`warn_on_object_refname_ambiguity = save_warning;`
`@@ -2748,7 +2748,7 @@ static struct merge_simplify_state locate_simplify_state(struct rev_info revs,`
`2748`	`2748`	`return st;`
`2749`	`2749`	`}`
`2750`	`2750`
`2751`		`-static int mark_redundant_parents(struct rev_info revs, struct commit commit)`
	`2751`	`+static int mark_redundant_parents(struct commit *commit)`
`2752`	`2752`	`{`
`2753`	`2753`	`struct commit_list *h = reduce_heads(commit->parents);`
`2754`	`2754`	`int i = 0, marked = 0;`
`@@ -2784,7 +2784,7 @@ static int mark_redundant_parents(struct rev_info revs, struct commit commit)`
`2784`	`2784`	`return marked;`
`2785`	`2785`	`}`
`2786`	`2786`
`2787`		`-static int mark_treesame_root_parents(struct rev_info revs, struct commit commit)`
	`2787`	`+static int mark_treesame_root_parents(struct commit *commit)`
`2788`	`2788`	`{`
`2789`	`2789`	`struct commit_list *p;`
`2790`	`2790`	`int marked = 0;`
`@@ -2976,8 +2976,8 @@ static struct commit_list *simplify_one(struct rev_info revs, struct commit *c`
`2976`	`2976`	`* Detect and simplify both cases.`
`2977`	`2977`	`*/`
`2978`	`2978`	`if (1 < cnt) {`
`2979`		`- int marked = mark_redundant_parents(revs, commit);`
`2980`		`- marked += mark_treesame_root_parents(revs, commit);`
	`2979`	`+ int marked = mark_redundant_parents(commit);`
	`2980`	`+ marked += mark_treesame_root_parents(commit);`
`2981`	`2981`	`if (marked)`
`2982`	`2982`	`marked -= leave_one_treesame_to_parent(revs, commit);`
`2983`	`2983`	`if (marked)`