White space fix for the last commit.

[privoxy.git] / actions.c

diff --git a/actions.c b/actions.c
index 7de2fef..d9282cb 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -1,4 +1,4 @@
-const char actions_rcs[] = "$Id: actions.c,v 1.48 2008/03/28 18:17:14 fabiankeil Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.51 2008/04/27 16:20:19 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $
@@ -33,6 +33,16 @@ const char actions_rcs[] = "$Id: actions.c,v 1.48 2008/03/28 18:17:14 fabiankeil
  *
  * Revisions   :
  *    $Log: actions.c,v $
+ *    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.
@@ -750,16 +760,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
                      {
@@ -1219,7 +1225,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.
@@ -1230,7 +1236,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;