X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=actions.c;h=d87d37450cbc0dd7d089c354ab05658a778b0667;hb=81471709ec12ed60c7e6d10a5d83568c79563b8b;hp=a66c4645da41204eba6bca21291b8d646a99837a;hpb=d48514c14861e7f176781c3245b1bc963821e65b;p=privoxy.git

diff --git a/actions.c b/actions.c
index a66c4645..d87d3745 100644
--- a/actions.c
+++ b/actions.c
@@ -1,4 +1,4 @@
-const char actions_rcs[] = "$Id: actions.c,v 1.53 2008/05/26 16:04:04 fabiankeil Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.56 2009/03/08 14:19:21 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $
@@ -33,6 +33,17 @@ const char actions_rcs[] = "$Id: actions.c,v 1.53 2008/05/26 16:04:04 fabiankeil
  *
  * Revisions   :
  *    $Log: actions.c,v $
+ *    Revision 1.56  2009/03/08 14:19:21  fabiankeil
+ *    Fix justified (but harmless) compiler warnings
+ *    on platforms where sizeof(int) < sizeof(long).
+ *
+ *    Revision 1.55  2008/12/04 18:18:56  fabiankeil
+ *    Fix some cparser warnings.
+ *
+ *    Revision 1.54  2008/09/20 10:04:33  fabiankeil
+ *    Remove hide-forwarded-for-headers action which has
+ *    been obsoleted by change-x-forwarded-for{block}.
+ *
  *    Revision 1.53  2008/05/26 16:04:04  fabiankeil
  *    s@memorey@memory@
  *
@@ -683,7 +694,7 @@ static int action_used_to_be_valid(const char *action)
       "vanilla-wafer",
       "wafer"
    };
-   int i;
+   unsigned int i;
 
    for (i = 0; i < SZ(formerly_valid_actions); i++)
    {
@@ -870,12 +881,12 @@ jb_err get_actions(char *line,
                /* Found it */
                merge_actions(cur_action, alias->action);
             }
-            else if ((2 < strlen(option)) && action_used_to_be_valid(option+1))
+            else if (((size_t)2 < strlen(option)) && action_used_to_be_valid(option+1))
             {
                log_error(LOG_LEVEL_ERROR, "Action '%s' is no longer valid "
                   "in this Privoxy release. Ignored.", option+1);
             }
-            else if ((2 < strlen(option)) && 0 == strcmpic(option+1, "hide-forwarded-for-headers"))
+            else if (((size_t)2 < strlen(option)) && 0 == strcmpic(option+1, "hide-forwarded-for-headers"))
             {
                log_error(LOG_LEVEL_FATAL, "The action 'hide-forwarded-for-headers' "
                   "is no longer valid in this Privoxy release. "
@@ -1119,7 +1130,7 @@ int update_action_bits_for_tag(struct client_state *csp, const char *tag)
  * Returns     :  N/A
  *
  *********************************************************************/
-void free_current_action (struct current_action_spec *src)
+void free_current_action(struct current_action_spec *src)
 {
    int i;
 
@@ -1353,7 +1364,7 @@ static int load_one_actions_file(struct client_state *csp, int fileid)
             size_t len = strlen(buf);
             char * start = buf + 2;
             char * end = buf + len - 1;
-            if ((len < 5) || (*end-- != '}') || (*end-- != '}'))
+            if ((len < (size_t)5) || (*end-- != '}') || (*end-- != '}'))
             {
                /* too short */
                fclose(fp);
@@ -1738,9 +1749,9 @@ static int load_one_actions_file(struct client_state *csp, int fileid)
  *********************************************************************/
 char * actions_to_text(const struct action_spec *action)
 {
-   unsigned mask = action->mask;
-   unsigned add  = action->add;
-   char * result = strdup("");
+   unsigned long mask = action->mask;
+   unsigned long add  = action->add;
+   char *result = strdup("");
    struct list_entry * lst;
 
    /* sanity - prevents "-feature +feature" */
@@ -1827,9 +1838,9 @@ char * actions_to_text(const struct action_spec *action)
 char * actions_to_html(const struct client_state *csp,
                        const struct action_spec *action)
 {
-   unsigned mask = action->mask;
-   unsigned add  = action->add;
-   char * result = strdup("");
+   unsigned long mask = action->mask;
+   unsigned long add  = action->add;
+   char *result = strdup("");
    struct list_entry * lst;
 
    /* sanity - prevents "-feature +feature" */