X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=actions.c;h=7dc34781d519f576e2d4c45331b9ea688bc71bf7;hp=d6d9d9a6b6ecff026b93d29d3944f7a4edbbd7e6;hb=5b366a65be8550ee01cc3e7cf2495a2f4f2bd870;hpb=86a4423a5e84053a36fea6b04dc36776f5d0463e

diff --git a/actions.c b/actions.c
index d6d9d9a6..7dc34781 100644
--- a/actions.c
+++ b/actions.c
@@ -1,4 +1,4 @@
-const char actions_rcs[] = "$Id: actions.c,v 1.47 2008/03/28 15:13:37 fabiankeil Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.52 2008/04/27 16:26:59 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $
@@ -33,6 +33,23 @@ const char actions_rcs[] = "$Id: actions.c,v 1.47 2008/03/28 15:13:37 fabiankeil
  *
  * Revisions   :
  *    $Log: actions.c,v $
+ *    Revision 1.52  2008/04/27 16:26:59  fabiankeil
+ *    White space fix for the last commit.
+ *
+ *    Revision 1.51  2008/04/27 16:20:19  fabiankeil
+ *    Complain about every block action without reason found.
+ *
+ *    Revision 1.50  2008/03/30 14:52:00  fabiankeil
+ *    Rename load_actions_file() and load_re_filterfile()
+ *    as they load multiple files "now".
+ *
+ *    Revision 1.49  2008/03/29 12:13:45  fabiankeil
+ *    Remove send-wafer and send-vanilla-wafer actions.
+ *
+ *    Revision 1.48  2008/03/28 18:17:14  fabiankeil
+ *    In action_used_to_be_valid(), loop through an array of formerly
+ *    valid actions instead of using an OR-chain of strcmpic() calls.
+ *
  *    Revision 1.47  2008/03/28 15:13:37  fabiankeil
  *    Remove inspect-jpegs action.
  *
@@ -657,7 +674,11 @@ static int action_used_to_be_valid(const char *action)
    static const char *formerly_valid_actions[] = {
       "inspect-jpegs",
       "kill-popups",
-      "treat-forbidden-connects-like-blocks"
+      "send-vanilla-wafer",
+      "send-wafer",
+      "treat-forbidden-connects-like-blocks",
+      "vanilla-wafer",
+      "wafer"
    };
    int i;
 
@@ -742,16 +763,12 @@ jb_err get_actions(char *line,
                      {
                         /*
                          * XXX: Temporary backwards compatibility hack.
+                         * XXX: should include line number.
                          */
-                        static int complaint_shown = 0;
                         value = "No reason specified.";
-                        if (!complaint_shown)
-                        {
-                           log_error(LOG_LEVEL_ERROR, "At least one block "
-                              "without reason found. This may become a fatal "
-                              "error in future versions.");
-                           complaint_shown = 1;
-                        }
+                        log_error(LOG_LEVEL_ERROR,
+                           "block action without reason found. This may "
+                           "become a fatal error in future versions.");
                      }
                      else
                      {
@@ -1068,7 +1085,7 @@ int update_action_bits_for_tag(struct client_state *csp, const char *tag)
             if (merge_current_action(csp->action, b->action))
             {
                log_error(LOG_LEVEL_ERROR,
-                  "Out of memorey while changing action bits");
+                  "Out of memory while changing action bits");
             }
             /* and signal the change. */
             updated = 1;
@@ -1211,7 +1228,7 @@ void free_alias_list(struct action_alias *alias_list)
 
 /*********************************************************************
  *
- * Function    :  load_actions_file
+ * Function    :  load_action_files
  *
  * Description :  Read and parse all the action files and add to files
  *                list.
@@ -1222,7 +1239,7 @@ void free_alias_list(struct action_alias *alias_list)
  * Returns     :  0 => Ok, everything else is an error.
  *
  *********************************************************************/
-int load_actions_file(struct client_state *csp)
+int load_action_files(struct client_state *csp)
 {
    int i;
    int result;