[PATCH 1/2] rev-list: pass "int flags" as last argument of "show_bisect_vars"

[PATCH 1/2] rev-list: pass "int flags" as last argument of "show_bisect_vars"

[Christian Couder]

Instead of "int show_all, int show_tried" we now only pass "int flags",
because we will add one more flag in a later patch.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 bisect.c           |    2 +-
 bisect.h           |    8 ++++++--
 builtin-rev-list.c |   13 ++++++-------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/bisect.c b/bisect.c
index 66df05f..64a5ad5 100644
--- a/bisect.c
+++ b/bisect.c
@@ -554,5 +554,5 @@ int bisect_next_vars(const char *prefix)
 	revs.commits = find_bisection(revs.commits, &reaches, &all,
 				      !!skipped_sha1_nr);
 
-	return show_bisect_vars(&revs, reaches, all, 0, 1);
+	return show_bisect_vars(&revs, reaches, all, SHOW_TRIED);
 }
diff --git a/bisect.h b/bisect.h
index 05eea17..4cff2ba 100644
--- a/bisect.h
+++ b/bisect.h
@@ -9,13 +9,17 @@ extern struct commit_list *filter_skipped(struct commit_list *list,
 					  struct commit_list **tried,
 					  int show_all);
 
+/* show_bisect_vars flags */
+#define SHOW_ALL	1
+#define SHOW_TRIED	2
+
 /*
- * The "show_all" parameter should be 0 if this function is called
+ * The flag SHOW_ALL should not be set if this function is called
  * from outside "builtin-rev-list.c" as otherwise it would use
  * static "revs" from this file.
  */
 extern int show_bisect_vars(struct rev_info *revs, int reaches, int all,
-			    int show_all, int show_tried);
+			    int flags);
 
 extern int bisect_next_vars(const char *prefix);
 
diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 925d643..c1c4a18 100644
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -236,17 +236,16 @@ static void show_tried_revs(struct commit_list *tried)
 	printf("'\n");
 }
 
-int show_bisect_vars(struct rev_info *revs, int reaches, int all,
-		     int show_all, int show_tried)
+int show_bisect_vars(struct rev_info *revs, int reaches, int all, int flags)
 {
 	int cnt;
 	char hex[41] = "";
 	struct commit_list *tried;
 
-	if (!revs->commits && !show_tried)
+	if (!revs->commits && !(flags & SHOW_TRIED))
 		return 1;
 
-	revs->commits = filter_skipped(revs->commits, &tried, show_all);
+	revs->commits = filter_skipped(revs->commits, &tried, flags & SHOW_ALL);
 
 	/*
 	 * revs->commits can reach "reaches" commits among
@@ -264,12 +263,12 @@ int show_bisect_vars(struct rev_info *revs, int reaches, int all,
 	if (revs->commits)
 		strcpy(hex, sha1_to_hex(revs->commits->item->object.sha1));
 
-	if (show_all) {
+	if (flags & SHOW_ALL) {
 		traverse_commit_list(revs, show_commit, show_object);
 		printf("------\n");
 	}
 
-	if (show_tried)
+	if (flags & SHOW_TRIED)
 		show_tried_revs(tried);
 	printf("bisect_rev=%s\n"
 	       "bisect_nr=%d\n"
@@ -379,7 +378,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 
 		if (bisect_show_vars)
 			return show_bisect_vars(&revs, reaches, all,
-						bisect_show_all, 0);
+						bisect_show_all ? SHOW_ALL : 0);
 	}
 
 	traverse_commit_list(&revs,
-- 
1.6.2.1.404.gb0085.dirty