Changes in filterelement.c [41c9a96:4542047]

File:

• filterelement.c (modified) (21 diffs)

filterelement.c

@@ -1 +1 @@
 #include "owl.h"
 
-static char * owl_filterelement_get_field(owl_message *m, char * field)
-{
-  char *match;
+static const char * owl_filterelement_get_field(const owl_message *m, const char * field)
+{
+  const char *match;
   if (!strcasecmp(field, "class")) {
     match=owl_message_get_class(m);
@@ -48 +48 @@
 }
 
-static int owl_filterelement_match_false(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_false(const owl_filterelement *fe, const owl_message *m)
 {
   return 0;
 }
 
-static int owl_filterelement_match_true(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_true(const owl_filterelement *fe, const owl_message *m)
 {
   return 1;
 }
 
-static int owl_filterelement_match_re(owl_filterelement *fe, owl_message *m)
-{
-  char * val = owl_filterelement_get_field(m, fe->field);
+static int owl_filterelement_match_re(const owl_filterelement *fe, const owl_message *m)
+{
+  const char * val = owl_filterelement_get_field(m, fe->field);
   return !owl_regex_compare(&(fe->re), val, NULL, NULL);
 }
 
-static int owl_filterelement_match_filter(owl_filterelement *fe, owl_message *m)
-{
-  owl_filter *subfilter;
+static int owl_filterelement_match_filter(const owl_filterelement *fe, const owl_message *m)
+{
+  const owl_filter *subfilter;
   subfilter=owl_global_get_filter(&g, fe->field);
   if (!subfilter) {
@@ -77 +77 @@
 }
 
-static int owl_filterelement_match_perl(owl_filterelement *fe, owl_message *m)
-{
-  char *subname, *perlrv;
+static int owl_filterelement_match_perl(const owl_filterelement *fe, const owl_message *m)
+{
+  const char *subname;
+  char *perlrv;
   int   tf=0;
 
@@ -96 +97 @@
 }
 
-static int owl_filterelement_match_group(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_group(const owl_filterelement *fe, const owl_message *m)
 {
   return owl_filterelement_match(fe->left, m);
@@ -105 +106 @@
 */
 
-static int owl_filterelement_match_and(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_and(const owl_filterelement *fe, const owl_message *m)
 {
   return owl_filterelement_match(fe->left, m) &&
@@ -111 +112 @@
 }
 
-static int owl_filterelement_match_or(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_or(const owl_filterelement *fe, const owl_message *m)
 {
   return owl_filterelement_match(fe->left, m) ||
@@ -117 +118 @@
 }
 
-static int owl_filterelement_match_not(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_not(const owl_filterelement *fe, const owl_message *m)
 {
   return !owl_filterelement_match(fe->left, m);
@@ -124 +125 @@
 /* Print methods */
 
-static void owl_filterelement_print_true(owl_filterelement *fe, GString *buf)
+static void owl_filterelement_print_true(const owl_filterelement *fe, GString *buf)
 {
   g_string_append(buf, "true");
 }
 
-static void owl_filterelement_print_false(owl_filterelement *fe, GString *buf)
+static void owl_filterelement_print_false(const owl_filterelement *fe, GString *buf)
 {
   g_string_append(buf, "false");
 }
 
-static void owl_filterelement_print_re(owl_filterelement *fe, GString *buf)
-{
-  char *re, *q;
+static void owl_filterelement_print_re(const owl_filterelement *fe, GString *buf)
+{
+  const char *re, *q;
   g_string_append(buf, fe->field);
   g_string_append(buf, " ");
@@ -147 +148 @@
 }
 
-static void owl_filterelement_print_filter(owl_filterelement *fe, GString *buf)
+static void owl_filterelement_print_filter(const owl_filterelement *fe, GString *buf)
 {
   g_string_append(buf, "filter ");
@@ -153 +154 @@
 }
 
-static void owl_filterelement_print_perl(owl_filterelement *fe, GString *buf)
+static void owl_filterelement_print_perl(const owl_filterelement *fe, GString *buf)
 {
   g_string_append(buf, "perl ");
@@ -159 +160 @@
 }
 
-static void owl_filterelement_print_group(owl_filterelement *fe, GString *buf)
+static void owl_filterelement_print_group(const owl_filterelement *fe, GString *buf)
 {
   g_string_append(buf, "( ");
@@ -166 +167 @@
 }
 
-static void owl_filterelement_print_or(owl_filterelement *fe, GString *buf)
+static void owl_filterelement_print_or(const owl_filterelement *fe, GString *buf)
 {
   owl_filterelement_print(fe->left, buf);
@@ -173 +174 @@
 }
 
-static void owl_filterelement_print_and(owl_filterelement *fe, GString *buf)
+static void owl_filterelement_print_and(const owl_filterelement *fe, GString *buf)
 {
   owl_filterelement_print(fe->left, buf);
@@ -180 +181 @@
 }
 
-static void owl_filterelement_print_not(owl_filterelement *fe, GString *buf)
+static void owl_filterelement_print_not(const owl_filterelement *fe, GString *buf)
 {
   g_string_append(buf, " not ");
@@ -211 +212 @@
 }
 
-int owl_filterelement_create_re(owl_filterelement *fe, char *field, char *re)
+int owl_filterelement_create_re(owl_filterelement *fe, const char *field, const char *re)
 {
   owl_filterelement_create(fe);
@@ -225 +226 @@
 }
 
-void owl_filterelement_create_filter(owl_filterelement *fe, char *name)
+void owl_filterelement_create_filter(owl_filterelement *fe, const char *name)
 {
   owl_filterelement_create(fe);
@@ -233 +234 @@
 }
 
-void owl_filterelement_create_perl(owl_filterelement *fe, char *name)
+void owl_filterelement_create_perl(owl_filterelement *fe, const char *name)
 {
   owl_filterelement_create(fe);
@@ -275 +276 @@
 }
 
-int owl_filterelement_match(owl_filterelement *fe, owl_message *m)
+int owl_filterelement_match(const owl_filterelement *fe, const owl_message *m)
 {
   if(!fe) return 0;
@@ -285 +286 @@
 static int fe_visited  = 1;
 
-int owl_filterelement_is_toodeep(owl_filter *f, owl_filterelement *fe)
+int owl_filterelement_is_toodeep(const owl_filter *f, const owl_filterelement *fe)
 {
   int rv;
@@ -299 +300 @@
 }
 
-int _owl_filterelement_is_toodeep(owl_filterelement *fe, owl_dict *seen)
+int _owl_filterelement_is_toodeep(const owl_filterelement *fe, owl_dict *seen)
 {
   int rv = 0;
-  owl_filter *f;
+  const owl_filter *f;
 
   if(fe->match_message == owl_filterelement_match_filter) {
@@ -337 +338 @@
 }
 
-void owl_filterelement_print(owl_filterelement *fe, GString *buf)
+void owl_filterelement_print(const owl_filterelement *fe, GString *buf)
 {
   if(!fe || !fe->print_elt) return;