ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/channel.c

Comparing ircd-hybrid/trunk/src/channel.c (file contents):
Revision 9454 by michael, Tue Jun 30 16:56:21 2020 UTC vs.
Revision 9455 by michael, Tue Jun 30 17:33:17 2020 UTC

#	Line 467 | Line 467 | channel_member_names(struct Client *clie
467		char buf[IRCD_BUFSIZE + 1];
468		char *bufptr = buf;
469		size_t masklen = 0;
470	<	bool is_member = find_channel_link(client, channel) != NULL;
470	>	bool is_member = member_find_link(client, channel) != NULL;
471		bool multi_prefix = HasCap(client, CAP_MULTI_PREFIX) != 0;
472		bool uhnames = HasCap(client, CAP_UHNAMES) != 0;
473
#	Line 732 | Line 732 | has_member_flags(const struct ChannelMem
732		}
733
734		struct ChannelMember *
735	<	find_channel_link(const struct Client *client, const struct Channel *channel)
735	>	member_find_link(const struct Client *client, const struct Channel *channel)
736		{
737		dlink_node *node;
738
#	Line 817 | Line 817 | can_send(struct Channel *channel, struct
817		if (*message == '\001' && strncmp(message + 1, "ACTION ", 7))
818		return ERR_NOCTCP;
819
820	<	if (member || (member = find_channel_link(client, channel)))
820	>	if (member || (member = member_find_link(client, channel)))
821		if (member->flags & (CHFL_CHANOP | CHFL_HALFOP | CHFL_VOICE))
822		return CAN_SEND_OPV;
823
#	Line 984 | Line 984 | channel_do_join(struct Client *client, c
984		struct Channel *channel = hash_find_channel(name);
985		if (channel)
986		{
987	<	if (find_channel_link(client, channel))
987	>	if (member_find_link(client, channel))
988		continue;
989
990		/* can_join() checks for +i, +l, key, bans, etc. */
#	Line 1092 | Line 1092 | channel_part_one_client(struct Client *c
1092		return;
1093		}
1094
1095	<	struct ChannelMember *member = find_channel_link(client, channel);
1095	>	struct ChannelMember *member = member_find_link(client, channel);
1096		if (member == NULL)
1097		{
1098		sendto_one_numeric(client, &me, ERR_NOTONCHANNEL, channel->name);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines