ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/parse.c (file contents):
Revision 6161 by michael, Thu Jun 18 10:55:29 2015 UTC vs.
Revision 8339 by michael, Sat Mar 3 22:47:06 2018 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2015 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2018 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 83 | Line 83
83		* For a small parser like this, this is a good compromise and does
84		* make it somewhat faster. - Dianora
85		*/
86	<	#define MAXPTRLEN 32
86	>	enum { MAXPTRLEN = 32 };
87
88
89		static struct MessageTree
#	Line 119 | Line 119 | parse_remove_unknown(struct Client *clie
119		{
120		sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
121		"Unknown prefix (%s) from %s, Squitting %s",
122	<	lbuffer, get_client_name(client_p, SHOW_IP), lsender);
122	>	lbuffer, client_get_name(client_p, SHOW_IP), lsender);
123		sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
124		"Unknown prefix (%s) from %s, Squitting %s",
125	<	lbuffer, client_p->name, lsender);
125	>	lbuffer, client_get_name(client_p, MASK_IP), lsender);
126		sendto_one(client_p, ":%s SQUIT %s :(Unknown prefix (%s) from %s)",
127		me.id, lsender, lbuffer, client_p->name);
128		}
#	Line 251 | Line 251 | parse(struct Client *client_p, char *pbu
251		if (IsDefunct(client_p))
252		return;
253
254	<	assert(client_p->connection->fd.flags.open);
254	>	assert(client_p->connection);
255	>	assert(client_p->connection->fd);
256	>	assert(client_p->connection->fd->flags.open);
257	>
258	>
259		assert((bufend - pbuffer) < IRCD_BUFSIZE);
260
261		for (ch = pbuffer; *ch == ' '; ++ch)  /* Skip spaces */
#	Line 294 | Line 298 | parse(struct Client *client_p, char *pbu
298		sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
299		"Fake direction: dropped message from %s[%s] via %s",
300		from->name, from->from->name,
301	<	get_client_name(client_p, SHOW_IP));
301	>	client_get_name(client_p, SHOW_IP));
302		sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
303		"Fake direction: dropped message from %s[%s] via %s",
304		from->name, from->from->name,
305	<	get_client_name(client_p, MASK_IP));
305	>	client_get_name(client_p, MASK_IP));
306		return;
307		}
308		}
#	Line 333 | Line 337 | parse(struct Client *client_p, char *pbu
337		}
338		else
339		{
336	–	unsigned int length = 0;
337	–
340		if ((s = strchr(ch, ' ')))
341		*s++ = '\0';
342
#	Line 362 | Line 364 | parse(struct Client *client_p, char *pbu
364		assert(message->cmd);
365
366		paramcount = message->args_max;
367	<	length = bufend - ((s) ? s : ch);
367	>
368	>	size_t length = bufend - ((s) ? s : ch);
369		message->bytes += length;
370		}
371
#	Line 464 | Line 467 | add_msg_element(struct MessageTree *mtre
467		*/
468		if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]) == NULL)
469		{
470	<	ntree_p = MyCalloc(sizeof(struct MessageTree));
470	>	ntree_p = xcalloc(sizeof(*ntree_p));
471		mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = ntree_p;
472
473		mtree_p->links++;  /* Have new pointer, so up ref count */
#	Line 522 | Line 525 | del_msg_element(struct MessageTree *mtre
525		{
526		mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = NULL;
527		mtree_p->links--;
528	<	MyFree(ntree_p);
528	>	xfree(ntree_p);
529		}
530		}
531		}
#	Line 558 | Line 561 | msg_tree_parse(const char *cmd)
561		void
562		mod_add_cmd(struct Message *msg)
563		{
564	<	assert(msg && msg->cmd);
564	>	assert(msg);
565	>	assert(msg->cmd);
566
567		/* Command already added? */
568		if (msg_tree_parse(msg->cmd))
#	Line 576 | Line 580 | mod_add_cmd(struct Message *msg)
580		void
581		mod_del_cmd(struct Message *msg)
582		{
583	<	assert(msg && msg->cmd);
583	>	assert(msg);
584	>	assert(msg->cmd);
585
586		if (!msg_tree_parse(msg->cmd))
587		return;

Comparing ircd-hybrid/trunk/src/parse.c (property svn:keywords):
Revision 6161 by michael, Thu Jun 18 10:55:29 2015 UTC vs.
Revision 8339 by michael, Sat Mar 3 22:47:06 2018 UTC

#	Line 1 | Line 1
1	<	Id Revision
1	>	Id

Diff Legend

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