diff options
| author | Jeff King <peff@peff.net> | 2017-07-13 11:02:58 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-13 12:42:51 -0700 |
| commit | 29ef53cd361e8751f9f2f40811af0ce863e449b6 (patch) | |
| tree | f643af96af8483c0a6cc76f314e04c22334b078c /ref-filter.c | |
| parent | aa8a5d144da4e4ec43580831ff4a741538d21db4 (diff) | |
| download | git-29ef53cd361e8751f9f2f40811af0ce863e449b6.tar.gz git-29ef53cd361e8751f9f2f40811af0ce863e449b6.tar.xz | |
ref-filter: factor out the parsing of sorting atoms
We parse sort strings as single formatting atoms, and just
build on parse_ref_filter_atom(). Let's pull this idea into
its own function, since it's about to get a little more
complex. As a bonus, we can give the function a slightly
more natural interface, since our single atoms are in their
own strings.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ref-filter.c b/ref-filter.c index ee97d7218..080f5aceb 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -2114,6 +2114,12 @@ void pretty_print_ref(const char *name, const unsigned char *sha1, free_array_item(ref_item); } +static int parse_sorting_atom(const char *atom) +{ + const char *end = atom + strlen(atom); + return parse_ref_filter_atom(atom, end); +} + /* If no sorting option is given, use refname to sort as default */ struct ref_sorting *ref_default_sorting(void) { @@ -2122,14 +2128,13 @@ struct ref_sorting *ref_default_sorting(void) struct ref_sorting *sorting = xcalloc(1, sizeof(*sorting)); sorting->next = NULL; - sorting->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name)); + sorting->atom = parse_sorting_atom(cstr_name); return sorting; } void parse_ref_sorting(struct ref_sorting **sorting_tail, const char *arg) { struct ref_sorting *s; - int len; s = xcalloc(1, sizeof(*s)); s->next = *sorting_tail; @@ -2142,8 +2147,7 @@ void parse_ref_sorting(struct ref_sorting **sorting_tail, const char *arg) if (skip_prefix(arg, "version:", &arg) || skip_prefix(arg, "v:", &arg)) s->version = 1; - len = strlen(arg); - s->atom = parse_ref_filter_atom(arg, arg+len); + s->atom = parse_sorting_atom(arg); } int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset) |