aboutsummaryrefslogtreecommitdiff
path: root/add-interactive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-09-27 15:02:13 -0700
committerJunio C Hamano <gitster@pobox.com>2021-09-27 15:02:13 -0700
commita30321b9eaede5a1d639936d212e2d0fc8d414c8 (patch)
tree56806f1b45ec4b31eaa6dc182d42798703d16d8e /add-interactive.c
parentddb1055343948e0d0bc81f8d20245f1ada6430a0 (diff)
parent538835d2ac151abbe90058becfc0dc061d33302c (diff)
downloadgit-a30321b9eaede5a1d639936d212e2d0fc8d414c8.tar.xz
Merge branch 'ab/designated-initializers' into ab/designated-initializers-more
* ab/designated-initializers: cbtree.h: define cb_init() in terms of CBTREE_INIT *.h: move some *_INIT to designated initializers *.h _INIT macros: don't specify fields equal to 0 *.[ch] *_INIT macros: use { 0 } for a "zero out" idiom submodule-config.h: remove unused SUBMODULE_INIT macro
Diffstat (limited to 'add-interactive.c')
-rw-r--r--add-interactive.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/add-interactive.c b/add-interactive.c
index 36ebdbdf7e..6498ae196f 100644
--- a/add-interactive.c
+++ b/add-interactive.c
@@ -102,8 +102,12 @@ struct prefix_item_list {
int *selected; /* for multi-selections */
size_t min_length, max_length;
};
-#define PREFIX_ITEM_LIST_INIT \
- { STRING_LIST_INIT_DUP, STRING_LIST_INIT_NODUP, NULL, 1, 4 }
+#define PREFIX_ITEM_LIST_INIT { \
+ .items = STRING_LIST_INIT_DUP, \
+ .sorted = STRING_LIST_INIT_NODUP, \
+ .min_length = 1, \
+ .max_length = 4, \
+}
static void prefix_item_list_clear(struct prefix_item_list *list)
{