ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/send.c (file contents):
Revision 3135 by michael, Mon Mar 10 21:11:25 2014 UTC vs.
Revision 3136 by michael, Tue Mar 11 18:24:03 2014 UTC

#	Line 398 | Line 398 | sendto_channel_butone(struct Client *one
398		struct Channel *chptr, unsigned int type,
399		const char *pattern, ...)
400		{
401	<	va_list alocal, aremote, auid;
402	<	struct dbuf_block *local_buf, *remote_buf, *uid_buf;
401	>	va_list alocal, aremote;
402	>	struct dbuf_block *local_buf, *remote_buf;
403		dlink_node *ptr = NULL, *ptr_next = NULL;
404
405	<	local_buf = dbuf_alloc(), remote_buf = dbuf_alloc(), uid_buf = dbuf_alloc();
405	>	local_buf = dbuf_alloc(), remote_buf = dbuf_alloc();
406
407		if (IsServer(from))
408		dbuf_put_fmt(local_buf, ":%s ", from->name);
409		else
410		dbuf_put_fmt(local_buf, ":%s!%s@%s ", from->name, from->username, from->host);
411
412	<	dbuf_put_fmt(remote_buf, ":%s ", from->name);
413	<	dbuf_put_fmt(uid_buf, ":%s ", ID(from));
412	>	dbuf_put_fmt(remote_buf, ":%s ", ID(from));
413
414		va_start(alocal, pattern);
415		va_start(aremote, pattern);
417	–	va_start(auid, pattern);
416		send_format(local_buf, pattern, alocal);
417		send_format(remote_buf, pattern, aremote);
418	<	send_format(uid_buf, pattern, auid);
421	<	va_end(auid);
418	>
419		va_end(aremote);
420		va_end(alocal);
421
#	Line 446 | Line 443 | sendto_channel_butone(struct Client *one
443
444		dbuf_ref_free(local_buf);
445		dbuf_ref_free(remote_buf);
449	–	dbuf_ref_free(uid_buf);
446		}
447
448		/* sendto_server()
#	Line 699 | Line 695 | sendto_match_butone(struct Client *one,
695		local_buf = dbuf_alloc(), remote_buf = dbuf_alloc();
696
697		dbuf_put_fmt(local_buf, ":%s!%s@%s ", from->name, from->username, from->host);
698	<	dbuf_put_fmt(remote_buf, ":%s ", from->name);
698	>	dbuf_put_fmt(remote_buf, ":%s ", ID(from));
699
700		va_start(alocal, pattern);
701		va_start(aremote, pattern);
#	Line 1023 | Line 1019 | kill_client(struct Client *client_p, str
1019		dbuf_ref_free(buffer);
1020		}
1021
1022	<	/* kill_client_ll_serv_butone()
1022	>	/* kill_client_serv_butone()
1023		*
1024		* inputs       - pointer to client to not send to
1025		*              - pointer to client to kill

Diff Legend

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