Changes in functions.c [fea7992:35b3518]

File:

• functions.c (modified) (96 diffs)

functions.c

@@ -13 +13 @@
 #include "owl.h"
 
-char *owl_function_command(char *cmdbuff)
+char *owl_function_command(const char *cmdbuff)
 {
   owl_function_debugmsg("executing command: %s", cmdbuff);
@@ -20 +20 @@
 }
 
-char *owl_function_command_argv(char **argv, int argc)
+char *owl_function_command_argv(const char *const *argv, int argc)
 {
   return owl_cmddict_execute_argv(owl_global_get_cmddict(&g),
@@ -27 +27 @@
 }
 
-void owl_function_command_norv(char *cmdbuff)
+void owl_function_command_norv(const char *cmdbuff)
 {
   char *rv;
@@ -34 +34 @@
 }
 
-void owl_function_command_alias(char *alias_from, char *alias_to)
+void owl_function_command_alias(const char *alias_from, const char *alias_to)
 {
   owl_cmddict_add_alias(owl_global_get_cmddict(&g), alias_from, alias_to);
 }
 
-owl_cmd *owl_function_get_cmd(char *name)
+const owl_cmd *owl_function_get_cmd(const char *name)
 {
   return owl_cmddict_find(owl_global_get_cmddict(&g), name);
@@ -60 +60 @@
 }
 
-void owl_function_show_view(char *viewname)
-{
-  owl_view *v;
+void owl_function_show_view(const char *viewname)
+{
+  const owl_view *v;
   owl_fmtext fm;
 
@@ -92 +92 @@
 }
 
-char *owl_function_style_describe(char *name) {
-  char *desc, *s;
-  owl_style *style;
+char *owl_function_style_describe(const char *name) {
+  const char *desc;
+  char *s;
+  const owl_style *style;
   style = owl_global_get_style_by_name(&g, name);
   if (style) {
@@ -107 +108 @@
 }
 
-char *owl_function_cmd_describe(char *name)
-{
-  owl_cmd *cmd = owl_cmddict_find(owl_global_get_cmddict(&g), name);
+char *owl_function_cmd_describe(const char *name)
+{
+  const owl_cmd *cmd = owl_cmddict_find(owl_global_get_cmddict(&g), name);
   if (cmd) return owl_cmd_describe(cmd);
   else return(NULL);
 }
 
-void owl_function_show_command(char *name)
+void owl_function_show_command(const char *name)
 {
   owl_function_help_for_command(name);
@@ -121 +122 @@
 void owl_function_show_license()
 {
-  char *text;
+  const char *text;
 
   text=""
@@ -167 +168 @@
 void owl_function_show_quickstart()
 {
-    char *message =
+    const char *message =
     "Move between messages with the arrow keys, and press 'r' to reply.\n"
     "For more info, press 'h' or visit http://barnowl.mit.edu/\n\n"
@@ -198 +199 @@
  * and redisplay if necessary.
  */
-void owl_function_adminmsg(char *header, char *body)
+void owl_function_adminmsg(const char *header, const char *body)
 {
   owl_message *m;
@@ -225 +226 @@
  * that.
  */
-owl_message *owl_function_make_outgoing_zephyr(char *body, char *zwriteline, char *zsig)
+owl_message *owl_function_make_outgoing_zephyr(const char *body, const char *zwriteline, const char *zsig)
 {
   owl_message *m;
@@ -246 +247 @@
  * owl_global_messagequeue_addmsg() for that .
  */
-owl_message *owl_function_make_outgoing_aim(char *body, char *to)
+owl_message *owl_function_make_outgoing_aim(const char *body, const char *to)
 {
   owl_message *m;
@@ -267 +268 @@
  * owl_global_messagequeue_addmsg() for that.
  */
-owl_message *owl_function_make_outgoing_loopback(char *body)
+owl_message *owl_function_make_outgoing_loopback(const char *body)
 {
   owl_message *m;
@@ -279 +280 @@
 }
 
-void owl_function_zwrite_setup(char *line)
+void owl_function_zwrite_setup(const char *line)
 {
   owl_editwin *e;
@@ -324 +325 @@
 }
 
-void owl_function_aimwrite_setup(char *line)
+void owl_function_aimwrite_setup(const char *line)
 {
   owl_editwin *e;
@@ -388 +389 @@
  * the message is expected to be set from the zwrite line itself
  */
-void owl_function_zwrite(char *line, char *msg)
+void owl_function_zwrite(const char *line, const char *msg)
 {
   owl_zwrite z;
-  char *mymsg;
+  const char *mymsg;
   owl_message *m;
 
@@ -428 +429 @@
  * the message is expected to be set from the zwrite line itself
  */
-void owl_function_zcrypt(char *line, char *msg)
+void owl_function_zcrypt(const char *line, const char *msg)
 {
   owl_zwrite z;
-  char *mymsg;
+  const char *mymsg;
   char *cryptmsg;
   owl_message *m;
@@ -497 +498 @@
 }
 
-void owl_function_aimwrite(char *line, char *msg)
+void owl_function_aimwrite(const char *line, const char *msg)
 {
   int ret;
-  char *to, *format_msg;
+  const char *to;
+  char *format_msg;
   owl_message *m;
 
@@ -529 +531 @@
 }
 
-void owl_function_send_aimawymsg(char *to, char *msg)
+void owl_function_send_aimawymsg(const char *to, const char *msg)
 {
   int ret;
@@ -561 +563 @@
 }
 
-void owl_function_loopwrite(char *msg)
+void owl_function_loopwrite(const char *msg)
 {
   owl_message *min, *mout;
@@ -588 +590 @@
  * If last_if_none, will stop at the last message in the view
  * if no matching messages are found.  */
-void owl_function_nextmsg_full(char *filter, int skip_deleted, int last_if_none)
+void owl_function_nextmsg_full(const char *filter, int skip_deleted, int last_if_none)
 {
   int curmsg, i, viewsize, found;
-  owl_view *v;
-  owl_filter *f = NULL;
-  owl_message *m;
+  const owl_view *v;
+  const owl_filter *f = NULL;
+  const owl_message *m;
 
   v=owl_global_get_current_view(&g);
@@ -641 +643 @@
 }
 
-void owl_function_prevmsg_full(char *filter, int skip_deleted, int first_if_none)
+void owl_function_prevmsg_full(const char *filter, int skip_deleted, int first_if_none)
 {
   int curmsg, i, viewsize, found;
-  owl_view *v;
-  owl_filter *f = NULL;
-  owl_message *m;
+  const owl_view *v;
+  const owl_filter *f = NULL;
+  const owl_message *m;
 
   v=owl_global_get_current_view(&g);
@@ -772 +774 @@
 {
   int curmsg;
-  owl_message *m;
+  const owl_message *m;
   owl_messagelist *ml;
   owl_view *v;
@@ -816 +818 @@
 {
   int oldcurmsg, curmsg;
-  owl_view *v;
+  const owl_view *v;
 
   v=owl_global_get_current_view(&g);
@@ -879 +881 @@
  * only, no error message is printed.
  */
-void owl_function_loadsubs(char *file)
+void owl_function_loadsubs(const char *file)
 {
   int ret, ret2;
-  char *foo, *path;
+  const char *foo;
+  char *path;
 
   if (file==NULL) {
@@ -911 +914 @@
 }
 
-void owl_function_loadloginsubs(char *file)
+void owl_function_loadloginsubs(const char *file)
 {
   int ret;
@@ -931 +934 @@
 }
 
-void owl_function_aimlogin(char *user, char *passwd) {
+void owl_function_aimlogin(const char *user, const char *passwd) {
   int ret;
 
@@ -1038 +1041 @@
 {
   int recwinlines, topmsg, curmsg;
-  owl_view *v;
+  const owl_view *v;
 
   v=owl_global_get_current_view(&g);
@@ -1082 +1085 @@
  * and the number of lines in the recwin.
  */
-int owl_function_calculate_topmsg_top(int direction, owl_view *v, int curmsg, int topmsg, int recwinlines)
+int owl_function_calculate_topmsg_top(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines)
 {
   return(curmsg);
 }
 
-int owl_function_calculate_topmsg_neartop(int direction, owl_view *v, int curmsg, int topmsg, int recwinlines)
+int owl_function_calculate_topmsg_neartop(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines)
 {
   if (curmsg>0 
@@ -1098 +1101 @@
 }
   
-int owl_function_calculate_topmsg_center(int direction, owl_view *v, int curmsg, int topmsg, int recwinlines)
+int owl_function_calculate_topmsg_center(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines)
 {
   int i, last, lines;
@@ -1112 +1115 @@
 }
   
-int owl_function_calculate_topmsg_paged(int direction, owl_view *v, int curmsg, int topmsg, int recwinlines, int center_on_page)
+int owl_function_calculate_topmsg_paged(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines, int center_on_page)
 {
   int i, last, lines, savey;
@@ -1152 +1155 @@
 }
 
-int owl_function_calculate_topmsg_normal(int direction, owl_view *v, int curmsg, int topmsg, int recwinlines)
+int owl_function_calculate_topmsg_normal(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines)
 {
   int savey, i, foo, y;
@@ -1233 +1236 @@
 }
 
-void owl_function_debugmsg(char *fmt, ...)
+void owl_function_debugmsg(const char *fmt, ...)
 {
   FILE *file;
@@ -1268 +1271 @@
 }
 
-int owl_function_subscribe(char *class, char *inst, char *recip)
+int owl_function_subscribe(const char *class, const char *inst, const char *recip)
 {
   int ret;
@@ -1281 +1284 @@
 }
 
-void owl_function_unsubscribe(char *class, char *inst, char *recip)
+void owl_function_unsubscribe(const char *class, const char *inst, const char *recip)
 {
   int ret;
@@ -1323 +1326 @@
 }
 
-void owl_function_popless_text(char *text)
+void owl_function_popless_text(const char *text)
 {
   owl_popwin *pw;
@@ -1340 +1343 @@
 }
 
-void owl_function_popless_fmtext(owl_fmtext *fm)
+void owl_function_popless_fmtext(const owl_fmtext *fm)
 {
   owl_popwin *pw;
@@ -1357 +1360 @@
 }
 
-void owl_function_popless_file(char *filename)
+void owl_function_popless_file(const char *filename)
 {
   owl_fmtext fm;
@@ -1408 +1411 @@
 void owl_function_info()
 {
-  owl_message *m;
+  const owl_message *m;
   owl_fmtext fm, attrfm;
-  owl_view *v;
+  const owl_view *v;
 #ifdef HAVE_LIBZEPHYR
-  ZNotice_t *n;
+  const ZNotice_t *n;
 #endif
 
@@ -1543 +1546 @@
 void owl_function_curmsg_to_popwin()
 {
-  owl_view *v;
-  owl_message *m;
-  owl_style *s;
+  const owl_view *v;
+  const owl_message *m;
+  const owl_style *s;
   owl_fmtext fm;
 
@@ -1570 +1573 @@
 
   int offset, curmsg, lines;
-  owl_view *v;
+  const owl_view *v;
   owl_message *m;
 
@@ -1662 +1665 @@
 void owl_function_printallvars()
 {
-  char *name;
+  const char *name;
   char var[LINE];
   owl_list varnames;
@@ -1692 +1695 @@
   owl_fmtext fm;  
   int i, numvarnames;
-  char *varname;
+  const char *varname;
 
   owl_fmtext_init_null(&fm);
@@ -1710 +1713 @@
 }
 
-void owl_function_show_variable(char *name)
+void owl_function_show_variable(const char *name)
 {
   owl_fmtext fm;  
@@ -1724 +1727 @@
 void owl_function_delete_by_id(int id, int flag)
 {
-  owl_messagelist *ml;
+  const owl_messagelist *ml;
   owl_message *m;
   ml = owl_global_get_msglist(&g);
@@ -1748 +1751 @@
   int i, j, count;
   owl_message *m;
-  owl_view *v;
-  owl_filter *f;
+  const owl_view *v;
+  const owl_filter *f;
 
   /* get the trash filter */
@@ -1883 +1886 @@
 {
   char *buff=NULL;
-  owl_message *m;
-  owl_filter *f;
+  const owl_message *m;
+  const owl_filter *f;
   
   if (owl_view_get_size(owl_global_get_current_view(&g))==0) {
@@ -1936 +1939 @@
 }
 
-void owl_function_zlocate(int argc, char **argv, int auth)
+void owl_function_zlocate(int argc, const char *const *argv, int auth)
 {
   owl_fmtext fm;
@@ -1955 +1958 @@
 }
 
-void owl_function_start_command(char *line)
+void owl_function_start_command(const char *line)
 {
   owl_editwin *tw;
@@ -1974 +1977 @@
 }
 
-void owl_function_start_question(char *line)
+void owl_function_start_question(const char *line)
 {
   owl_editwin *tw;
@@ -1991 +1994 @@
 }
 
-void owl_function_start_password(char *line)
+void owl_function_start_password(const char *line)
 {
   owl_editwin *tw;
@@ -2009 +2012 @@
 }
 
-char *owl_function_exec(int argc, char **argv, char *buff, int type)
+char *owl_function_exec(int argc, const char *const *argv, const char *buff, int type)
 {
   /* if type == 1 display in a popup
@@ -2016 +2019 @@
    * else display in a popup
    */
-  char *newbuff, *redirect = " 2>&1 < /dev/null";
+  const char *redirect = " 2>&1 < /dev/null";
+  char *newbuff;
   char *out, buff2[1024];
   int size;
@@ -2063 +2067 @@
 }
 
-char *owl_function_perl(int argc, char **argv, char *buff, int type)
+char *owl_function_perl(int argc, const char *const *argv, const char *buff, int type)
 {
   /* if type == 1 display in a popup
@@ -2100 +2104 @@
  * should have the pointer.
  */
-void owl_function_change_currentview_filter(char *filtname)
+void owl_function_change_currentview_filter(const char *filtname)
 {
   owl_view *v;
   owl_filter *f;
   int curid=-1, newpos, curmsg;
-  owl_message *curm=NULL;
+  const owl_message *curm=NULL;
 
   v=owl_global_get_current_view(&g);
@@ -2148 +2152 @@
  * with a new definition.
  */
-void owl_function_create_filter(int argc, char **argv)
+void owl_function_create_filter(int argc, const char *const *argv)
 {
   owl_filter *f;
-  owl_view *v;
+  const owl_view *v;
   int ret, inuse=0;
 
@@ -2240 +2244 @@
  * Returns the name of the negated filter, which the caller must free.
  */
-char *owl_function_create_negative_filter(char *filtername)
+char *owl_function_create_negative_filter(const char *filtername)
 {
   char *newname;
-  owl_filter *tmpfilt;
-  char *argv[5];
+  const owl_filter *tmpfilt;
+  const char *argv[5];
 
   owl_function_debugmsg("owl_function_create_negative_filter");
@@ -2270 +2274 @@
 void owl_function_show_filters()
 {
-  owl_list *l;
-  owl_filter *f;
+  const owl_list *l;
+  const owl_filter *f;
   int i, j;
   owl_fmtext fm;
@@ -2296 +2300 @@
 }
 
-void owl_function_show_filter(char *name)
-{
-  owl_filter *f;
+void owl_function_show_filter(const char *name)
+{
+  const owl_filter *f;
   char *buff, *tmp;
 
@@ -2315 +2319 @@
 void owl_function_show_zpunts()
 {
-  owl_filter *f;
-  owl_list *fl;
+  const owl_filter *f;
+  const owl_list *fl;
   char buff[5000];
   char *tmp;
@@ -2344 +2348 @@
  * name of the filter, which the caller must free.
  */
-char *owl_function_classinstfilt(char *c, char *i) 
+char *owl_function_classinstfilt(const char *c, const char *i) 
 {
   owl_filter *f;
@@ -2422 +2426 @@
  * the filter, which the caller must free.
  */
-char *owl_function_zuserfilt(char *user)
+char *owl_function_zuserfilt(const char *user)
 {
   owl_filter *f;
@@ -2469 +2473 @@
  * Returns the name of the filter, which the caller must free.
  */
-char *owl_function_aimuserfilt(char *user)
+char *owl_function_aimuserfilt(const char *user)
 {
   owl_filter *f;
@@ -2505 +2509 @@
 }
 
-char *owl_function_typefilt(char *type)
+char *owl_function_typefilt(const char *type)
 {
   owl_filter *f;
@@ -2541 +2545 @@
 void owl_function_delete_curview_msgs(int flag)
 {
-  owl_view *v;
+  const owl_view *v;
   int i, j;
 
@@ -2575 +2579 @@
 char *owl_function_smartfilter(int type)
 {
-  owl_view *v;
-  owl_message *m;
+  const owl_view *v;
+  const owl_message *m;
   char *zperson, *filtname=NULL;
-  char *argv[1];
+  const char *argv[1];
   
   v=owl_global_get_current_view(&g);
@@ -2647 +2651 @@
   /* Starts a zpunt command based on the current class,instance pair. 
    * If type=0, uses just class.  If type=1, uses instance as well. */
-  owl_view *v;
-  owl_message *m;
-  char *cmd, *cmdprefix, *mclass, *minst;
+  const owl_view *v;
+  const owl_message *m;
+  const char *cmdprefix, *mclass, *minst;
+  char *cmd;
   
   v=owl_global_get_current_view(&g);
@@ -2697 +2702 @@
  * be 'color'
  */
-void owl_function_color_current_filter(char *fgcolor, char *bgcolor)
-{
-  char *name;
+void owl_function_color_current_filter(const char *fgcolor, const char *bgcolor)
+{
+  const char *name;
 
   name=owl_view_get_filtname(owl_global_get_current_view(&g));
@@ -2709 +2714 @@
  * the "all" filter, return -2.  Return 0 on success
  */
-int owl_function_color_filter(char *filtname, char *fgcolor, char *bgcolor)
+int owl_function_color_filter(const char *filtname, const char *fgcolor, const char *bgcolor)
 {
   owl_filter *f;
@@ -2792 +2797 @@
  *   if direction==1 then unpunt
  */
-void owl_function_zpunt(char *class, char *inst, char *recip, int direction)
+void owl_function_zpunt(const char *class, const char *inst, const char *recip, int direction)
 {
   char *puntexpr, *classexpr, *instexpr, *recipexpr;
@@ -2839 +2844 @@
 }
 
-void owl_function_punt(char *filter, int direction)
+void owl_function_punt(const char *filter, int direction)
 {
   owl_filter *f;
@@ -2885 +2890 @@
 }
 
-void owl_function_activate_keymap(char *keymap)
+void owl_function_activate_keymap(const char *keymap)
 {
   if (!owl_keyhandler_activate(owl_global_get_keyhandler(&g), keymap)) {
@@ -2896 +2901 @@
   owl_list l;
   owl_fmtext fm;
-  owl_keymap *km;
-  owl_keyhandler *kh;
+  const owl_keymap *km;
+  const owl_keyhandler *kh;
   int i, numkm;
-  char *kmname;
+  const char *kmname;
 
   kh = owl_global_get_keyhandler(&g);
@@ -2923 +2928 @@
 }
 
-char *owl_function_keymap_summary(char *name)
-{
-  owl_keymap *km 
+char *owl_function_keymap_summary(const char *name)
+{
+  const owl_keymap *km 
     = owl_keyhandler_get_keymap(owl_global_get_keyhandler(&g), name);
   if (km) return owl_keymap_summary(km);
@@ -2932 +2937 @@
 
 /* TODO: implement for real */
-void owl_function_show_keymap(char *name)
+void owl_function_show_keymap(const char *name)
 {
   owl_fmtext fm;
-  owl_keymap *km;
+  const owl_keymap *km;
 
   owl_fmtext_init_null(&fm);
@@ -2948 +2953 @@
 }
 
-void owl_function_help_for_command(char *cmdname)
+void owl_function_help_for_command(const char *cmdname)
 {
   owl_fmtext fm;
@@ -2958 +2963 @@
 }
 
-void owl_function_search_start(char *string, int direction)
+void owl_function_search_start(const char *string, int direction)
 {
   /* direction is OWL_DIRECTION_DOWNWARDS or OWL_DIRECTION_UPWARDS or
@@ -2993 +2998 @@
    */
 
-  owl_view *v;
+  const owl_view *v;
   int viewsize, i, curmsg, start;
   owl_message *m;
@@ -3054 +3059 @@
 /* strips formatting from ztext and returns the unformatted text. 
  * caller is responsible for freeing. */
-char *owl_function_ztext_stylestrip(char *zt)
+char *owl_function_ztext_stylestrip(const char *zt)
 {
   owl_fmtext fm;
@@ -3067 +3072 @@
 
 /* Popup a buddylisting.  If filename is NULL use the default .anyone */
-void owl_function_buddylist(int aim, int zephyr, char *filename)
+void owl_function_buddylist(int aim, int zephyr, const char *filename)
 {
   int i, j, idle;
   int interrupted = 0;
   owl_fmtext fm;
-  owl_buddylist *bl;
-  owl_buddy *b;
+  const owl_buddylist *bl;
+  const owl_buddy *b;
   char *timestr;
 #ifdef HAVE_LIBZEPHYR
   int x;
   owl_list anyone;
-  char *tmp, *user;
+  const char *user;
+  char *tmp;
   ZLocations_t location[200];
   int numlocs, ret;
@@ -3126 +3132 @@
         for (i=0; i<j; i++) {
           user=owl_list_get_element(&anyone, i);
-          ret=ZLocateUser(user, &numlocs, ZAUTH);
+          ret=ZLocateUser(zstr(user), &numlocs, ZAUTH);
 
           owl_function_mask_sigint(NULL);
@@ -3183 +3189 @@
 
 /* Dump messages in the current view to the file 'filename'. */
-void owl_function_dump(char *filename) 
+void owl_function_dump(const char *filename) 
 {
   int i, j, count;
   owl_message *m;
-  owl_view *v;
+  const owl_view *v;
   FILE *file;
   char *plaintext;
@@ -3293 +3299 @@
  * startupfile.
  */
-void owl_function_addstartup(char *buff)
+void owl_function_addstartup(const char *buff)
 {
   FILE *file;
-  char *filename;
+  const char *filename;
 
   filename=owl_global_get_startupfile(&g);
@@ -3315 +3321 @@
 
 /* Remove the specified command from the startup file. */
-void owl_function_delstartup(char *buff)
-{
-  char *filename;
+void owl_function_delstartup(const char *buff)
+{
+  const char *filename;
   filename=owl_global_get_startupfile(&g);
   owl_util_file_deleteline(filename, buff, 1);
@@ -3325 +3331 @@
  * is NULL, use the default owl startup commands file.
  */
-void owl_function_source(char *filename)
+void owl_function_source(const char *filename)
 {
   char *path;
@@ -3354 +3360 @@
 }
 
-void owl_function_change_style(owl_view *v, char *stylename)
-{
-  owl_style *s;
+void owl_function_change_style(owl_view *v, const char *stylename)
+{
+  const owl_style *s;
 
   s=owl_global_get_style_by_name(&g, stylename);
@@ -3372 +3378 @@
 {
   owl_view *v;
-  owl_style *s;
+  const owl_style *s;
 
   v=owl_global_get_current_view(&g);
@@ -3388 +3394 @@
 }
 
-void owl_function_error(char *fmt, ...)
+void owl_function_error(const char *fmt, ...)
 {
   va_list ap;
   char *buff;
-  char *nl;
+  const char *nl;
 
   va_start(ap, fmt);
@@ -3410 +3416 @@
 }
 
-void owl_function_log_err(char *string)
+void owl_function_log_err(const char *string)
 {
   char *date;
@@ -3438 +3444 @@
 }
 
-void owl_function_makemsg(char *fmt, ...)
+void owl_function_makemsg(const char *fmt, ...)
 {
   va_list ap;
@@ -3468 +3474 @@
   owl_message *m;
   owl_zbuddylist *zbl;
-  char *user;
+  const char *user;
   ZLocations_t location[200];
   int numlocs, ret;
@@ -3480 +3486 @@
   for (i=0; i<j; i++) {
     user=owl_list_get_element(&anyone, i);
-    ret=ZLocateUser(user, &numlocs, ZAUTH);
+    ret=ZLocateUser(zstr(user), &numlocs, ZAUTH);
     if (ret!=ZERR_NONE) {
       owl_function_error("Error getting location for %s", user);
@@ -3519 +3525 @@
 }
 
-void owl_function_aimsearch_results(char *email, owl_list *namelist)
+void owl_function_aimsearch_results(const char *email, owl_list *namelist)
 {
   owl_fmtext fm;
@@ -3561 +3567 @@
 }
 
-void _owl_function_mark_message(owl_message *m)
+void _owl_function_mark_message(const owl_message *m)
 {
   if (m)
@@ -3569 +3575 @@
 void owl_function_mark_message()
 {
-  owl_message *m;
-  owl_view *v;
+  const owl_message *m;
+  const owl_view *v;
 
   v=owl_global_get_current_view(&g);
@@ -3589 +3595 @@
 {
   int marked_id;
-  owl_message *m;
-  owl_view *v;
+  const owl_message *m;
+  const owl_view *v;
 
   marked_id=owl_global_get_markedmsgid(&g);