- Mark some parameters as immutable.

- Hide update_action_bits_for_all_tags() while it's unused.

diff --git a/actions.c b/actions.c
index ab3bbd7..fc61297 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -1,4 +1,4 @@
-const char actions_rcs[] = "$Id: actions.c,v 1.39 2007/04/17 18:21:45 fabiankeil Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.40 2007/05/21 10:26:50 fabiankeil Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $


@@ -33,6 +33,11 @@ const char actions_rcs[] = "$Id: actions.c,v 1.39 2007/04/17 18:21:45 fabiankeil
  *
  * Revisions   :
  *    $Log: actions.c,v $
  *
  * Revisions   :
  *    $Log: actions.c,v $

+ *    Revision 1.40  2007/05/21 10:26:50  fabiankeil
+ *    - Use strlcpy() instead of strcpy().
+ *    - Provide a reason why loading the actions
+ *      file might have failed.
+ *

  *    Revision 1.39  2007/04/17 18:21:45  fabiankeil
  *    Split update_action_bits() into
  *    update_action_bits_for_all_tags()
  *    Revision 1.39  2007/04/17 18:21:45  fabiankeil
  *    Split update_action_bits() into
  *    update_action_bits_for_all_tags()


@@ -880,7 +885,7 @@ jb_err merge_current_action (struct current_action_spec *dest,
    return err;
 }
 
    return err;
 }
 

-
+#if 0

 /*********************************************************************
  *
  * Function    :  update_action_bits_for_all_tags
 /*********************************************************************
  *
  * Function    :  update_action_bits_for_all_tags


@@ -909,7 +914,7 @@ int update_action_bits_for_all_tags(struct client_state *csp)
 
    return updated;
 }
 
    return updated;
 }

-
+#endif

 
 /*********************************************************************
  *
 
 /*********************************************************************
  *


@@ -1596,7 +1601,7 @@ static int load_one_actions_file(struct client_state *csp, int fileid)
  *                NULL on out-of-memory error.
  *
  *********************************************************************/
  *                NULL on out-of-memory error.
  *
  *********************************************************************/

-char * actions_to_text(struct action_spec *action)
+char * actions_to_text(const struct action_spec *action)

 {
    unsigned mask = action->mask;
    unsigned add  = action->add;
 {
    unsigned mask = action->mask;
    unsigned add  = action->add;


@@ -1684,8 +1689,8 @@ char * actions_to_text(struct action_spec *action)
  *                NULL on out-of-memory error.
  *
  *********************************************************************/
  *                NULL on out-of-memory error.
  *
  *********************************************************************/

-char * actions_to_html(struct client_state *csp,
-                       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;
 {
    unsigned mask = action->mask;
    unsigned add  = action->add;


@@ -1790,8 +1795,8 @@ char * actions_to_html(struct client_state *csp,
  *                NULL on out-of-memory error.
  *
  *********************************************************************/
  *                NULL on out-of-memory error.
  *
  *********************************************************************/

-char *current_action_to_html(struct client_state *csp,
-                             struct current_action_spec *action)
+char *current_action_to_html(const struct client_state *csp,
+                             const struct current_action_spec *action)

 {
    unsigned long flags  = action->flags;
    char * result = strdup("");
 {
    unsigned long flags  = action->flags;
    char * result = strdup("");

diff --git a/actions.h b/actions.h
index 053dae2..ea6041f 100644 (file)
--- a/actions.h
+++ b/actions.h
@@ -1,6 +1,6 @@
 #ifndef ACTIONS_H_INCLUDED
 #define ACTIONS_H_INCLUDED
 #ifndef ACTIONS_H_INCLUDED
 #define ACTIONS_H_INCLUDED

-#define ACTIONS_H_VERSION "$Id: actions.h,v 1.15 2007/04/15 16:39:20 fabiankeil Exp $"
+#define ACTIONS_H_VERSION "$Id: actions.h,v 1.16 2007/04/17 18:21:45 fabiankeil Exp $"

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.h,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.h,v $


@@ -35,6 +35,11 @@
  *
  * Revisions   :
  *    $Log: actions.h,v $
  *
  * Revisions   :
  *    $Log: actions.h,v $

+ *    Revision 1.16  2007/04/17 18:21:45  fabiankeil
+ *    Split update_action_bits() into
+ *    update_action_bits_for_all_tags()
+ *    and update_action_bits_for_tag().
+ *

  *    Revision 1.15  2007/04/15 16:39:20  fabiankeil
  *    Introduce tags as alternative way to specify which
  *    actions apply to a request. At the moment tags can be
  *    Revision 1.15  2007/04/15 16:39:20  fabiankeil
  *    Introduce tags as alternative way to specify which
  *    actions apply to a request. At the moment tags can be


@@ -131,19 +136,21 @@ extern void init_action(struct action_spec *dest);
 extern void free_action(struct action_spec *src);
 extern jb_err merge_actions (struct action_spec *dest, 
                              const struct action_spec *src);
 extern void free_action(struct action_spec *src);
 extern jb_err merge_actions (struct action_spec *dest, 
                              const struct action_spec *src);

+#if 0

 extern int update_action_bits_for_all_tags(struct client_state *csp);
 extern int update_action_bits_for_all_tags(struct client_state *csp);

+#endif

 extern int update_action_bits_for_tag(struct client_state *csp, const char *tag);
 extern jb_err copy_action (struct action_spec *dest, 
                            const struct action_spec *src);
 extern int update_action_bits_for_tag(struct client_state *csp, const char *tag);
 extern jb_err copy_action (struct action_spec *dest, 
                            const struct action_spec *src);

-extern char * actions_to_text     (struct action_spec *action);
-extern char * actions_to_html     (struct client_state *csp,
-                                   struct action_spec *action);
+extern char * actions_to_text     (const struct action_spec *action);
+extern char * actions_to_html     (const struct client_state *csp,
+                                   const struct action_spec *action);

 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, 
                                      const struct action_spec *src);
 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, 
                                      const struct action_spec *src);

-extern char * current_action_to_html(struct client_state *csp,
-                                     struct current_action_spec *action);
+extern char * current_action_to_html(const struct client_state *csp,
+                                     const struct current_action_spec *action);

 
 extern jb_err get_action_token(char **line, char **name, char **value);
 extern void unload_actions_file(void *file_data);
 
 extern jb_err get_action_token(char **line, char **name, char **value);
 extern void unload_actions_file(void *file_data);