summaryrefslogtreecommitdiff
path: root/graph.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2020-07-29 00:37:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-07-31 02:18:06 (GMT)
commitd70a9eb611a9d242c1d26847d223b8677609305b (patch)
tree2c7f218e0037607dfbf8c92ef34a5d412ceac78c /graph.c
parentb5eb741a00155f888a9a4ced87c840a2b7b04f5a (diff)
downloadgit-d70a9eb611a9d242c1d26847d223b8677609305b.zip
git-d70a9eb611a9d242c1d26847d223b8677609305b.tar.gz
git-d70a9eb611a9d242c1d26847d223b8677609305b.tar.bz2
strvec: rename struct fields
The "argc" and "argv" names made sense when the struct was argv_array, but now they're just confusing. Let's rename them to "nr" (which we use for counts elsewhere) and "v" (which is rather terse, but reads well when combined with typical variable names like "args.v"). Note that we have to update all of the callers immediately. Playing tricks with the preprocessor is hard here, because we wouldn't want to rewrite unrelated tokens. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'graph.c')
-rw-r--r--graph.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/graph.c b/graph.c
index 09c9cc9..c128ad0 100644
--- a/graph.c
+++ b/graph.c
@@ -355,8 +355,8 @@ struct git_graph *graph_init(struct rev_info *opt)
parse_graph_colors_config(&custom_colors, string);
free(string);
/* graph_set_column_colors takes a max-index, not a count */
- graph_set_column_colors(custom_colors.argv,
- custom_colors.argc - 1);
+ graph_set_column_colors(custom_colors.v,
+ custom_colors.nr - 1);
}
}