ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/conf_parser.c (file contents):
Revision 4914 by michael, Thu Oct 16 11:46:19 2014 UTC vs.
Revision 4915 by michael, Tue Nov 25 12:37:46 2014 UTC

#	Line 159 | Line 159 | static struct
159		static void
160		reset_block_state(void)
161		{
162	<	dlink_node *ptr = NULL, *ptr_next = NULL;
162	>	dlink_node *node = NULL, *node_next = NULL;
163
164	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.mask.list.head)
164	>	DLINK_FOREACH_SAFE(node, node_next, block_state.mask.list.head)
165		{
166	<	MyFree(ptr->data);
167	<	dlinkDelete(ptr, &block_state.mask.list);
168	<	free_dlink_node(ptr);
166	>	MyFree(node->data);
167	>	dlinkDelete(node, &block_state.mask.list);
168	>	free_dlink_node(node);
169		}
170
171	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.leaf.list.head)
171	>	DLINK_FOREACH_SAFE(node, node_next, block_state.leaf.list.head)
172		{
173	<	MyFree(ptr->data);
174	<	dlinkDelete(ptr, &block_state.leaf.list);
175	<	free_dlink_node(ptr);
173	>	MyFree(node->data);
174	>	dlinkDelete(node, &block_state.leaf.list);
175	>	free_dlink_node(node);
176		}
177
178	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.hub.list.head)
178	>	DLINK_FOREACH_SAFE(node, node_next, block_state.hub.list.head)
179		{
180	<	MyFree(ptr->data);
181	<	dlinkDelete(ptr, &block_state.hub.list);
182	<	free_dlink_node(ptr);
180	>	MyFree(node->data);
181	>	dlinkDelete(node, &block_state.hub.list);
182	>	free_dlink_node(node);
183		}
184
185		memset(&block_state, 0, sizeof(block_state));
#	Line 3441 | Line 3441 | yyreduce:
3441		case 101:
3442		#line 901 "conf_parser.y" /* yacc.c:1646  */
3443		{
3444	<	dlink_node *ptr = NULL;
3444	>	dlink_node *node = NULL;
3445
3446		if (conf_parser_ctx.pass != 2)
3447		break;
#	Line 3449 | Line 3449 | yyreduce:
3449		if (!block_state.file.buf[0])
3450		break;
3451
3452	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
3453	<	motd_add(ptr->data, block_state.file.buf);
3452	>	DLINK_FOREACH(node, block_state.mask.list.head)
3453	>	motd_add(node->data, block_state.file.buf);
3454		}
3455		#line 3456 "conf_parser.c" /* yacc.c:1646  */
3456		break;
#	Line 3713 | Line 3713 | yyreduce:
3713		case 154:
3714		#line 1100 "conf_parser.y" /* yacc.c:1646  */
3715		{
3716	<	dlink_node *ptr = NULL;
3716	>	dlink_node *node = NULL;
3717
3718		if (conf_parser_ctx.pass != 2)
3719		break;
#	Line 3729 | Line 3729 | yyreduce:
3729		break;
3730		#endif
3731
3732	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
3732	>	DLINK_FOREACH(node, block_state.mask.list.head)
3733		{
3734		struct MaskItem *conf = NULL;
3735		struct split_nuh_item nuh;
3736
3737	<	nuh.nuhmask  = ptr->data;
3737	>	nuh.nuhmask  = node->data;
3738		nuh.nickptr  = NULL;
3739		nuh.userptr  = block_state.user.buf;
3740		nuh.hostptr  = block_state.host.buf;
#	Line 4663 | Line 4663 | yyreduce:
4663		case 298:
4664		#line 1739 "conf_parser.y" /* yacc.c:1646  */
4665		{
4666	<	dlink_node *ptr = NULL;
4666	>	dlink_node *node = NULL;
4667
4668		if (conf_parser_ctx.pass != 2)
4669		break;
4670
4671	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
4671	>	DLINK_FOREACH(node, block_state.mask.list.head)
4672		{
4673		struct MaskItem *conf = NULL;
4674		struct split_nuh_item nuh;
4675
4676	<	nuh.nuhmask  = ptr->data;
4676	>	nuh.nuhmask  = node->data;
4677		nuh.nickptr  = NULL;
4678		nuh.userptr  = block_state.user.buf;
4679		nuh.hostptr  = block_state.host.buf;

Diff Legend

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