From 5907672f44532dc707de0f5a2c0347c18e9b2543 Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Wed, 4 Feb 2009 14:25:06 +0100 Subject: [PATCH] Use enum_map for handling obsolete request names --- tig.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/tig.c b/tig.c index c5e3380..6f13a2f 100644 --- a/tig.c +++ b/tig.c @@ -1543,23 +1543,16 @@ option_bind_command(int argc, const char *argv[]) request = get_request(argv[2]); if (request == REQ_NONE) { - struct { - const char *name; - enum request request; - } obsolete[] = { - { "cherry-pick", REQ_NONE }, - { "screen-resize", REQ_NONE }, - { "tree-parent", REQ_PARENT }, + static struct enum_map obsolete[] = { + ENUM_MAP("cherry-pick", REQ_NONE), + ENUM_MAP("screen-resize", REQ_NONE), + ENUM_MAP("tree-parent", REQ_PARENT), }; - size_t namelen = strlen(argv[2]); - int i; + int alias; - for (i = 0; i < ARRAY_SIZE(obsolete); i++) { - if (namelen != strlen(obsolete[i].name) || - string_enum_compare(obsolete[i].name, argv[2], namelen)) - continue; - if (obsolete[i].request != REQ_NONE) - add_keybinding(keymap, obsolete[i].request, key); + if (map_enum(&alias, obsolete, argv[2])) { + if (alias != REQ_NONE) + add_keybinding(keymap, alias, key); config_msg = "Obsolete request name"; return ERR; } -- 2.32.0.93.g670b81a890