Changeset e19eb97 for fmtext.c

Timestamp:

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

1077891a

Parents:

fa4562c

git-author:

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

git-committer:

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

Message:

Add const qualifiers for char * and void *.

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

File:

• fmtext.c (modified) (13 diffs)

fmtext.c

@@ -43 +43 @@
  * 'color'
  */
-void owl_fmtext_append_attr(owl_fmtext *f, char *text, char attr, short fgcolor, short bgcolor)
+void owl_fmtext_append_attr(owl_fmtext *f, const char *text, char attr, short fgcolor, short bgcolor)
 {
   char attrbuff[6];
@@ -83 +83 @@
 
 /* Append normal, uncolored text 'text' to 'f' */
-void owl_fmtext_append_normal(owl_fmtext *f, char *text)
+void owl_fmtext_append_normal(owl_fmtext *f, const char *text)
 {
   owl_fmtext_append_attr(f, text, OWL_FMTEXT_ATTR_NONE, OWL_COLOR_DEFAULT, OWL_COLOR_DEFAULT);
@@ -89 +89 @@
 
 /* Append normal, uncolored text specified by format string to 'f' */
-void owl_fmtext_appendf_normal(owl_fmtext *f, char *fmt, ...)
+void owl_fmtext_appendf_normal(owl_fmtext *f, const char *fmt, ...)
 {
   va_list ap;
@@ -103 +103 @@
 
 /* Append normal text 'text' to 'f' with color 'color' */
-void owl_fmtext_append_normal_color(owl_fmtext *f, char *text, int fgcolor, int bgcolor)
+void owl_fmtext_append_normal_color(owl_fmtext *f, const char *text, int fgcolor, int bgcolor)
 {
   owl_fmtext_append_attr(f, text, OWL_FMTEXT_ATTR_NONE, fgcolor, bgcolor);
@@ -109 +109 @@
 
 /* Append bold text 'text' to 'f' */
-void owl_fmtext_append_bold(owl_fmtext *f, char *text)
+void owl_fmtext_append_bold(owl_fmtext *f, const char *text)
 {
   owl_fmtext_append_attr(f, text, OWL_FMTEXT_ATTR_BOLD, OWL_COLOR_DEFAULT, OWL_COLOR_DEFAULT);
@@ -115 +115 @@
 
 /* Append reverse video text 'text' to 'f' */
-void owl_fmtext_append_reverse(owl_fmtext *f, char *text)
+void owl_fmtext_append_reverse(owl_fmtext *f, const char *text)
 {
   owl_fmtext_append_attr(f, text, OWL_FMTEXT_ATTR_REVERSE, OWL_COLOR_DEFAULT, OWL_COLOR_DEFAULT);
@@ -121 +121 @@
 
 /* Append reversed and bold, uncolored text 'text' to 'f' */
-void owl_fmtext_append_reversebold(owl_fmtext *f, char *text)
+void owl_fmtext_append_reversebold(owl_fmtext *f, const char *text)
 {
   owl_fmtext_append_attr(f, text, OWL_FMTEXT_ATTR_REVERSE | OWL_FMTEXT_ATTR_BOLD, OWL_COLOR_DEFAULT, OWL_COLOR_DEFAULT);
@@ -172 +172 @@
 void _owl_fmtext_scan_attributes(owl_fmtext *f, int start, char *attr, short *fgcolor, short *bgcolor) /*noproto*/
 {
-  char *p;
+  const char *p;
   p = strchr(f->textbuff, OWL_FMTEXT_UC_STARTBYTE_UTF8);
   while (p && p < f->textbuff + start) {
@@ -382 +382 @@
 int owl_fmtext_truncate_lines(owl_fmtext *in, int aline, int lines, owl_fmtext *out)
 {
-  char *ptr1, *ptr2;
+  const char *ptr1, *ptr2;
   int i, offset;
   
@@ -426 +426 @@
 void owl_fmtext_truncate_cols(owl_fmtext *in, int acol, int bcol, owl_fmtext *out)
 {
-  char *ptr_s, *ptr_e, *ptr_c, *last;
+  const char *ptr_s, *ptr_e, *ptr_c, *last;
   int col, st, padding, chwidth;
 
@@ -517 +517 @@
 }
 
-char *owl_fmtext_get_text(owl_fmtext *f)
+const char *owl_fmtext_get_text(owl_fmtext *f)
 {
   return(f->textbuff);
@@ -565 +565 @@
  * formatting syntax to set appropriate attributes.
  */
-void owl_fmtext_append_ztext(owl_fmtext *f, char *text)
+void owl_fmtext_append_ztext(owl_fmtext *f, const char *text)
 {
   int stacksize, curattrs, curcolor;
-  char *ptr, *txtptr, *tmpptr;
+  const char *ptr, *txtptr, *tmpptr;
   char *buff;
   int attrstack[32], chrstack[32], colorstack[32];
@@ -770 +770 @@
  * If format_fn is specified, passes it the list element value
  * and it will return a string which this needs to free. */
-void owl_fmtext_append_list(owl_fmtext *f, owl_list *l, char *join_with, char *(format_fn)(char *))
+void owl_fmtext_append_list(owl_fmtext *f, owl_list *l, const char *join_with, char *(format_fn)(const char *))
 {
   int i, size;
-  char *elem;
+  const char *elem;
   char *text;