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 1761 by michael, Fri Jan 18 19:21:39 2013 UTC vs.
Revision 1793 by michael, Sun Mar 31 14:06:08 2013 UTC

#	Line 34 | Line 34
34		#include "fdlist.h"
35		#include "s_bsd.h"
36		#include "s_serv.h"
37	–	#include "sprintf_irc.h"
37		#include "conf.h"
38		#include "log.h"
39		#include "memory.h"
#	Line 379 | Line 378 | sendto_channel_butone(struct Client *one
378		dlink_node *ptr = NULL, *ptr_next = NULL;
379
380		if (IsServer(from))
381	<	local_len = ircsprintf(local_buf, ":%s ",
382	<	from->name);
381	>	local_len = sprintf(local_buf, ":%s ",
382	>	from->name);
383		else
384	<	local_len = ircsprintf(local_buf, ":%s!%s@%s ",
385	<	from->name, from->username, from->host);
386	<	remote_len = ircsprintf(remote_buf, ":%s ",
384	>	local_len = sprintf(local_buf, ":%s!%s@%s ",
385	>	from->name, from->username, from->host);
386	>	remote_len = sprintf(remote_buf, ":%s ",
387		from->name);
388	<	uid_len = ircsprintf(uid_buf, ":%s ",
389	<	ID(from));
388	>	uid_len = sprintf(uid_buf, ":%s ",
389	>	ID(from));
390
391		va_start(alocal, pattern);
392		va_start(aremote, pattern);
#	Line 734 | Line 733 | sendto_match_butone(struct Client *one,
733		struct Client *client_p;
734		dlink_node *ptr, *ptr_next;
735		char local_buf[IRCD_BUFSIZE], remote_buf[IRCD_BUFSIZE];
736	<	int local_len = ircsprintf(local_buf, ":%s!%s@%s ", from->name,
737	<	from->username, from->host);
738	<	int remote_len = ircsprintf(remote_buf, ":%s ", from->name);
736	>	int local_len = sprintf(local_buf, ":%s!%s@%s ", from->name,
737	>	from->username, from->host);
738	>	int remote_len = sprintf(remote_buf, ":%s ", from->name);
739
740		va_start(alocal, pattern);
741		va_start(aremote, pattern);
#	Line 870 | Line 869 | sendto_anywhere(struct Client *to, struc
869		if (IsServer(from))
870		{
871		if (IsCapable(to, CAP_TS6) && HasID(from))
872	<	len = ircsprintf(buffer, ":%s ", from->id);
872	>	len = sprintf(buffer, ":%s ", from->id);
873		else
874	<	len = ircsprintf(buffer, ":%s ", from->name);
874	>	len = sprintf(buffer, ":%s ", from->name);
875		}
876		else
877	<	len = ircsprintf(buffer, ":%s!%s@%s ",
877	>	len = sprintf(buffer, ":%s!%s@%s ",
878		from->name, from->username, from->host);
879		}
880	<	else len = ircsprintf(buffer, ":%s ", ID_or_name(from, send_to));
880	>	else len = sprintf(buffer, ":%s ", ID_or_name(from, send_to));
881
882		va_start(args, pattern);
883		len += send_format(&buffer[len], IRCD_BUFSIZE - len, pattern, args);
#	Line 962 | Line 961 | sendto_wallops_flags(unsigned int flags,
961		int len;
962
963		if (IsClient(source_p))
964	<	len = ircsprintf(buffer, ":%s!%s@%s WALLOPS :",
965	<	source_p->name, source_p->username, source_p->host);
964	>	len = sprintf(buffer, ":%s!%s@%s WALLOPS :",
965	>	source_p->name, source_p->username, source_p->host);
966		else
967	<	len = ircsprintf(buffer, ":%s WALLOPS :", source_p->name);
967	>	len = sprintf(buffer, ":%s WALLOPS :", source_p->name);
968
969		va_start(args, pattern);
970		len += send_format(&buffer[len], IRCD_BUFSIZE - len, pattern, args);
#	Line 1043 | Line 1042 | kill_client(struct Client *client_p, str
1042		if (IsDead(client_p))
1043		return;
1044
1045	<	len = ircsprintf(buffer, ":%s KILL %s :", ID_or_name(&me, client_p->from),
1046	<	ID_or_name(diedie, client_p));
1045	>	len = sprintf(buffer, ":%s KILL %s :", ID_or_name(&me, client_p->from),
1046	>	ID_or_name(diedie, client_p));
1047
1048		va_start(args, pattern);
1049		len += send_format(&buffer[len], IRCD_BUFSIZE - len, pattern, args);
#	Line 1077 | Line 1076 | kill_client_ll_serv_butone(struct Client
1076		{
1077		have_uid = 1;
1078		va_start(args, pattern);
1079	<	len_uid = ircsprintf(buf_uid, ":%s KILL %s :", me.id, ID(source_p));
1079	>	len_uid = sprintf(buf_uid, ":%s KILL %s :", me.id, ID(source_p));
1080		len_uid += send_format(&buf_uid[len_uid], IRCD_BUFSIZE - len_uid, pattern,
1081		args);
1082		va_end(args);
1083		}
1084
1085		va_start(args, pattern);
1086	<	len_nick = ircsprintf(buf_nick, ":%s KILL %s :", me.name, source_p->name);
1086	>	len_nick = sprintf(buf_nick, ":%s KILL %s :", me.name, source_p->name);
1087		len_nick += send_format(&buf_nick[len_nick], IRCD_BUFSIZE - len_nick, pattern,
1088		args);
1089		va_end(args);

Diff Legend

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