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 3471 by michael, Sun May 4 15:11:32 2014 UTC vs.
Revision 3831 by michael, Wed Jun 4 21:47:26 2014 UTC

#	Line 164 | Line 164 | send_members(struct Client *client_p, st
164
165		if (ms->flags & CHFL_CHANOP)
166		++tlen;
167	–	#ifdef HALFOPS
167		if (ms->flags & CHFL_HALFOP)
168		++tlen;
169	<	#endif
171	<	if (ms->flags & CHFL_VOICE)
169	>	ifs (ms->flags & CHFL_VOICE)
170		++tlen;
171
172		/*
173		* Space will be converted into CR, but we also need space for LF..
174	<	* That's why we use '- 1' here -adx
174	>	* That's why we use '- 1' here -adx
175		*/
176		if (t + tlen - buf > IRCD_BUFSIZE - 1)
177		{
#	Line 184 | Line 182 | send_members(struct Client *client_p, st
182
183		if (ms->flags & CHFL_CHANOP)
184		*t++ = '@';
187	–	#ifdef HALFOPS
185		if (ms->flags & CHFL_HALFOP)
186		*t++ = '%';
190	–	#endif
187		if (ms->flags & CHFL_VOICE)
188		*t++ = '+';
189
#	Line 216 | Line 212 | send_mode_list(struct Client *client_p,
212		{
213		const dlink_node *ptr = NULL;
214		char pbuf[IRCD_BUFSIZE] = "";
215	<	int tlen, mlen, cur_len, count = 0;
215	>	int tlen, mlen, cur_len;
216		char *pp = pbuf;
217
218		if (top->length == 0)
#	Line 244 | Line 240 | send_mode_list(struct Client *client_p,
240
241		cur_len = mlen;
242		pp = pbuf;
247	–	count = 0;
243		}
244
250	–	count++;
245		pp += sprintf(pp, "%s!%s@%s ", banptr->name, banptr->user,
246		banptr->host);
247		cur_len += tlen;
#	Line 544 | Line 538 | get_member_status(const struct Membershi
538		*p++ = '@';
539		}
540
547	–	#ifdef HALFOPS
541		if (ms->flags & CHFL_HALFOP)
542		{
543		if (!combine)
544		return "%";
545		*p++ = '%';
546		}
554	–	#endif
547
548		if (ms->flags & CHFL_VOICE)
549		*p++ = '+';

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)