Changeset c08c70a

Timestamp:

Aug 15, 2009, 7:08:19 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:

1fdab04

Parents:

25fb825

git-author:

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

git-committer:

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

Message:

Add const qualifiers for owl_message *.

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

Files:

• commands.c (modified) (1 diff)
• filter.c (modified) (2 diffs)
• filterelement.c (modified) (9 diffs)
• functions.c (modified) (12 diffs)
• global.c (modified) (2 diffs)
• logging.c (modified) (9 diffs)
• message.c (modified) (35 diffs)
• owl.h (modified) (1 diff)
• perlconfig.c (modified) (5 diffs)
• style.c (modified) (1 diff)
• zephyr.c (modified) (2 diffs)

commands.c

@@ -2013 +2013 @@
     owl_function_reply(1, !edit);
   } else if (argc==2 && !strcmp(argv[1], "zaway")) {
-    owl_message *m;
+    const owl_message *m;
     owl_view    *v;
     v = owl_global_get_current_view(&g);    

filter.c

@@ -189 +189 @@
  * return 0.
  */
-int owl_filter_message_match(owl_filter *f, owl_message *m)
+int owl_filter_message_match(owl_filter *f, const owl_message *m)
 {
   int ret;
@@ -270 +270 @@
 #ifdef OWL_INCLUDE_REG_TESTS
 
-int owl_filter_test_string(const char * filt, owl_message *m, int shouldmatch) /* noproto */ {
+int owl_filter_test_string(const char * filt, const owl_message *m, int shouldmatch) /* noproto */ {
   owl_filter f;
   int ok;

filterelement.c

@@ -1 +1 @@
 #include "owl.h"
 
-static const char * owl_filterelement_get_field(owl_message *m, const char * field)
+static const char * owl_filterelement_get_field(const owl_message *m, const char * field)
 {
   const char *match;
@@ -48 +48 @@
 }
 
-static int owl_filterelement_match_false(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_false(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(owl_filterelement *fe, const owl_message *m)
 {
   return 1;
 }
 
-static int owl_filterelement_match_re(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_re(owl_filterelement *fe, const owl_message *m)
 {
   const char * val = owl_filterelement_get_field(m, fe->field);
@@ -64 +64 @@
 }
 
-static int owl_filterelement_match_filter(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_filter(owl_filterelement *fe, const owl_message *m)
 {
   owl_filter *subfilter;
@@ -77 +77 @@
 }
 
-static int owl_filterelement_match_perl(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_perl(owl_filterelement *fe, const owl_message *m)
 {
   const char *subname;
@@ -97 +97 @@
 }
 
-static int owl_filterelement_match_group(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_group(owl_filterelement *fe, const owl_message *m)
 {
   return owl_filterelement_match(fe->left, m);
@@ -106 +106 @@
 */
 
-static int owl_filterelement_match_and(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_and(owl_filterelement *fe, const owl_message *m)
 {
   return owl_filterelement_match(fe->left, m) &&
@@ -112 +112 @@
 }
 
-static int owl_filterelement_match_or(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_or(owl_filterelement *fe, const owl_message *m)
 {
   return owl_filterelement_match(fe->left, m) ||
@@ -118 +118 @@
 }
 
-static int owl_filterelement_match_not(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_not(owl_filterelement *fe, const owl_message *m)
 {
   return !owl_filterelement_match(fe->left, m);
@@ -276 +276 @@
 }
 
-int owl_filterelement_match(owl_filterelement *fe, owl_message *m)
+int owl_filterelement_match(owl_filterelement *fe, const owl_message *m)
 {
   if(!fe) return 0;

functions.c

@@ -595 +595 @@
   owl_view *v;
   owl_filter *f = NULL;
-  owl_message *m;
+  const owl_message *m;
 
   v=owl_global_get_current_view(&g);
@@ -648 +648 @@
   owl_view *v;
   owl_filter *f = NULL;
-  owl_message *m;
+  const owl_message *m;
 
   v=owl_global_get_current_view(&g);
@@ -774 +774 @@
 {
   int curmsg;
-  owl_message *m;
+  const owl_message *m;
   owl_messagelist *ml;
   owl_view *v;
@@ -1411 +1411 @@
 void owl_function_info()
 {
-  owl_message *m;
+  const owl_message *m;
   owl_fmtext fm, attrfm;
   owl_view *v;
@@ -1547 +1547 @@
 {
   owl_view *v;
-  owl_message *m;
+  const owl_message *m;
   owl_style *s;
   owl_fmtext fm;
@@ -1886 +1886 @@
 {
   char *buff=NULL;
-  owl_message *m;
+  const owl_message *m;
   owl_filter *f;
   
@@ -2109 +2109 @@
   owl_filter *f;
   int curid=-1, newpos, curmsg;
-  owl_message *curm=NULL;
+  const owl_message *curm=NULL;
 
   v=owl_global_get_current_view(&g);
@@ -2580 +2580 @@
 {
   owl_view *v;
-  owl_message *m;
+  const owl_message *m;
   char *zperson, *filtname=NULL;
   const char *argv[1];
@@ -2652 +2652 @@
    * If type=0, uses just class.  If type=1, uses instance as well. */
   owl_view *v;
-  owl_message *m;
+  const owl_message *m;
   const char *cmdprefix, *mclass, *minst;
   char *cmd;
@@ -3567 +3567 @@
 }
 
-void _owl_function_mark_message(owl_message *m)
+void _owl_function_mark_message(const owl_message *m)
 {
   if (m)
@@ -3575 +3575 @@
 void owl_function_mark_message()
 {
-  owl_message *m;
+  const owl_message *m;
   owl_view *v;
 
@@ -3595 +3595 @@
 {
   int marked_id;
-  owl_message *m;
+  const owl_message *m;
   owl_view *v;
 

global.c

@@ -212 +212 @@
   g->markedmsgid=i;
   /* i; index of message in the current view.
-  owl_message *m;
+  const owl_message *m;
   owl_view *v;
 
@@ -684 +684 @@
 }
 
-int owl_global_message_is_puntable(owl_global *g, owl_message *m) {
+int owl_global_message_is_puntable(owl_global *g, const owl_message *m) {
   const owl_list *pl;
   int i, j;

logging.c

@@ -9 +9 @@
  * functions in this file as necessary.
  */
-void owl_log_message(owl_message *m) {
+void owl_log_message(const owl_message *m) {
   owl_function_debugmsg("owl_log_message: entering");
 
@@ -37 +37 @@
 
 /* Return 1 if we should log the given message, otherwise return 0 */
-int owl_log_shouldlog_message(owl_message *m) {
+int owl_log_shouldlog_message(const owl_message *m) {
   owl_filter *f;
 
@@ -70 +70 @@
 }
 
-void owl_log_zephyr(owl_message *m, FILE *file) {
+void owl_log_zephyr(const owl_message *m, FILE *file) {
     char *tmp;
     tmp=short_zuser(owl_message_get_sender(m));
@@ -82 +82 @@
 }
 
-void owl_log_aim(owl_message *m, FILE *file) {
+void owl_log_aim(const owl_message *m, FILE *file) {
     fprintf(file, "From: <%s> To: <%s>\n", owl_message_get_sender(m), owl_message_get_recipient(m));
     fprintf(file, "Time: %s\n\n", owl_message_get_timestr(m));
@@ -93 +93 @@
 }
 
-void owl_log_jabber(owl_message *m, FILE *file) {
+void owl_log_jabber(const owl_message *m, FILE *file) {
     fprintf(file, "From: <%s> To: <%s>\n",owl_message_get_sender(m), owl_message_get_recipient(m));
     fprintf(file, "Time: %s\n\n", owl_message_get_timestr(m));
@@ -99 +99 @@
 }
 
-void owl_log_generic(owl_message *m, FILE *file) {
+void owl_log_generic(const owl_message *m, FILE *file) {
     fprintf(file, "From: <%s> To: <%s>\n", owl_message_get_sender(m), owl_message_get_recipient(m));
     fprintf(file, "Time: %s\n\n", owl_message_get_timestr(m));
@@ -105 +105 @@
 }
 
-void owl_log_append(owl_message *m, const char *filename) {
+void owl_log_append(const owl_message *m, const char *filename) {
     FILE *file;
     file=fopen(filename, "a");
@@ -124 +124 @@
 }
 
-void owl_log_outgoing(owl_message *m)
+void owl_log_outgoing(const owl_message *m)
 {
   char filename[MAXPATHLEN], *logpath;
@@ -227 +227 @@
 }
 
-void owl_log_incoming(owl_message *m)
+void owl_log_incoming(const owl_message *m)
 {
   char filename[MAXPATHLEN], allfilename[MAXPATHLEN], *logpath;

message.c

@@ -82 +82 @@
  * the attribute does not exist
  */
-const char *owl_message_get_attribute_value(owl_message *m, const char *attrname)
+const char *owl_message_get_attribute_value(const owl_message *m, const char *attrname)
 {
   int i, j;
@@ -107 +107 @@
  * function to indent fmtext.
  */
-void owl_message_attributes_tofmtext(owl_message *m, owl_fmtext *fm) {
+void owl_message_attributes_tofmtext(const owl_message *m, owl_fmtext *fm) {
   int i, j;
   owl_pair *p;
@@ -164 +164 @@
 }
 
-const char *owl_message_get_class(owl_message *m)
+const char *owl_message_get_class(const owl_message *m)
 {
   const char *class;
@@ -178 +178 @@
 }
 
-const char *owl_message_get_instance(owl_message *m)
+const char *owl_message_get_instance(const owl_message *m)
 {
   const char *instance;
@@ -192 +192 @@
 }
 
-const char *owl_message_get_sender(owl_message *m)
+const char *owl_message_get_sender(const owl_message *m)
 {
   const char *sender;
@@ -206 +206 @@
 }
 
-const char *owl_message_get_zsig(owl_message *m)
+const char *owl_message_get_zsig(const owl_message *m)
 {
   const char *zsig;
@@ -220 +220 @@
 }
 
-const char *owl_message_get_recipient(owl_message *m)
+const char *owl_message_get_recipient(const owl_message *m)
 {
   /* this is stupid for outgoing messages, we need to fix it. */
@@ -236 +236 @@
 }
 
-const char *owl_message_get_realm(owl_message *m)
+const char *owl_message_get_realm(const owl_message *m)
 {
   const char *realm;
@@ -250 +250 @@
 }
 
-const char *owl_message_get_body(owl_message *m)
+const char *owl_message_get_body(const owl_message *m)
 {
   const char *body;
@@ -265 +265 @@
 }
 
-const char *owl_message_get_opcode(owl_message *m)
+const char *owl_message_get_opcode(const owl_message *m)
 {
   const char *opcode;
@@ -286 +286 @@
 }
 
-int owl_message_is_loginout(owl_message *m)
+int owl_message_is_loginout(const owl_message *m)
 {
   const char *res;
@@ -295 +295 @@
 }
 
-int owl_message_is_login(owl_message *m)
+int owl_message_is_login(const owl_message *m)
 {
   const char *res;
@@ -306 +306 @@
 
 
-int owl_message_is_logout(owl_message *m)
+int owl_message_is_logout(const owl_message *m)
 {
   const char *res;
@@ -321 +321 @@
 }
 
-int owl_message_is_private(owl_message *m)
+int owl_message_is_private(const owl_message *m)
 {
   const char *res;
@@ -330 +330 @@
 }
 
-const char *owl_message_get_timestr(owl_message *m)
+const char *owl_message_get_timestr(const owl_message *m)
 {
   if (m->timestr) return(m->timestr);
@@ -361 +361 @@
 }
 
-int owl_message_is_type(owl_message *m, const char *type) {
+int owl_message_is_type(const owl_message *m, const char *type) {
   const char * t = owl_message_get_attribute_value(m, "type");
   if(!t) return 0;
@@ -367 +367 @@
 }
                                                 
-int owl_message_is_type_admin(owl_message *m)
+int owl_message_is_type_admin(const owl_message *m)
 {
   return owl_message_is_type(m, "admin");
 }
 
-int owl_message_is_type_zephyr(owl_message *m)
+int owl_message_is_type_zephyr(const owl_message *m)
 {
   return owl_message_is_type(m, "zephyr");
 }
 
-int owl_message_is_type_aim(owl_message *m)
+int owl_message_is_type_aim(const owl_message *m)
 {
   return owl_message_is_type(m, "aim");
@@ -383 +383 @@
 
 /* XXX TODO: deprecate this */
-int owl_message_is_type_jabber(owl_message *m)
+int owl_message_is_type_jabber(const owl_message *m)
 {
   return owl_message_is_type(m, "jabber");
 }
 
-int owl_message_is_type_loopback(owl_message *m)
+int owl_message_is_type_loopback(const owl_message *m)
 {
   return owl_message_is_type(m, "loopback");
 }
 
-int owl_message_is_pseudo(owl_message *m)
+int owl_message_is_pseudo(const owl_message *m)
 {
   if (owl_message_get_attribute_value(m, "pseudo")) return(1);
@@ -425 +425 @@
 }
 
-int owl_message_is_direction_in(owl_message *m)
+int owl_message_is_direction_in(const owl_message *m)
 {
   if (m->direction==OWL_MESSAGE_DIRECTION_IN) return(1);
@@ -431 +431 @@
 }
 
-int owl_message_is_direction_out(owl_message *m)
+int owl_message_is_direction_out(const owl_message *m)
 {
   if (m->direction==OWL_MESSAGE_DIRECTION_OUT) return(1);
@@ -437 +437 @@
 }
 
-int owl_message_is_direction_none(owl_message *m)
+int owl_message_is_direction_none(const owl_message *m)
 {
   if (m->direction==OWL_MESSAGE_DIRECTION_NONE) return(1);
@@ -462 +462 @@
 }
 
-const char *owl_message_get_zwriteline(owl_message *m)
+const char *owl_message_get_zwriteline(const owl_message *m)
 {
   const char *z = owl_message_get_attribute_value(m, "zwriteline");
@@ -474 +474 @@
 }
 
-int owl_message_is_delete(owl_message *m)
+int owl_message_is_delete(const owl_message *m)
 {
   if (m == NULL) return(0);
@@ -482 +482 @@
 
 #ifdef HAVE_LIBZEPHYR
-const ZNotice_t *owl_message_get_notice(owl_message *m)
+const ZNotice_t *owl_message_get_notice(const owl_message *m)
 {
   return(&(m->notice));
 }
 #else
-void *owl_message_get_notice(owl_message *m)
+void *owl_message_get_notice(const owl_message *m)
 {
   return(NULL);
@@ -498 +498 @@
 }
 
-const char *owl_message_get_hostname(owl_message *m)
+const char *owl_message_get_hostname(const owl_message *m)
 {
   return(m->hostname);
@@ -524 +524 @@
 }
 
-int owl_message_is_personal(owl_message *m)
+int owl_message_is_personal(const owl_message *m)
 {
   owl_filter * f = owl_global_get_filter(&g, "personal");
@@ -534 +534 @@
 }
 
-int owl_message_is_question(owl_message *m)
+int owl_message_is_question(const owl_message *m)
 {
   if(!owl_message_is_type_admin(m)) return 0;
@@ -541 +541 @@
 }
 
-int owl_message_is_answered(owl_message *m) {
+int owl_message_is_answered(const owl_message *m) {
   const char *q;
   if(!owl_message_is_question(m)) return 0;
@@ -553 +553 @@
 }
 
-int owl_message_is_mail(owl_message *m)
+int owl_message_is_mail(const owl_message *m)
 {
   if (owl_message_is_type_zephyr(m)) {
@@ -566 +566 @@
 
 /* caller must free return value. */
-char *owl_message_get_cc(owl_message *m)
+char *owl_message_get_cc(const owl_message *m)
 {
   const char *cur;
@@ -583 +583 @@
 
 /* caller must free return value */
-char *owl_message_get_cc_without_recipient(owl_message *m)
+char *owl_message_get_cc_without_recipient(const owl_message *m)
 {
   char *cc, *out, *end, *shortuser, *recip;
@@ -620 +620 @@
 }
 
-int owl_message_get_id(owl_message *m)
+int owl_message_get_id(const owl_message *m)
 {
   return(m->id);
 }
 
-const char *owl_message_get_type(owl_message *m) {
+const char *owl_message_get_type(const owl_message *m) {
   const char * type = owl_message_get_attribute_value(m, "type");
   if(!type) {
@@ -633 +633 @@
 }
 
-const char *owl_message_get_direction(owl_message *m) {
+const char *owl_message_get_direction(const owl_message *m) {
   switch (m->direction) {
   case OWL_MESSAGE_DIRECTION_IN:
@@ -657 +657 @@
 
 
-const char *owl_message_get_login(owl_message *m) {
+const char *owl_message_get_login(const owl_message *m) {
   if (owl_message_is_login(m)) {
     return "login";
@@ -668 +668 @@
 
 
-const char *owl_message_get_header(owl_message *m) {
+const char *owl_message_get_header(const owl_message *m) {
   return owl_message_get_attribute_value(m, "adminheader");
 }

owl.h

@@ -398 +398 @@
 
 typedef struct _owl_filterelement {
-  int (*match_message)(struct _owl_filterelement *fe, owl_message *m);
+  int (*match_message)(struct _owl_filterelement *fe, const owl_message *m);
   /* Append a string representation of the filterelement onto buf*/
   void (*print_elt)(struct _owl_filterelement *fe, GString *buf);

perlconfig.c

@@ -22 +22 @@
 }
 
-SV *owl_perlconfig_message2hashref(owl_message *m)
+SV *owl_perlconfig_message2hashref(const owl_message *m)
 {
   HV *h, *stash;
@@ -197 +197 @@
 /* Calls in a scalar context, passing it a hash reference.
    If return value is non-null, caller must free. */
-char *owl_perlconfig_call_with_message(const char *subname, owl_message *m)
+char *owl_perlconfig_call_with_message(const char *subname, const owl_message *m)
 {
   dSP ;
@@ -246 +246 @@
    If the return value is non-null, the caller must free it.
  */
-char * owl_perlconfig_message_call_method(owl_message *m, const char *method, int argc, const char ** argv)
+char * owl_perlconfig_message_call_method(const owl_message *m, const char *method, int argc, const char ** argv)
 {
   dSP;
@@ -408 +408 @@
 }
 
-void owl_perlconfig_getmsg(owl_message *m, const char *subname)
+void owl_perlconfig_getmsg(const owl_message *m, const char *subname)
 {
   char *ptr = NULL;
@@ -419 +419 @@
 
 /* Called on all new messages; receivemsg is only called on incoming ones */
-void owl_perlconfig_newmsg(owl_message *m, const char *subname)
+void owl_perlconfig_newmsg(const owl_message *m, const char *subname)
 {
   char *ptr = NULL;

style.c

@@ -39 +39 @@
  * 'fm' should already be be initialzed
  */
-void owl_style_get_formattext(owl_style *s, owl_fmtext *fm, owl_message *m)
+void owl_style_get_formattext(owl_style *s, owl_fmtext *fm, const owl_message *m)
 {
   const char *body;

zephyr.c

@@ -570 +570 @@
  * caller must free the return
  */
-char *owl_zephyr_get_message(const ZNotice_t *n, owl_message *m)
+char *owl_zephyr_get_message(const ZNotice_t *n, const owl_message *m)
 {
   /* don't let ping messages have a body */
@@ -824 +824 @@
 #endif
   
-void owl_zephyr_zaway(owl_message *m)
+void owl_zephyr_zaway(const owl_message *m)
 {
 #ifdef HAVE_LIBZEPHYR