mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-08-30 09:17:58 +00:00
Code Issues Releases Wiki Activity

Rename ShowInvitesBans() to ShowChannelList(), make it more flexible

Browse Source
This commit is contained in:
Alexander Barton
2012-01-21 13:48:31 +01:00
parent 39412d6486
commit a3a4b5f696
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ngircd/channel.c
View File

@@ -1028,24 +1028,25 @@ Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce)
static bool static bool
ShowInvitesBans(struct list_head *head, CLIENT *Client, CHANNEL *Channel, bool invite) ShowChannelList(struct list_head *head, CLIENT *Client, CHANNEL *Channel,
char *msg, char *msg_end)
{ {
struct list_elem *e; struct list_elem *e;
char *msg = invite ? RPL_INVITELIST_MSG : RPL_BANLIST_MSG;
char *msg_end;
assert( Client != NULL ); assert (Client != NULL);
assert( Channel != NULL ); assert (Channel != NULL);
e = Lists_GetFirst(head); e = Lists_GetFirst(head);
while (e) { while (e) {
if( ! IRC_WriteStrClient( Client, msg, Client_ID( Client ), if (!IRC_WriteStrClient(Client, msg, Client_ID(Client),
Channel_Name( Channel ), Lists_GetMask(e) )) return DISCONNECTED; Channel_Name(Channel),
Lists_GetMask(e)))
return DISCONNECTED;
e = Lists_GetNext(e); e = Lists_GetNext(e);
} }
msg_end = invite ? RPL_ENDOFINVITELIST_MSG : RPL_ENDOFBANLIST_MSG; return IRC_WriteStrClient(Client, msg_end, Client_ID(Client),
return IRC_WriteStrClient( Client, msg_end, Client_ID( Client ), Channel_Name( Channel )); Channel_Name(Channel));
} }
@@ -1057,7 +1058,8 @@ Channel_ShowBans( CLIENT *Client, CHANNEL *Channel )
assert( Channel != NULL ); assert( Channel != NULL );
h = Channel_GetListBans(Channel); h = Channel_GetListBans(Channel);
return ShowInvitesBans(h, Client, Channel, false); return ShowChannelList(h, Client, Channel, RPL_BANLIST_MSG,
RPL_ENDOFBANLIST_MSG);
} }
@@ -1069,7 +1071,8 @@ Channel_ShowInvites( CLIENT *Client, CHANNEL *Channel )
assert( Channel != NULL ); assert( Channel != NULL );
h = Channel_GetListInvites(Channel); h = Channel_GetListInvites(Channel);
return ShowInvitesBans(h, Client, Channel, true); return ShowChannelList(h, Client, Channel, RPL_INVITELIST_MSG,
RPL_ENDOFINVITELIST_MSG);
} }