Changeset 4542047

Timestamp:

Aug 15, 2009, 7:08:20 PM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

9e5c9f3

Parents:

bd65108

git-author:

Anders Kaseorg <andersk@mit.edu> (08/04/09 02:38:07)

git-committer:

Anders Kaseorg <andersk@mit.edu> (08/15/09 19:08:20)

Message:

Add const qualifiers for owl_filter *.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• commands.c (modified) (1 diff)
• filter.c (modified) (8 diffs)
• filterelement.c (modified) (3 diffs)
• functions.c (modified) (8 diffs)
• logging.c (modified) (1 diff)
• mainwin.c (modified) (1 diff)
• message.c (modified) (1 diff)
• owl.c (modified) (1 diff)
• perlconfig.c (modified) (1 diff)
• perlglue.xs (modified) (1 diff)

commands.c

@@ -2485 +2485 @@
 char *owl_command_getfilter(int argc, const char *const *argv, const char *buf)
 {
-  owl_filter *f;
+  const owl_filter *f;
   if (argc != 2) {
     owl_function_makemsg("Wrong number of arguments for %s", argv[0]);

filter.c

@@ -151 +151 @@
 }
 
-const char *owl_filter_get_name(owl_filter *f)
+const char *owl_filter_get_name(const owl_filter *f)
 {
   return(f->name);
@@ -161 +161 @@
 }
 
-int owl_filter_get_fgcolor(owl_filter *f)
+int owl_filter_get_fgcolor(const owl_filter *f)
 {
   return(f->fgcolor);
@@ -171 +171 @@
 }
 
-int owl_filter_get_bgcolor(owl_filter *f)
+int owl_filter_get_bgcolor(const owl_filter *f)
 {
   return(f->bgcolor);
@@ -181 +181 @@
 }
 
-int owl_filter_get_cachedmsgid(owl_filter *f)
+int owl_filter_get_cachedmsgid(const owl_filter *f)
 {
   return(f->cachedmsgid);
@@ -189 +189 @@
  * return 0.
  */
-int owl_filter_message_match(owl_filter *f, const owl_message *m)
+int owl_filter_message_match(const owl_filter *f, const owl_message *m)
 {
   int ret;
@@ -198 +198 @@
 
 
-char* owl_filter_print(owl_filter *f)
+char* owl_filter_print(const owl_filter *f)
 {
   GString *out = g_string_new("");
@@ -231 +231 @@
 
 /* Return 1 if the filters 'a' and 'b' are equivalent, 0 otherwise */
-int owl_filter_equiv(owl_filter *a, owl_filter *b)
+int owl_filter_equiv(const owl_filter *a, const owl_filter *b)
 {
   char *buffa, *buffb;
@@ -250 +250 @@
 
 
-int owl_filter_is_toodeep(owl_filter *f)
+int owl_filter_is_toodeep(const owl_filter *f)
 {
   return owl_filterelement_is_toodeep(f, f->root);

filterelement.c

@@ -66 +66 @@
 static int owl_filterelement_match_filter(const owl_filterelement *fe, const owl_message *m)
 {
-  owl_filter *subfilter;
+  const owl_filter *subfilter;
   subfilter=owl_global_get_filter(&g, fe->field);
   if (!subfilter) {
@@ -286 +286 @@
 static int fe_visited  = 1;
 
-int owl_filterelement_is_toodeep(owl_filter *f, const owl_filterelement *fe)
+int owl_filterelement_is_toodeep(const owl_filter *f, const owl_filterelement *fe)
 {
   int rv;
@@ -303 +303 @@
 {
   int rv = 0;
-  owl_filter *f;
+  const owl_filter *f;
 
   if(fe->match_message == owl_filterelement_match_filter) {

functions.c

@@ -594 +594 @@
   int curmsg, i, viewsize, found;
   owl_view *v;
-  owl_filter *f = NULL;
+  const owl_filter *f = NULL;
   const owl_message *m;
 
@@ -647 +647 @@
   int curmsg, i, viewsize, found;
   owl_view *v;
-  owl_filter *f = NULL;
+  const owl_filter *f = NULL;
   const owl_message *m;
 
@@ -1752 +1752 @@
   owl_message *m;
   owl_view *v;
-  owl_filter *f;
+  const owl_filter *f;
 
   /* get the trash filter */
@@ -1887 +1887 @@
   char *buff=NULL;
   const owl_message *m;
-  owl_filter *f;
+  const owl_filter *f;
   
   if (owl_view_get_size(owl_global_get_current_view(&g))==0) {
@@ -2247 +2247 @@
 {
   char *newname;
-  owl_filter *tmpfilt;
+  const owl_filter *tmpfilt;
   const char *argv[5];
 
@@ -2275 +2275 @@
 {
   const owl_list *l;
-  owl_filter *f;
+  const owl_filter *f;
   int i, j;
   owl_fmtext fm;
@@ -2302 +2302 @@
 void owl_function_show_filter(const char *name)
 {
-  owl_filter *f;
+  const owl_filter *f;
   char *buff, *tmp;
 
@@ -2319 +2319 @@
 void owl_function_show_zpunts()
 {
-  owl_filter *f;
+  const owl_filter *f;
   const owl_list *fl;
   char buff[5000];

logging.c

@@ -38 +38 @@
 /* Return 1 if we should log the given message, otherwise return 0 */
 int owl_log_shouldlog_message(const owl_message *m) {
-  owl_filter *f;
+  const owl_filter *f;
 
   /* If there's a logfilter and this message matches it, log */

mainwin.c

@@ -16 +16 @@
   owl_view *v;
   const owl_list *filtlist;
-  owl_filter *f;
+  const owl_filter *f;
 
   recwin=owl_global_get_curs_recwin(&g);

message.c

@@ -526 +526 @@
 int owl_message_is_personal(const owl_message *m)
 {
-  owl_filter * f = owl_global_get_filter(&g, "personal");
+  const owl_filter * f = owl_global_get_filter(&g, "personal");
   if(!f) {
       owl_function_error("personal filter is not defined");

owl.c

@@ -487 +487 @@
  */
 int owl_process_message(owl_message *m) {
-  owl_filter *f;
+  const owl_filter *f;
   /* if this message it on the puntlist, nuke it and continue */
   if (owl_global_message_is_puntable(&g, m)) {

perlconfig.c

@@ -30 +30 @@
   int i, j;
   const owl_pair *pair;
-  owl_filter *wrap;
+  const owl_filter *wrap;
 
   if (!m) return &PL_sv_undef;

perlglue.xs

@@ -347 +347 @@
                 AV *filters;
                 const owl_list *fl;
-                owl_filter *f;
+                const owl_filter *f;
                 int i;
         CODE: