diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-01-07 09:51:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-07 23:13:21 (GMT) |
| commit | 7c269a7b162027d0465d52203e778903a2ddbdbf (patch) | |
| tree | f36f9bd2273e9dce33d596752aa99d73d18940b1 /ref-filter.h | |
| parent | d0947483a3386204918447775b617ab3dac833b0 (diff) | |
| download | git-7c269a7b162027d0465d52203e778903a2ddbdbf.zip git-7c269a7b162027d0465d52203e778903a2ddbdbf.tar.gz git-7c269a7b162027d0465d52203e778903a2ddbdbf.tar.bz2 | |
ref-filter: move ref_sorting flags to a bitfield
Change the reverse/ignore_case/version sort flags in the ref_sorting
struct into a bitfield. Having three of them was already a bit
unwieldy, but it would be even more so if another flag needed a
function like ref_sorting_icase_all() introduced in
76f9e569adb (ref-filter: apply --ignore-case to all sorting keys,
2020-05-03).
A follow-up change will introduce such a flag, so let's move this over
to a bitfield. Instead of using the usual '#define' pattern I'm using
the "enum" pattern from builtin/rebase.c's b4c8eb024af (builtin
rebase: support --quiet, 2018-09-04).
Perhaps there's a more idiomatic way of doing the "for each in list
amend mask" pattern than this "mask/on" variable combo. This function
doesn't allow us to e.g. do any arbitrary changes to the bitfield for
multiple flags, but I think in this case that's fine. The common case
is that we're calling this with a list of one.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ref-filter.h')
| -rw-r--r-- | ref-filter.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ref-filter.h b/ref-filter.h index feaef4a..6296ae8 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -28,9 +28,11 @@ struct atom_value; struct ref_sorting { struct ref_sorting *next; int atom; /* index into used_atom array (internal) */ - unsigned reverse : 1, - ignore_case : 1, - version : 1; + enum { + REF_SORTING_REVERSE = 1<<0, + REF_SORTING_ICASE = 1<<1, + REF_SORTING_VERSION = 1<<2, + } sort_flags; }; struct ref_array_item { @@ -109,8 +111,8 @@ void ref_array_clear(struct ref_array *array); int verify_ref_format(struct ref_format *format); /* Sort the given ref_array as per the ref_sorting provided */ void ref_array_sort(struct ref_sorting *sort, struct ref_array *array); -/* Set the ignore_case flag for all elements of a sorting list */ -void ref_sorting_icase_all(struct ref_sorting *sorting, int flag); +/* Set REF_SORTING_* sort_flags for all elements of a sorting list */ +void ref_sorting_set_sort_flags_all(struct ref_sorting *sorting, unsigned int mask, int on); /* Based on the given format and quote_style, fill the strbuf */ int format_ref_array_item(struct ref_array_item *info, const struct ref_format *format, |