projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
privoxy version bump in newrelease.html
[privoxy.git]
/
loaders.c
diff --git
a/loaders.c
b/loaders.c
index
16529e0
..
65aba0a
100644
(file)
--- a/
loaders.c
+++ b/
loaders.c
@@
-1,4
+1,3
@@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.107 2017/06/26 12:17:43 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
@@
-63,8
+62,6
@@
const char loaders_rcs[] = "$Id: loaders.c,v 1.107 2017/06/26 12:17:43 fabiankei
#include "urlmatch.h"
#include "encode.h"
#include "urlmatch.h"
#include "encode.h"
-const char loaders_h_rcs[] = LOADERS_H_VERSION;
-
/*
* Currently active files.
* These are also entered in the main linked list of files.
/*
* Currently active files.
* These are also entered in the main linked list of files.
@@
-313,12
+310,6
@@
int check_file_changed(const struct file_list * current,
fs->filename = strdup_or_die(filename);
fs->lastmodified = statbuf->st_mtime;
fs->filename = strdup_or_die(filename);
fs->lastmodified = statbuf->st_mtime;
- if (fs->filename == NULL)
- {
- /* Out of memory error */
- freez (fs);
- return 1;
- }
*newfl = fs;
return 1;
}
*newfl = fs;
return 1;
}
@@
-1106,7
+1097,6
@@
int load_one_re_filterfile(struct client_state *csp, int fileid)
struct file_list *fs;
char *buf = NULL;
struct file_list *fs;
char *buf = NULL;
- int error;
unsigned long linenum = 0;
pcrs_job *dummy, *lastjob = NULL;
unsigned long linenum = 0;
pcrs_job *dummy, *lastjob = NULL;
@@
-1236,6
+1226,7
@@
int load_one_re_filterfile(struct client_state *csp, int fileid)
#ifdef FEATURE_EXTERNAL_FILTERS
if ((bl != NULL) && (bl->type == FT_EXTERNAL_CONTENT_FILTER))
{
#ifdef FEATURE_EXTERNAL_FILTERS
if ((bl != NULL) && (bl->type == FT_EXTERNAL_CONTENT_FILTER))
{
+ jb_err jb_error;
/* Save the code as "pattern", but do not compile anything. */
if (bl->patterns->first != NULL)
{
/* Save the code as "pattern", but do not compile anything. */
if (bl->patterns->first != NULL)
{
@@
-1243,8
+1234,8
@@
int load_one_re_filterfile(struct client_state *csp, int fileid)
"Did you forget to escape a line break?",
bl->name);
}
"Did you forget to escape a line break?",
bl->name);
}
- error = enlist(bl->patterns, buf);
- if (JB_ERR_MEMORY == error)
+
jb_
error = enlist(bl->patterns, buf);
+ if (JB_ERR_MEMORY ==
jb_
error)
{
log_error(LOG_LEVEL_FATAL,
"Out of memory while enlisting external filter code \'%s\' for filter %s.",
{
log_error(LOG_LEVEL_FATAL,
"Out of memory while enlisting external filter code \'%s\' for filter %s.",
@@
-1256,17
+1247,19
@@
int load_one_re_filterfile(struct client_state *csp, int fileid)
#endif
if (bl != NULL)
{
#endif
if (bl != NULL)
{
+ int pcrs_error;
+ jb_err jb_error;
/*
* Save the expression, make it a pcrs_job
* and chain it into the current filter's joblist
*/
/*
* Save the expression, make it a pcrs_job
* and chain it into the current filter's joblist
*/
- error = enlist(bl->patterns, buf);
- if (JB_ERR_MEMORY == error)
+
jb_
error = enlist(bl->patterns, buf);
+ if (JB_ERR_MEMORY ==
jb_
error)
{
log_error(LOG_LEVEL_FATAL,
"Out of memory while enlisting re_filter job \'%s\' for filter %s.", buf, bl->name);
}
{
log_error(LOG_LEVEL_FATAL,
"Out of memory while enlisting re_filter job \'%s\' for filter %s.", buf, bl->name);
}
- assert(JB_ERR_OK == error);
+ assert(JB_ERR_OK ==
jb_
error);
if (pcrs_job_is_dynamic(buf))
{
if (pcrs_job_is_dynamic(buf))
{
@@
-1298,11
+1291,11
@@
int load_one_re_filterfile(struct client_state *csp, int fileid)
continue;
}
continue;
}
- if ((dummy = pcrs_compile_command(buf, &error)) == NULL)
+ if ((dummy = pcrs_compile_command(buf, &
pcrs_
error)) == NULL)
{
log_error(LOG_LEVEL_ERROR,
"Adding re_filter job \'%s\' to filter %s failed: %s",
{
log_error(LOG_LEVEL_ERROR,
"Adding re_filter job \'%s\' to filter %s failed: %s",
- buf, bl->name, pcrs_strerror(error));
+ buf, bl->name, pcrs_strerror(
pcrs_
error));
freez(buf);
continue;
}
freez(buf);
continue;
}