X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.c;h=471229545e9ccbed2f54f71caf6b85b9e7ebb43d;hp=ef4e57d6fcb1fd8e67885560872228bf03643bd6;hb=c884f226dd358b59aa839be92c9adcd461501efc;hpb=2bcb59f4bc5274e9ad2b50fbe78e8e39b3b57282 diff --git a/loaders.c b/loaders.c index ef4e57d6..47122954 100644 --- a/loaders.c +++ b/loaders.c @@ -46,7 +46,7 @@ #include #include -#if !defined(_WIN32) && !defined(__OS2__) +#if !defined(_WIN32) #include #endif @@ -116,6 +116,9 @@ void free_csp_resources(struct client_state *csp) destroy_list(csp->https_headers); #endif destroy_list(csp->tags); +#ifdef FEATURE_CLIENT_TAGS + destroy_list(csp->client_tags); +#endif free_current_action(csp->action); } @@ -1208,7 +1211,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) /* * If this is the first filter block, chain it - * to the file_list rather than its (nonexistant) + * to the file_list rather than its (nonexistent) * predecessor */ if (fs->f == NULL) @@ -1223,7 +1226,9 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) bl = new_bl; log_error(LOG_LEVEL_RE_FILTER, "Reading in filter \"%s\" (\"%s\")", bl->name, bl->description); - +#ifdef FEATURE_EXTENDED_STATISTICS + register_filter_for_statistics(bl->name); +#endif freez(buf); continue; } @@ -1235,7 +1240,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) /* Save the code as "pattern", but do not compile anything. */ if (bl->patterns->first != NULL) { - log_error(LOG_LEVEL_FATAL, "External filter '%s' contains several jobss. " + log_error(LOG_LEVEL_FATAL, "External filter '%s' contains several jobs. " "Did you forget to escape a line break?", bl->name); } @@ -1320,7 +1325,8 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) } else { - log_error(LOG_LEVEL_ERROR, "Ignoring job %s outside filter block in %s, line %d", + log_error(LOG_LEVEL_ERROR, + "Ignoring job %s outside filter block in %s, line %lu", buf, csp->config->re_filterfile[fileid], linenum); } freez(buf);