From: oes <oes@users.sourceforge.net>
Date: Mon, 6 May 2002 07:56:50 +0000 (+0000)
Subject: Made actions_to_html independent of FEATURE_CGI_EDIT_ACTIONS
X-Git-Tag: v_3_0_branchpoint~109
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=dfb9a1ebaeacec72783009c3c7c7b58dea4a4fcc;ds=sidebyside

Made actions_to_html independent of FEATURE_CGI_EDIT_ACTIONS
---

diff --git a/actions.c b/actions.c
index e5d320b4..aa1d0264 100644
--- 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.30 2002/04/30 11:14:52 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $
@@ -33,6 +33,9 @@ const char actions_rcs[] = "$Id: actions.c,v 1.29 2002/04/26 19:30:54 jongfoster
  *
  * Revisions   :
  *    $Log: actions.c,v $
+ *    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.
@@ -182,9 +185,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"
-#ifdef FEATURE_CGI_EDIT_ACTIONS
 #include "encode.h"
-#endif /* def FEATURE_CGI_EDIT_ACTIONS */
 #include "urlmatch.h"
 #include "cgi.h"
 
@@ -1460,7 +1461,6 @@ char * actions_to_text(struct action_spec *action)
 }
 
 
-#ifdef FEATURE_CGI_EDIT_ACTIONS
 /*********************************************************************
  *
  * Function    :  actions_to_html
@@ -1566,7 +1566,6 @@ char * actions_to_html(struct client_state *csp,
 
    return result;
 }
-#endif /* def FEATURE_CGI_EDIT_ACTIONS */
 
 
 /*********************************************************************
diff --git a/actions.h b/actions.h
index f02f026c..f4365f0e 100644
--- a/actions.h
+++ b/actions.h
@@ -1,6 +1,6 @@
 #ifndef ACTIONS_H_INCLUDED
 #define ACTIONS_H_INCLUDED
-#define ACTIONS_H_VERSION "$Id: actions.h,v 1.10 2002/04/26 12:53:33 oes Exp $"
+#define ACTIONS_H_VERSION "$Id: actions.h,v 1.11 2002/04/30 11:14:52 oes Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.h,v $
@@ -35,6 +35,9 @@
  *
  * Revisions   :
  *    $Log: actions.h,v $
+ *    Revision 1.11  2002/04/30 11:14:52  oes
+ *    Made csp the first parameter in *action_to_html
+ *
  *    Revision 1.10  2002/04/26 12:53:33  oes
  *     -  actions_to_html signature change
  *     -  current_action_to_text: renamed to current_action_to_html
@@ -119,11 +122,8 @@ extern jb_err merge_actions (struct action_spec *dest,
 extern jb_err copy_action (struct action_spec *dest, 
                            const struct action_spec *src);
 extern char * actions_to_text     (struct action_spec *action);
-#ifdef FEATURE_CGI_EDIT_ACTIONS
 extern char * actions_to_html     (struct client_state *csp,
                                    struct action_spec *action);
-#endif /* def FEATURE_CGI_EDIT_ACTIONS */
-
 extern void init_current_action     (struct current_action_spec *dest);
 extern void free_current_action     (struct current_action_spec *src);
 extern jb_err merge_current_action  (struct current_action_spec *dest,