ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/src/channel.c

Comparing ircd-hybrid/branches/8.2.x/src/channel.c (file contents):
Revision 4782 by michael, Fri Oct 24 20:20:22 2014 UTC vs.
Revision 4784 by michael, Sat Oct 25 16:12:54 2014 UTC

#	Line 157 | Line 157 | remove_user_from_channel(struct Membersh
157		* side effects -
158		*/
159		static void
160	<	send_members(struct Client *client_p, struct Channel *chptr,
160	>	send_members(struct Client *client_p, const struct Channel *chptr,
161		char *modebuf, char *parabuf)
162		{
163		char buf[IRCD_BUFSIZE] = "";
#	Line 220 | Line 220 | send_members(struct Client *client_p, st
220		* \param flag     Char flag flagging type of mode. Currently this can be 'b', e' or 'I'
221		*/
222		static void
223	<	send_mode_list(struct Client *client_p, struct Channel *chptr,
223	>	send_mode_list(struct Client *client_p, const struct Channel *chptr,
224		const dlink_list *list, const char flag)
225		{
226		const dlink_node *ptr = NULL;
#	Line 627 | Line 627 | is_banned(const struct Channel *chptr, c
627		*         or 0 if allowed to join.
628		*/
629		int
630	<	can_join(struct Client *source_p, struct Channel *chptr, const char *key)
630	>	can_join(struct Client *source_p, const struct Channel *chptr, const char *key)
631		{
632		if ((chptr->mode.mode & MODE_SSLONLY) && !HasUMode(source_p, UMODE_SSL))
633		return ERR_SSLONLYCHAN;
#	Line 730 | Line 730 | int
730		can_send(struct Channel *chptr, struct Client *source_p,
731		struct Membership *ms, const char *message)
732		{
733	<	struct MaskItem *conf = NULL;
733	>	const struct MaskItem *conf = NULL;
734
735		if (IsServer(source_p) || HasFlag(source_p, FLAGS_SERVICE))
736		return CAN_SEND_OPV;
#	Line 962 | Line 962 | channel_do_join(struct Client *source_p,
962		char *chan_list = NULL;
963		struct Channel *chptr = NULL;
964		struct MaskItem *conf = NULL;
965	<	const struct ClassItem *class = get_class_ptr(&source_p->connection->confs);
965	>	const struct ClassItem *const class = get_class_ptr(&source_p->connection->confs);
966		int i = 0;
967		unsigned int flags = 0;
968
#	Line 1168 | Line 1168 | channel_part_one_client(struct Client *s
1168		}
1169
1170		void
1171	<	channel_do_part(struct Client *source_p, char *channel, char *reason)
1171	>	channel_do_part(struct Client *source_p, char *channel, const char *reason)
1172		{
1173		char *p = NULL, *name = NULL;
1174	<	char reasonbuf[KICKLEN + 1] = "";
1174	>	char buf[KICKLEN + 1] = "";
1175
1176		if (!EmptyString(reason))
1177	<	strlcpy(reasonbuf, reason, sizeof(reasonbuf));
1177	>	strlcpy(buf, reason, sizeof(buf));
1178
1179		for (name = strtoken(&p, channel, ","); name;
1180		name = strtoken(&p,    NULL, ","))
1181	<	channel_part_one_client(source_p, name, reasonbuf);
1181	>	channel_part_one_client(source_p, name, buf);
1182		}

Diff Legend

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