ViewVC Help

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

root/svn/ircd-hybrid-7.3/src/csvlib.c

Comparing ircd-hybrid-7.2/src/csvlib.c (file contents):
Revision 1005 by michael, Mon Aug 31 23:07:43 2009 UTC vs.
Revision 1009 by michael, Sun Sep 13 15:02:30 2009 UTC

#	Line 9 | Line 9
9		*  $Id$
10		*/
11
12	+	#include "config.h"
13	+	#ifdef HAVE_LIBPCRE
14	+	#include <pcre.h>
15	+	#endif
16		#include "stdinc.h"
17		#include "tools.h"
18		#include "s_log.h"
19		#include "s_conf.h"
20		#include "hostmask.h"
21		#include "client.h"
18	–	#include "pcre.h"
22		#include "irc_string.h"
23		#include "sprintf_irc.h"
24		#include "memory.h"
#	Line 80 | Line 83 | parse_csv_file(FBFILE *file, ConfType co
83		if (aconf->host != NULL)
84		add_conf_by_address(CONF_KILL, aconf);
85		break;
86	<
86	>	#ifdef HAVE_LIBPCRE
87		case RKLINE_TYPE:
88		{
89		const char *errptr = NULL;
#	Line 114 | Line 117 | parse_csv_file(FBFILE *file, ConfType co
117
118		}
119		break;
120	<
120	>	#endif
121		case DLINE_TYPE:
122		parse_csv_line(line, &host_field, &reason_field, NULL);
123
#	Line 141 | Line 144 | parse_csv_file(FBFILE *file, ConfType co
144		if (reason_field != NULL)
145		DupString(match_item->reason, reason_field);
146		break;
147	<
147	>	#ifdef HAVE_LIBPCRE
148		case RXLINE_TYPE:
149		{
150		const char *errptr = NULL;
#	Line 170 | Line 173 | parse_csv_file(FBFILE *file, ConfType co
173		DupString(match_item->reason, "No reason");
174		}
175		break;
176	<
176	>	#endif
177		case CRESV_TYPE:
178		parse_csv_line(line, &name_field, &reason_field, NULL);
179		(void)create_channel_resv(name_field, reason_field, 0);
#	Line 193 | Line 196 | parse_csv_file(FBFILE *file, ConfType co
196		case ULINE_TYPE:
197		case EXEMPTDLINE_TYPE:
198		case CLASS_TYPE:
199	+	default:
200		break;
201		}
202		}
#	Line 293 | Line 297 | write_conf_line(struct Client *source_p,
297		aconf->reason, aconf->oper_reason, current_date,
298		get_oper_name(source_p), cur_time);
299		break;
300	<
300	>	#ifdef HAVE_LIBPCRE
301		case RKLINE_TYPE:
302		aconf = map_to_conf(conf);
303		sendto_realops_flags(UMODE_ALL, L_ALL,
#	Line 311 | Line 315 | write_conf_line(struct Client *source_p,
315		aconf->reason, aconf->oper_reason, current_date,
316		get_oper_name(source_p), cur_time);
317		break;
318	<
318	>	#endif
319		case DLINE_TYPE:
320		aconf = (struct AccessItem *)map_to_conf(conf);
321		sendto_realops_flags(UMODE_ALL, L_ALL,
#	Line 345 | Line 349 | write_conf_line(struct Client *source_p,
349		conf->name, xconf->reason, xconf->oper_reason,
350		current_date, get_oper_name(source_p), cur_time);
351		break;
352	<
352	>	#ifdef HAVE_LIBPCRE
353		case RXLINE_TYPE:
354		xconf = (struct MatchItem *)map_to_conf(conf);
355		sendto_realops_flags(UMODE_ALL, L_ALL,
#	Line 362 | Line 366 | write_conf_line(struct Client *source_p,
366		conf->name, xconf->reason, xconf->oper_reason,
367		current_date, get_oper_name(source_p), cur_time);
368		break;
369	<
369	>	#endif
370		case CRESV_TYPE:
371		cresv_p = (struct ResvChannel *)map_to_conf(conf);
372

Diff Legend

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