From 03c8997af346badcd1c47c6c0c7f84daaa7f7852 Mon Sep 17 00:00:00 2001 From: LucentW Date: Wed, 13 May 2015 20:08:26 +0000 Subject: [PATCH] Fixed building issues\ Now builds cleanly. Pass all tests from make check. --- src/ngircd/channel.c | 4 ++-- src/ngircd/class.c | 2 +- src/ngircd/irc-op.c | 2 +- src/ngircd/lists.c | 2 +- src/ngircd/lists.h | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index d8ee7b70..02eb2357 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -1102,7 +1102,7 @@ Channel_AddBan(CHANNEL *c, const char *mask, const char *who ) { struct list_head *h = Channel_GetListBans(c); LogDebug("Adding \"%s\" to \"%s\" ban list", mask, Channel_Name(c)); - return Lists_Add(h, mask, time(NULL), who); + return Lists_Add(h, mask, time(NULL), who, false); } @@ -1111,7 +1111,7 @@ Channel_AddExcept(CHANNEL *c, const char *mask, const char *who ) { struct list_head *h = Channel_GetListExcepts(c); LogDebug("Adding \"%s\" to \"%s\" exception list", mask, Channel_Name(c)); - return Lists_Add(h, mask, time(NULL), who); + return Lists_Add(h, mask, time(NULL), who, false); } diff --git a/src/ngircd/class.c b/src/ngircd/class.c index 9ffa8b14..0bd9397f 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -105,7 +105,7 @@ Class_AddMask(const int Class, const char *Pattern, time_t ValidUntil, Lists_MakeMask(Pattern, mask, sizeof(mask)); return Lists_Add(&My_Classes[Class], mask, - ValidUntil, Reason); + ValidUntil, Reason, false); } GLOBAL void diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c index 2e5c680a..a309ee9f 100644 --- a/src/ngircd/irc-op.c +++ b/src/ngircd/irc-op.c @@ -200,7 +200,7 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req) if (remember) { /* We must remember this invite */ if (!Channel_AddInvite(chan, Client_MaskCloaked(target), - true)) + true, Client_ID(from))) return CONNECTED; } } diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index 2ca67e9d..8cbe2081 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -125,7 +125,7 @@ Lists_GetNext(const struct list_elem *e) */ bool Lists_Add(struct list_head *h, const char *Mask, time_t ValidUntil, - const char *Reason, bool OnlyOnce = false) + const char *Reason, bool OnlyOnce) { struct list_elem *e, *newelem; diff --git a/src/ngircd/lists.h b/src/ngircd/lists.h index 4206151e..070e4233 100644 --- a/src/ngircd/lists.h +++ b/src/ngircd/lists.h @@ -36,7 +36,8 @@ GLOBAL struct list_elem *Lists_CheckDupeMask PARAMS((const struct list_head *hea const char *mask)); GLOBAL bool Lists_Add PARAMS((struct list_head *h, const char *Mask, - time_t ValidUntil, const char *Reason, bool OnlyOnce)); + time_t ValidUntil, const char *Reason, + bool OnlyOnce)); GLOBAL void Lists_Del PARAMS((struct list_head *head, const char *Mask)); GLOBAL unsigned long Lists_Count PARAMS((struct list_head *h)); -- 2.39.2