projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wahay!!! 3.0.x has branched!
[privoxy.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index
e5d320b
..
4b31f7f
100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-1,4
+1,4
@@
-const char actions_rcs[] = "$Id: actions.c,v 1.
29 2002/04/26 19:30:54 jongfoster
Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.
31 2002/05/06 07:56:50 oes
Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/actions.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/actions.c,v $
@@
-33,6
+33,12
@@
const char actions_rcs[] = "$Id: actions.c,v 1.29 2002/04/26 19:30:54 jongfoster
*
* Revisions :
* $Log: actions.c,v $
*
* Revisions :
* $Log: actions.c,v $
+ * Revision 1.31 2002/05/06 07:56:50 oes
+ * Made actions_to_html independent of FEATURE_CGI_EDIT_ACTIONS
+ *
+ * Revision 1.30 2002/04/30 11:14:52 oes
+ * Made csp the first parameter in *action_to_html
+ *
* Revision 1.29 2002/04/26 19:30:54 jongfoster
* - current_action_to_html(): Adding help link for the "-" form of
* one-string actions.
* Revision 1.29 2002/04/26 19:30:54 jongfoster
* - current_action_to_html(): Adding help link for the "-" form of
* one-string actions.
@@
-182,9
+188,7
@@
const char actions_rcs[] = "$Id: actions.c,v 1.29 2002/04/26 19:30:54 jongfoster
#include "miscutil.h"
#include "errlog.h"
#include "loaders.h"
#include "miscutil.h"
#include "errlog.h"
#include "loaders.h"
-#ifdef FEATURE_CGI_EDIT_ACTIONS
#include "encode.h"
#include "encode.h"
-#endif /* def FEATURE_CGI_EDIT_ACTIONS */
#include "urlmatch.h"
#include "cgi.h"
#include "urlmatch.h"
#include "cgi.h"
@@
-261,11
+265,11
@@
static int load_one_actions_file(struct client_state *csp, int fileid);
* Function : merge_actions
*
* Description : Merge two actions together.
* Function : merge_actions
*
* Description : Merge two actions together.
- * Similar to "
cur_action += new_action
".
+ * Similar to "
dest += src
".
*
* Parameters :
*
* Parameters :
- * 1 :
cur_action = Current actions,
to modify.
- * 2 :
new_action
= Action to add.
+ * 1 :
dest = Actions
to modify.
+ * 2 :
src
= Action to add.
*
* Returns : JB_ERR_OK or JB_ERR_MEMORY
*
*
* Returns : JB_ERR_OK or JB_ERR_MEMORY
*
@@
-336,7
+340,7
@@
jb_err merge_actions (struct action_spec *dest,
* Function : copy_action
*
* Description : Copy an action_specs.
* Function : copy_action
*
* Description : Copy an action_specs.
- * Similar to "
cur_action = new_action
".
+ * Similar to "
dest = src
".
*
* Parameters :
* 1 : dest = Destination of copy.
*
* Parameters :
* 1 : dest = Destination of copy.
@@
-542,7
+546,7
@@
jb_err get_action_token(char **line, char **name, char **value)
* Parameters :
* 1 : line = The string containing the actions.
* Will be written to by this function.
* Parameters :
* 1 : line = The string containing the actions.
* Will be written to by this function.
- * 2 : alias
es
= Custom alias list, or NULL for none.
+ * 2 : alias
_list
= Custom alias list, or NULL for none.
* 3 : cur_action = Where to store the action. Caller
* allocates memory.
*
* 3 : cur_action = Where to store the action. Caller
* allocates memory.
*
@@
-1377,13
+1381,12
@@
static int load_one_actions_file(struct client_state *csp, int fileid)
*
* Function : actions_to_text
*
*
* Function : actions_to_text
*
- * Description : Converts a actionsfile entry from
numeric form
- *
("mask" and "add") to a text line which
is split
+ * Description : Converts a actionsfile entry from
the internal
+ *
structurt into a text line. The output
is split
* into one line for each action with line continuation.
*
* Parameters :
* into one line for each action with line continuation.
*
* Parameters :
- * 1 : mask = As from struct url_actions
- * 2 : add = As from struct url_actions
+ * 1 : action = The action to format.
*
* Returns : A string. Caller must free it.
* NULL on out-of-memory error.
*
* Returns : A string. Caller must free it.
* NULL on out-of-memory error.
@@
-1460,7
+1463,6
@@
char * actions_to_text(struct action_spec *action)
}
}
-#ifdef FEATURE_CGI_EDIT_ACTIONS
/*********************************************************************
*
* Function : actions_to_html
/*********************************************************************
*
* Function : actions_to_html
@@
-1566,7
+1568,6
@@
char * actions_to_html(struct client_state *csp,
return result;
}
return result;
}
-#endif /* def FEATURE_CGI_EDIT_ACTIONS */
/*********************************************************************
/*********************************************************************