Changes in editwin.c [0509efc:e19eb97]

File:

• editwin.c (modified) (22 diffs)

editwin.c

@@ -45 +45 @@
 static void oe_restore_excursion(owl_editwin *e, oe_excursion *x);
 static void oe_restore_mark_only(owl_editwin *e, oe_excursion *x);
-static int oe_count_glyphs(char *s);
+static int oe_count_glyphs(const char *s);
 static int oe_char_width(gunichar c, int column);
 static int oe_region_width(owl_editwin *e, int start, int end, int width);
@@ -52 +52 @@
 static int owl_editwin_limit_maxcols(int v, int maxv);
 static int owl_editwin_check_dotsend(owl_editwin *e);
-static int owl_editwin_is_char_in(owl_editwin *e, char *set);
+static int owl_editwin_is_char_in(owl_editwin *e, const char *set);
 static gunichar owl_editwin_get_char_at_point(owl_editwin *e);
-static int owl_editwin_replace_internal(owl_editwin *e, int replace, char *s);
-static char *oe_copy_buf(owl_editwin *e, char *buf, int len);
+static int owl_editwin_replace_internal(owl_editwin *e, int replace, const char *s);
+static const char *oe_copy_buf(owl_editwin *e, const char *buf, int len);
 static int oe_copy_region(owl_editwin *e);
 static char *oe_chunk(owl_editwin *e, int start, int end);
@@ -71 +71 @@
 }
 
-static int oe_count_glyphs(char *s)
+static int oe_count_glyphs(const char *s)
 {
   int count = 0;
-  char *p;
+  const char *p;
 
   for(p = s; *p != 0; p = g_utf8_find_next_char(p, NULL))
@@ -175 +175 @@
 }
 
-void owl_editwin_set_command(owl_editwin *e, char *command)
+void owl_editwin_set_command(owl_editwin *e, const char *command)
 {
   if(e->command) owl_free(e->command);
@@ -181 +181 @@
 }
 
-char *owl_editwin_get_command(owl_editwin *e)
+const char *owl_editwin_get_command(owl_editwin *e)
 {
   if(e->command) return e->command;
@@ -230 +230 @@
  * previous text (including locked text) will be overwritten
  */
-void owl_editwin_set_locktext(owl_editwin *e, char *text)
+void owl_editwin_set_locktext(owl_editwin *e, const char *text)
 {
   oe_set_index(e, 0);
@@ -378 +378 @@
 }
 
-static inline char *oe_next_point(owl_editwin *e, char *p)
-{
-  char *boundary = e->buff + e->bufflen + 1;
-  char *q;
+static inline const char *oe_next_point(owl_editwin *e, const char *p)
+{
+  const char *boundary = e->buff + e->bufflen + 1;
+  const char *q;
 
   q = g_utf8_find_next_char(p, boundary);
@@ -392 +392 @@
 }
 
-static inline char *oe_prev_point(owl_editwin *e, char *p)
-{
-  char *boundary = e->buff + e->lock;
+static inline const char *oe_prev_point(owl_editwin *e, const char *p)
+{
+  const char *boundary = e->buff + e->lock;
 
   p = g_utf8_find_prev_char(boundary, p);
@@ -422 +422 @@
   int width = 0, cw;
   gunichar c;
-  char *p;
+  const char *p;
 
   while(1) {
@@ -576 +576 @@
 }
 
-int owl_editwin_replace_region(owl_editwin *e, char *s)
+int owl_editwin_replace_region(owl_editwin *e, const char *s)
 {
   oe_excursion x;
@@ -594 +594 @@
 
 /* replace 'replace' characters at the point with s, returning the change in size */
-int owl_editwin_replace(owl_editwin *e, int replace, char *s)
+int owl_editwin_replace(owl_editwin *e, int replace, const char *s)
 {
   int start, end, i;
-  char *p;
+  const char *p;
 
   if (!g_utf8_validate(s, -1, NULL)) {
@@ -615 +615 @@
 }
 
-static int owl_editwin_replace_internal(owl_editwin *e, int replace, char *s)
+static int owl_editwin_replace_internal(owl_editwin *e, int replace, const char *s)
 {
   int start, end, free, need, size, change;
@@ -694 +694 @@
 void owl_editwin_transpose_chars(owl_editwin *e)
 {
-  char *middle, *end, *start, *tmp;
+  const char *middle, *end, *start;
+  char *tmp;
 
   if (e->bufflen == 0) return;
@@ -727 +728 @@
  * right
  */
-void owl_editwin_insert_string(owl_editwin *e, char *s)
+void owl_editwin_insert_string(owl_editwin *e, const char *s)
 {
   owl_editwin_replace(e, 0, s);
@@ -750 +751 @@
 int owl_editwin_point_move(owl_editwin *e, int delta)
 {
-  char *p;
+  const char *p;
   int change, d = 0;
 
@@ -800 +801 @@
 }
 
-static int owl_editwin_is_char_in(owl_editwin *e, char *set)
-{
-  char *p;
+static int owl_editwin_is_char_in(owl_editwin *e, const char *set)
+{
+  const char *p;
 
   for (p = set; *p != 0; p = g_utf8_find_next_char(p, NULL))
@@ -810 +811 @@
 }
 
-int owl_editwin_move_if_in(owl_editwin *e, int delta, char *set)
+int owl_editwin_move_if_in(owl_editwin *e, int delta, const char *set)
 {
   int change, distance = 0;
@@ -822 +823 @@
 }
 
-int owl_editwin_move_if_not_in(owl_editwin *e, int delta, char *set)
+int owl_editwin_move_if_not_in(owl_editwin *e, int delta, const char *set)
 {
   int change, distance = 0;
@@ -1029 +1030 @@
 }
 
-static char *oe_copy_buf(owl_editwin *e, char *buf, int len)
+static const char *oe_copy_buf(owl_editwin *e, const char *buf, int len)
 {
   char *p;
@@ -1047 +1048 @@
 static int oe_copy_region(owl_editwin *e)
 {
-  char *p;
+  const char *p;
   int start, end;
 
@@ -1236 +1237 @@
 static int oe_region_width(owl_editwin *e, int start, int end, int offset)
 {
-  char *p;
+  const char *p;
   int width = offset;
   
@@ -1316 +1317 @@
 }
 
-char *owl_editwin_get_text(owl_editwin *e)
+const char *owl_editwin_get_text(owl_editwin *e)
 {
   return(e->buff+e->lock);