In action_used_to_be_valid(), loop through an array of formerly

valid actions instead of using an OR-chain of strcmpic() calls.

diff --git a/actions.c b/actions.c
index 949059a..d6d9d9a 100644 (file)
--- 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.47 2008/03/28 15:13:37 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $
@@ -33,6 +33,9 @@ const char actions_rcs[] = "$Id: actions.c,v 1.46 2008/03/27 18:27:20 fabiankeil
  *
  * Revisions   :
  *    $Log: actions.c,v $
+ *    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 +641,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 +654,22 @@ 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",
+      "treat-forbidden-connects-like-blocks"
+   };
+   int i;
+
+   for (i = 0; i < SZ(formerly_valid_actions); i++)
+   {
+      if (0 == strcmpic(action, formerly_valid_actions[i]))
+      {
+         return TRUE;
+      }
+   }
+
+   return FALSE;
 }
 
 /*********************************************************************