projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Change default max-level value to 100.
[privoxy.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index
a66c464
..
967a974
100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-1,4
+1,4
@@
-const char actions_rcs[] = "$Id: actions.c,v 1.5
3 2008/05/26 16:04:04
fabiankeil Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.5
4 2008/09/20 10:04:33
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/actions.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/actions.c,v $
@@
-33,6
+33,10
@@
const char actions_rcs[] = "$Id: actions.c,v 1.53 2008/05/26 16:04:04 fabiankeil
*
* Revisions :
* $Log: actions.c,v $
*
* Revisions :
* $Log: actions.c,v $
+ * 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.53 2008/05/26 16:04:04 fabiankeil
* s@memorey@memory@
*
@@
-683,7
+687,7
@@
static int action_used_to_be_valid(const char *action)
"vanilla-wafer",
"wafer"
};
"vanilla-wafer",
"wafer"
};
- int i;
+
unsigned
int i;
for (i = 0; i < SZ(formerly_valid_actions); i++)
{
for (i = 0; i < SZ(formerly_valid_actions); i++)
{
@@
-870,12
+874,12
@@
jb_err get_actions(char *line,
/* Found it */
merge_actions(cur_action, alias->action);
}
/* 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);
}
{
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. "
{
log_error(LOG_LEVEL_FATAL, "The action 'hide-forwarded-for-headers' "
"is no longer valid in this Privoxy release. "
@@
-1353,7
+1357,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;
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);
{
/* too short */
fclose(fp);