-const char actions_rcs[] = "$Id: actions.c,v 1.52 2008/04/27 16:26:59 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 $
*
* 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@
+ *
* Revision 1.52 2008/04/27 16:26:59 fabiankeil
* White space fix for the last commit.
*
"vanilla-wafer",
"wafer"
};
- int i;
+ unsigned int i;
for (i = 0; i < SZ(formerly_valid_actions); i++)
{
/* 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 (((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. "
+ "Use 'change-x-forwarded-for' instead.");
+ }
else
{
/* Bad action name */
* Returns : N/A
*
*********************************************************************/
-void free_current_action (struct current_action_spec *src)
+void free_current_action(struct current_action_spec *src)
{
int i;
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);
*********************************************************************/
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" */
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" */