diff options
Diffstat (limited to 'tag.c')
-rw-r--r-- | tag.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/tag.c b/tag.c index 649ac49..5b4232e 100644 --- a/tag.c +++ b/tag.c @@ -23,37 +23,31 @@ static struct { char *name[TagsLen]; - enum IRCColor color[TagsLen]; size_t len; } tags = { .name = { "<none>", "<status>", "<raw>" }, - .color = { IRCBlack, IRCDefault, IRCRed }, .len = 3, }; -const struct Tag TagNone = { 0, "<none>", IRCBlack }; -const struct Tag TagStatus = { 1, "<status>", IRCDefault }; -const struct Tag TagRaw = { 2, "<raw>", IRCRed }; +const struct Tag TagNone = { 0, "<none>" }; +const struct Tag TagStatus = { 1, "<status>" }; +const struct Tag TagRaw = { 2, "<raw>" }; struct Tag tagFind(const char *name) { for (size_t id = 0; id < tags.len; ++id) { if (strcmp(tags.name[id], name)) continue; - return (struct Tag) { id, tags.name[id], tags.color[id] }; + return (struct Tag) { id, tags.name[id] }; } return TagNone; } -struct Tag tagFor(const char *name, enum IRCColor color) { +struct Tag tagFor(const char *name) { struct Tag tag = tagFind(name); - if (tag.id != TagNone.id) { - tag.color = tags.color[tag.id] = color; - return tag; - } + if (tag.id != TagNone.id) return tag; if (tags.len == TagsLen) return TagStatus; size_t id = tags.len++; tags.name[id] = strdup(name); - tags.color[id] = color; if (!tags.name[id]) err(EX_OSERR, "strdup"); - return (struct Tag) { id, tags.name[id], color }; + return (struct Tag) { id, tags.name[id] }; } |