dzwdz
/
catboy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove static buffer from capList

master
C. McEnroe 2020-11-08 15:07:13 -05:00
parent a0abd6582e
commit a8264f31e0
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
handle.c
View File

@ -63,16 +63,13 @@ static enum Cap capParse(const char *list) {
return caps; return caps;
} }
static const char *capList(enum Cap caps) { static const char *capList(struct Cat *cat, enum Cap caps) {
static char buf[1024];
buf[0] = '\0';
struct Cat cat = { buf, sizeof(buf), 0 };
for (size_t i = 0; i < ARRAY_LEN(CapNames); ++i) { for (size_t i = 0; i < ARRAY_LEN(CapNames); ++i) {
if (caps & (1 << i)) { if (caps & (1 << i)) {
catf(&cat, "%s%s", (buf[0] ? " " : ""), CapNames[i]); catf(cat, "%s%s", (cat->len ? " " : ""), CapNames[i]);
} }
} }
return buf; return cat->buf;
} }
static void require(struct Message *msg, bool origin, uint len) { static void require(struct Message *msg, bool origin, uint len) {
@ -143,7 +140,9 @@ static void handleCap(struct Message *msg) {
caps &= ~CapConsumer; caps &= ~CapConsumer;
} }
if (caps) { if (caps) {
ircFormat("CAP REQ :%s\r\n", capList(caps)); char buf[512] = "";
struct Cat cat = { buf, sizeof(buf), 0 };
ircFormat("CAP REQ :%s\r\n", capList(&cat, caps));
} else { } else {
if (!(self.caps & CapSASL)) ircFormat("CAP END\r\n"); if (!(self.caps & CapSASL)) ircFormat("CAP END\r\n");
} }