X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=actions.c;h=7dc34781d519f576e2d4c45331b9ea688bc71bf7;hb=03268a195b58133462f866853c7141ac96160c89;hp=2f877685d3e4c14711d818baeebbc8149c867d6a;hpb=667cbfed6af943f445f0bd158e6177ebd948a023;p=privoxy.git diff --git a/actions.c b/actions.c index 2f877685..7dc34781 100644 --- a/actions.c +++ b/actions.c @@ -1,4 +1,4 @@ -const char actions_rcs[] = "$Id: actions.c,v 1.49 2008/03/29 12:13:45 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,16 @@ const char actions_rcs[] = "$Id: actions.c,v 1.49 2008/03/29 12:13:45 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. * @@ -753,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 { @@ -1079,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;