X-Git-Url: http://www.privoxy.org/gitweb/templates.html?a=blobdiff_plain;f=actions.c;h=9fd3249cbf1fc43f183d291a1b9511be8e0ea42e;hb=5415008eafe007b95daa7801ff53bcf13ae52a6a;hp=6a30577caeb4355c387bfaeb922fb1cfeea24e71;hpb=73b7af6379688bc06717396e36bfdf55a994af95;p=privoxy.git

diff --git a/actions.c b/actions.c
index 6a30577c..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";
    }
@@ -1210,7 +1214,7 @@ static int action_spec_is_valid(struct client_state *csp, const struct action_sp
  *
  * Function    :  load_one_actions_file
  *
- * Description :  Read and parse a action file and add to files
+ * Description :  Read and parse an action file and add to files
  *                list.
  *
  * Parameters  :
@@ -1644,7 +1648,7 @@ int load_one_actions_file(struct client_state *csp, int fileid)
  *
  * Function    :  actions_to_text
  *
- * Description :  Converts a actionsfile entry from the internal
+ * Description :  Converts an actionsfile entry from the internal
  *                structure into a text line.  The output is split
  *                into one line for each action with line continuation.
  *
@@ -1730,7 +1734,7 @@ char * actions_to_text(const struct action_spec *action)
  *
  * Function    :  actions_to_html
  *
- * Description :  Converts a actionsfile entry from numeric form
+ * Description :  Converts an actionsfile entry from numeric form
  *                ("mask" and "add") to a <br>-separated HTML string
  *                in which each action is linked to its chapter in
  *                the user manual.
@@ -1933,7 +1937,7 @@ char *current_action_to_html(const struct client_state *csp,
  *
  * Function    :  action_to_line_of_text
  *
- * Description :  Converts a action spec to a single text line
+ * Description :  Converts an action spec to a single text line
  *                listing the enabled actions.
  *
  * Parameters  :