X-Git-Url: http://www.privoxy.org/gitweb/developer-manual/index.html?a=blobdiff_plain;f=actions.c;h=9fd3249cbf1fc43f183d291a1b9511be8e0ea42e;hb=HEAD;hp=95646b6655bc4f01729cfdea30d969531e70afbb;hpb=97ece6ccd519d55dd9e480c7d23c5befe975c450;p=privoxy.git diff --git a/actions.c b/actions.c index 95646b66..9fd3249c 100644 --- a/actions.c +++ b/actions.c @@ -829,7 +829,7 @@ int update_action_bits_for_tag(struct client_state *csp, const char *tag) } /* and check if one of the tag patterns matches the tag, */ - if (0 == regexec(b->url->pattern.tag_regex, tag, 0, NULL, 0)) + if (regex_matches(b->url->pattern.tag_regex, tag)) { /* if it does, update the action bit map, */ if (merge_current_action(csp->action, b->action)) @@ -884,7 +884,7 @@ jb_err check_negative_tag_patterns(struct client_state *csp, unsigned int flag) } for (tag = csp->tags->first; NULL != tag; tag = tag->next) { - if (0 == regexec(b->url->pattern.tag_regex, tag->str, 0, NULL, 0)) + if (regex_matches(b->url->pattern.tag_regex, tag->str)) { /* * The pattern matches at least one tag, thus the action @@ -1111,14 +1111,18 @@ static const char *filter_type_to_string(enum filter_type filter_type) return "client-header tagger"; case FT_SERVER_HEADER_TAGGER: return "server-header tagger"; -#ifdef FEATURE_EXTERNAL_FILTERS - case FT_EXTERNAL_CONTENT_FILTER: - return "external content filter"; -#endif case FT_SUPPRESS_TAG: return "suppress tag filter"; case FT_CLIENT_BODY_FILTER: return "client body filter"; + case FT_CLIENT_BODY_TAGGER: + return "client body tagger"; + case FT_ADD_HEADER: + return "add-header action"; +#ifdef FEATURE_EXTERNAL_FILTERS + case FT_EXTERNAL_CONTENT_FILTER: + return "external content filter"; +#endif case FT_INVALID_FILTER: return "invalid filter type"; }