ViewVC Help

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

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

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

#	Line 121 | Line 121 | static struct
121		static void
122		reset_block_state(void)
123		{
124	<	dlink_node *ptr = NULL, *ptr_next = NULL;
124	>	dlink_node *node = NULL, *node_next = NULL;
125
126	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.mask.list.head)
126	>	DLINK_FOREACH_SAFE(node, node_next, block_state.mask.list.head)
127		{
128	<	MyFree(ptr->data);
129	<	dlinkDelete(ptr, &block_state.mask.list);
130	<	free_dlink_node(ptr);
128	>	MyFree(node->data);
129	>	dlinkDelete(node, &block_state.mask.list);
130	>	free_dlink_node(node);
131		}
132
133	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.leaf.list.head)
133	>	DLINK_FOREACH_SAFE(node, node_next, block_state.leaf.list.head)
134		{
135	<	MyFree(ptr->data);
136	<	dlinkDelete(ptr, &block_state.leaf.list);
137	<	free_dlink_node(ptr);
135	>	MyFree(node->data);
136	>	dlinkDelete(node, &block_state.leaf.list);
137	>	free_dlink_node(node);
138		}
139
140	<	DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.hub.list.head)
140	>	DLINK_FOREACH_SAFE(node, node_next, block_state.hub.list.head)
141		{
142	<	MyFree(ptr->data);
143	<	dlinkDelete(ptr, &block_state.hub.list);
144	<	free_dlink_node(ptr);
142	>	MyFree(node->data);
143	>	dlinkDelete(node, &block_state.hub.list);
144	>	free_dlink_node(node);
145		}
146
147		memset(&block_state, 0, sizeof(block_state));
#	Line 899 | Line 899 | motd_entry: MOTD
899		reset_block_state();
900		} '{' motd_items '}' ';'
901		{
902	<	dlink_node *ptr = NULL;
902	>	dlink_node *node = NULL;
903
904		if (conf_parser_ctx.pass != 2)
905		break;
#	Line 907 | Line 907 | motd_entry: MOTD
907		if (!block_state.file.buf[0])
908		break;
909
910	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
911	<	motd_add(ptr->data, block_state.file.buf);
910	>	DLINK_FOREACH(node, block_state.mask.list.head)
911	>	motd_add(node->data, block_state.file.buf);
912		};
913
914		motd_items: motd_items motd_item | motd_item;
#	Line 1098 | Line 1098 | oper_entry: OPERATOR
1098		block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1099		} '{' oper_items '}' ';'
1100		{
1101	<	dlink_node *ptr = NULL;
1101	>	dlink_node *node = NULL;
1102
1103		if (conf_parser_ctx.pass != 2)
1104		break;
#	Line 1114 | Line 1114 | oper_entry: OPERATOR
1114		break;
1115		#endif
1116
1117	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
1117	>	DLINK_FOREACH(node, block_state.mask.list.head)
1118		{
1119		struct MaskItem *conf = NULL;
1120		struct split_nuh_item nuh;
1121
1122	<	nuh.nuhmask  = ptr->data;
1122	>	nuh.nuhmask  = node->data;
1123		nuh.nickptr  = NULL;
1124		nuh.userptr  = block_state.user.buf;
1125		nuh.hostptr  = block_state.host.buf;
#	Line 1737 | Line 1737 | auth_entry: IRCD_AUTH
1737		reset_block_state();
1738		} '{' auth_items '}' ';'
1739		{
1740	<	dlink_node *ptr = NULL;
1740	>	dlink_node *node = NULL;
1741
1742		if (conf_parser_ctx.pass != 2)
1743		break;
1744
1745	<	DLINK_FOREACH(ptr, block_state.mask.list.head)
1745	>	DLINK_FOREACH(node, block_state.mask.list.head)
1746		{
1747		struct MaskItem *conf = NULL;
1748		struct split_nuh_item nuh;
1749
1750	<	nuh.nuhmask  = ptr->data;
1750	>	nuh.nuhmask  = node->data;
1751		nuh.nickptr  = NULL;
1752		nuh.userptr  = block_state.user.buf;
1753		nuh.hostptr  = block_state.host.buf;

Diff Legend

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