projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add drain_and_close_socket()
[privoxy.git]
/
loaders.c
diff --git
a/loaders.c
b/loaders.c
index
f277c51
..
69febbc
100644
(file)
--- a/
loaders.c
+++ b/
loaders.c
@@
-1,4
+1,4
@@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.
89 2012/03/09 16:24:36
fabiankeil Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.
91 2012/06/19 12:50:22
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
@@
-8,7
+8,7
@@
const char loaders_rcs[] = "$Id: loaders.c,v 1.89 2012/03/09 16:24:36 fabiankeil
* the list of active loaders, and to automatically
* unload files that are no longer in use.
*
* the list of active loaders, and to automatically
* unload files that are no longer in use.
*
- * Copyright : Written by and Copyright (C) 2001-201
0
the
+ * Copyright : Written by and Copyright (C) 2001-201
2
the
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@
-81,11
+81,6
@@
static struct file_list *current_re_filterfile[MAX_AF_FILES] = {
NULL, NULL, NULL, NULL, NULL
};
NULL, NULL, NULL, NULL, NULL
};
-/*
- * Pseudo filter type for load_one_re_filterfile
- */
-#define NO_NEW_FILTER -1
-
/*********************************************************************
*
/*********************************************************************
*
@@
-1152,7
+1147,7
@@
int load_one_re_filterfile(struct client_state *csp, int fileid)
*/
while (read_config_line(fp, &linenum, &buf) != NULL)
{
*/
while (read_config_line(fp, &linenum, &buf) != NULL)
{
-
int new_filter = NO_NEW
_FILTER;
+
enum filter_type new_filter = FT_INVALID
_FILTER;
if (strncmp(buf, "FILTER:", 7) == 0)
{
if (strncmp(buf, "FILTER:", 7) == 0)
{
@@
-1179,7
+1174,7
@@
int load_one_re_filterfile(struct client_state *csp, int fileid)
* If this is the head of a new filter block, make it a
* re_filterfile spec of its own and chain it to the list:
*/
* If this is the head of a new filter block, make it a
* re_filterfile spec of its own and chain it to the list:
*/
- if (new_filter !=
NO_NEW
_FILTER)
+ if (new_filter !=
FT_INVALID
_FILTER)
{
new_bl = (struct re_filterfile_spec *)zalloc(sizeof(*bl));
if (new_bl == NULL)
{
new_bl = (struct re_filterfile_spec *)zalloc(sizeof(*bl));
if (new_bl == NULL)