From e84f07de2a81891c2cff7b7f3270ac6e9e9d4f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Assailly?= <remi.assailly@free.fr>
Date: Mon, 14 Feb 2005 21:04:13 +0000
Subject: [PATCH] char -> const char fixes.

---
 dlls/richedit/reader.c       | 39 ++++++++++++++++++------------------
 dlls/richedit/rtf.h          | 10 ++++-----
 dlls/richedit/stdcharnames.h |  2 +-
 dlls/richedit/text_map.h     |  2 +-
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/dlls/richedit/reader.c b/dlls/richedit/reader.c
index b4368d0570a..571a66d956c 100644
--- a/dlls/richedit/reader.c
+++ b/dlls/richedit/reader.c
@@ -778,7 +778,7 @@ int	oldBumpLine;
  * part of the token text.
  */
 
-void RTFSetToken(RTF_Info *info, int class, int major, int minor, int param, char *text)
+void RTFSetToken(RTF_Info *info, int class, int major, int minor, int param, const char *text)
 {
     TRACE("\n");
 
@@ -942,7 +942,7 @@ int RTFReadCharSetMap(RTF_Info *info, int csId)
  * Return -1 if name is unknown.
  */
 
-int RTFStdCharCode(RTF_Info *info, char *name)
+int RTFStdCharCode(RTF_Info *info, const char *name)
 {
 int	i;
 
@@ -962,7 +962,7 @@ int	i;
  * Return NULL if code is unknown.
  */
 
-char *RTFStdCharName(RTF_Info *info, int code)
+const char *RTFStdCharName(RTF_Info *info, int code)
 {
 	if (code < 0 || code >= rtfSC_MaxChar)
 		return ((char *) NULL);
@@ -1065,10 +1065,10 @@ int RTFGetCharSet(RTF_Info *info)
 
 static void ReadFontTbl(RTF_Info *info)
 {
-RTFFont	*fp = NULL;
-char	buf[rtfBufSiz], *bp;
-int	old = -1;
-char	*fn = "ReadFontTbl";
+RTFFont		*fp = NULL;
+char		buf[rtfBufSiz], *bp;
+int		old = -1;
+const char	*fn = "ReadFontTbl";
 
     TRACE("\n");
 
@@ -1219,7 +1219,7 @@ static void ReadColorTbl(RTF_Info *info)
 {
 RTFColor	*cp;
 int		cnum = 0;
-char		*fn = "ReadColorTbl";
+const char	*fn = "ReadColorTbl";
 
     TRACE("\n");
 
@@ -1261,7 +1261,7 @@ static void ReadStyleSheet(RTF_Info *info)
 RTFStyle	*sp;
 RTFStyleElt	*sep, *sepLast;
 char		buf[rtfBufSiz], *bp;
-char		*fn = "ReadStyleSheet";
+const char	*fn = "ReadStyleSheet";
 
     TRACE("\n");
 
@@ -1544,10 +1544,10 @@ typedef struct RTFKey	RTFKey;
 
 struct RTFKey
 {
-	int	rtfKMajor;	/* major number */
-	int	rtfKMinor;	/* minor number */
-	char	*rtfKStr;	/* symbol name */
-	int	rtfKHash;	/* symbol name hash value */
+	int        rtfKMajor;	/* major number */
+	int        rtfKMinor;	/* minor number */
+	const char *rtfKStr;	/* symbol name */
+	int        rtfKHash;	/* symbol name hash value */
 };
 
 /*
@@ -2459,7 +2459,7 @@ RTFKey	*rp;
 	if (inited == 0)
 	{
 		for (rp = rtfKey; rp->rtfKStr != (char *) NULL; rp++)
-			rp->rtfKHash = Hash (rp->rtfKStr);
+			rp->rtfKHash = Hash ((char*)rp->rtfKStr);
 		++inited;
 	}
 }
@@ -2621,7 +2621,6 @@ int RTFReadOutputMap(RTF_Info *info, char *outMap[], int reinit)
 {
     unsigned int  i;
     int  stdCode;
-    char *name, *seq;
 
     if (reinit)
     {
@@ -2633,10 +2632,10 @@ int RTFReadOutputMap(RTF_Info *info, char *outMap[], int reinit)
 
     for (i=0 ;i< sizeof(text_map)/sizeof(char*); i+=2)
     {
-    	name = text_map[i];
-    	seq  = text_map[i+1];
+    	const char *name = text_map[i];
+    	const char *seq  = text_map[i+1];
     	stdCode = RTFStdCharCode( info, name );
-    	outMap[stdCode] = seq;
+    	outMap[stdCode] = (char*)seq;
     }
 
     return (1);
@@ -2676,7 +2675,7 @@ FILE *RTFOpenLibFile (RTF_Info *info, char *file, char *mode)
  */
 
 
-void RTFMsg (RTF_Info *info, char *fmt, ...)
+void RTFMsg (RTF_Info *info, const char *fmt, ...)
 {
 char	buf[rtfBufSiz];
 
@@ -2706,7 +2705,7 @@ static void DefaultPanicProc(RTF_Info *info, char *s)
 
 
 
-void RTFPanic(RTF_Info *info, char *fmt, ...)
+void RTFPanic(RTF_Info *info, const char *fmt, ...)
 {
 char	buf[rtfBufSiz];
 
diff --git a/dlls/richedit/rtf.h b/dlls/richedit/rtf.h
index 42ff6aca219..87fd5906223 100644
--- a/dlls/richedit/rtf.h
+++ b/dlls/richedit/rtf.h
@@ -1518,7 +1518,7 @@ void		RTFRead (RTF_Info *);
 int		RTFGetToken (RTF_Info *);	/* writer should rarely need this */
 void		RTFUngetToken (RTF_Info *);
 int		RTFPeekToken (RTF_Info *);
-void		RTFSetToken (RTF_Info *, int, int, int, int, char *);
+void		RTFSetToken (RTF_Info *, int, int, int, int, const char *);
 void		RTFSetReadHook (RTF_Info *, RTFFuncPtr);
 RTFFuncPtr	RTFGetReadHook (RTF_Info *);
 void		RTFRouteToken (RTF_Info *);
@@ -1546,14 +1546,14 @@ void		RTFSetPanicProc ( RTF_Info *, RTFFuncPtr);
  * stdarg.h.
  */
 
-void	RTFMsg (RTF_Info *, char *fmt, ...);
-void	RTFPanic (RTF_Info *, char *fmt, ...);
+void	RTFMsg (RTF_Info *, const char *fmt, ...);
+void	RTFPanic (RTF_Info *, const char *fmt, ...);
 
 int 	    	RTFReadOutputMap ( RTF_Info *, char *[], int);
 int		RTFReadCharSetMap ( RTF_Info *, int);
 void		RTFSetCharSetMap ( RTF_Info *, char *, int);
-int		RTFStdCharCode ( RTF_Info *, char *);
-char		*RTFStdCharName ( RTF_Info *, int);
+int		RTFStdCharCode ( RTF_Info *, const char *);
+const char	*RTFStdCharName ( RTF_Info *, int);
 int		RTFMapChar ( RTF_Info *, int);
 int		RTFGetCharSet( RTF_Info * );
 void		RTFSetCharSet( RTF_Info *, int);
diff --git a/dlls/richedit/stdcharnames.h b/dlls/richedit/stdcharnames.h
index dd94fb9f145..27cf9c3a467 100644
--- a/dlls/richedit/stdcharnames.h
+++ b/dlls/richedit/stdcharnames.h
@@ -1,4 +1,4 @@
-static char     *stdCharName[] =
+const char *stdCharName[] =
 {
 	"nothing",
 	"space",
diff --git a/dlls/richedit/text_map.h b/dlls/richedit/text_map.h
index 3c4379120c5..4827fb2dd32 100644
--- a/dlls/richedit/text_map.h
+++ b/dlls/richedit/text_map.h
@@ -11,7 +11,7 @@
  *  characters in ASCII range (32-127
  */
 
-char *text_map[] = {
+const char *text_map[] = {
   "space"	      ," ",
   "exclam"	      ,"!",
   "quotedbl"	      ,"\"",