From 238f74efac1348d516516537f8f0d95fbed655ff Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Mon, 25 Feb 2019 14:28:44 -0500 Subject: [PATCH] Remove tag X macros again --- tag.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/tag.c b/tag.c index 13e06f3..cae5f03 100644 --- a/tag.c +++ b/tag.c @@ -21,28 +21,18 @@ #include "chat.h" -#define GLOBAL_TAGS \ - X(TagNone, 0, "") \ - X(TagStatus, 1, "") \ - X(TagRaw, 2, "") -enum { GlobalTagsLen = 3 }; - -#define X(tag, id, name) const struct Tag tag = { id, name }; -GLOBAL_TAGS -#undef X - static struct { char *name[TagsLen]; size_t len; } tags = { - .name = { -#define X(_, id, name) [id] = name, - GLOBAL_TAGS -#undef X - }, - .len = GlobalTagsLen, + .name = { "", "", "" }, + .len = 3, }; +const struct Tag TagNone = { 0, "" }; +const struct Tag TagStatus = { 1, "" }; +const struct Tag TagRaw = { 2, "" }; + struct Tag tagFind(const char *name) { for (size_t id = 0; id < tags.len; ++id) { if (strcmp(tags.name[id], name)) continue;