ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/modules/core/m_kick.c

Comparing ircd-hybrid/branches/8.2.x/modules/core/m_kick.c (file contents):
Revision 9077 by michael, Tue Jan 1 11:06:50 2019 UTC vs.
Revision 9078 by michael, Sat Oct 12 20:15:30 2019 UTC

#	Line 54 | Line 54
54		*      - parv[2] = client to kick
55		*      - parv[3] = reason
56		*/
57	<	static int
57	>	static void
58		m_kick(struct Client *source_p, int parc, char *parv[])
59		{
60		char reason[KICKLEN + 1] = "";
#	Line 66 | Line 66 | m_kick(struct Client *source_p, int parc
66		if (EmptyString(parv[2]))
67		{
68		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, "KICK");
69	<	return 0;
69	>	return;
70		}
71
72		if ((chptr = hash_find_channel(parv[1])) == NULL)
73		{
74		sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
75	<	return 0;
75	>	return;
76		}
77
78		if ((member_source = find_channel_link(source_p, chptr)) == NULL)
79		{
80		sendto_one_numeric(source_p, &me, ERR_NOTONCHANNEL, chptr->name);
81	<	return 0;
81	>	return;
82		}
83
84		if (!has_member_flags(member_source, CHFL_CHANOP | CHFL_HALFOP))
85		{
86		sendto_one_numeric(source_p, &me, ERR_CHANOPRIVSNEEDED, chptr->name);
87	<	return 0;
87	>	return;
88		}
89
90		if ((target_p = find_chasing(source_p, parv[2])) == NULL)
91	<	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
91	>	return;  /* find_chasing sends ERR_NOSUCHNICK */
92
93		if ((member_target = find_channel_link(target_p, chptr)) == NULL)
94		{
95		sendto_one_numeric(source_p, &me, ERR_USERNOTINCHANNEL, target_p->name, chptr->name);
96	<	return 0;
96	>	return;
97		}
98
99		if (has_member_flags(member_source, CHFL_HALFOP) && !has_member_flags(member_source, CHFL_CHANOP))
#	Line 101 | Line 101 | m_kick(struct Client *source_p, int parc
101		if (has_member_flags(member_target, CHFL_CHANOP | CHFL_HALFOP))
102		{
103		sendto_one_numeric(source_p, &me, ERR_CHANOPRIVSNEEDED, chptr->name);
104	<	return 0;
104	>	return;
105		}
106		}
107
#	Line 118 | Line 118 | m_kick(struct Client *source_p, int parc
118		source_p->id, chptr->name,
119		target_p->id, reason);
120		remove_user_from_channel(member_target);
121	–	return 0;
121		}
122
123		/*! \brief KICK command handler
#	Line 134 | Line 133 | m_kick(struct Client *source_p, int parc
133		*      - parv[2] = client to kick
134		*      - parv[3] = reason
135		*/
136	<	static int
136	>	static void
137		ms_kick(struct Client *source_p, int parc, char *parv[])
138		{
139		char reason[KICKLEN + 1] = "";
#	Line 143 | Line 142 | ms_kick(struct Client *source_p, int par
142		struct Membership *member_target = NULL;
143
144		if (EmptyString(parv[2]))
145	<	return 0;
145	>	return;
146
147		if ((chptr = hash_find_channel(parv[1])) == NULL)
148	<	return 0;
148	>	return;
149
150		if ((target_p = find_person(source_p, parv[2])) == NULL)
151	<	return 0;
151	>	return;
152
153		if ((member_target = find_channel_link(target_p, chptr)) == NULL)
154	<	return 0;
154	>	return;
155
156		if (!EmptyString(parv[3]))
157		strlcpy(reason, parv[3], sizeof(reason));
#	Line 173 | Line 172 | ms_kick(struct Client *source_p, int par
172		source_p->id, chptr->name,
173		target_p->id, reason);
174		remove_user_from_channel(member_target);
176	–	return 0;
175		}
176
177		static struct Message kick_msgtab =

Diff Legend

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