X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=actions.c;h=7de2fef8c359d0328659f3908c042e4eb1c9ba54;hp=949059a89a08c382679ff24cc455d9e2ee1e050a;hb=cc77d4eec4405c7a88977ee93f0d317827aba968;hpb=36f5fa200c2685ff053539184c83f1d909f0da05

diff --git a/actions.c b/actions.c
index 949059a8..7de2fef8 100644
--- a/actions.c
+++ b/actions.c
@@ -1,4 +1,4 @@
-const char actions_rcs[] = "$Id: actions.c,v 1.46 2008/03/27 18:27:20 fabiankeil Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.48 2008/03/28 18:17:14 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $
@@ -33,6 +33,13 @@ const char actions_rcs[] = "$Id: actions.c,v 1.46 2008/03/27 18:27:20 fabiankeil
  *
  * Revisions   :
  *    $Log: actions.c,v $
+ *    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.
+ *
  *    Revision 1.46  2008/03/27 18:27:20  fabiankeil
  *    Remove kill-popups action.
  *
@@ -638,7 +645,7 @@ jb_err get_action_token(char **line, char **name, char **value)
 
 /*********************************************************************
  *
- * Function    :  action_used_to_valid_
+ * Function    :  action_used_to_be_valid
  *
  * Description :  Checks if unrecognized actions were valid in earlier
  *                releases.
@@ -651,9 +658,26 @@ jb_err get_action_token(char **line, char **name, char **value)
  *********************************************************************/
 static int action_used_to_be_valid(const char *action)
 {
-   return ((0 == strcmpic(action, "treat-forbidden-connects-like-blocks"))
-        || (0 == strcmpic(action, "kill-popups"))
-        || (0 == strcmpic(action, "inspect-jpegs")));
+   static const char *formerly_valid_actions[] = {
+      "inspect-jpegs",
+      "kill-popups",
+      "send-vanilla-wafer",
+      "send-wafer",
+      "treat-forbidden-connects-like-blocks",
+      "vanilla-wafer",
+      "wafer"
+   };
+   int i;
+
+   for (i = 0; i < SZ(formerly_valid_actions); i++)
+   {
+      if (0 == strcmpic(action, formerly_valid_actions[i]))
+      {
+         return TRUE;
+      }
+   }
+
+   return FALSE;
 }
 
 /*********************************************************************