Index: Amaya.cleanup/thotlib/base/fileaccess.c
===================================================================
--- Amaya.cleanup.orig/thotlib/base/fileaccess.c	2007-10-17 20:55:03.000000000 +0100
+++ Amaya.cleanup/thotlib/base/fileaccess.c	2007-10-17 20:55:18.000000000 +0100
@@ -743,7 +743,7 @@
    dans directory_list le 1er nom du path fourni a` l'appel
    (MakeCompleteName est utilise pour la lecture)          
   ----------------------------------------------------------------------*/
-void MakeCompleteName (char *fname, char *fext, char *directory_list,
+void MakeCompleteName (char *fname, const char *fext, char *directory_list,
 		       char *completeName, int *length)
 {
    int                 i, j;
Index: Amaya.cleanup/thotlib/internals/f/fileaccess_f.h
===================================================================
--- Amaya.cleanup.orig/thotlib/internals/f/fileaccess_f.h	2007-10-17 20:57:26.000000000 +0100
+++ Amaya.cleanup/thotlib/internals/f/fileaccess_f.h	2007-10-17 20:57:45.000000000 +0100
@@ -48,7 +48,7 @@
                              char *aDirectory,
                              char *aName );
 extern void MakeCompleteName ( char *fname,
-                               char *fext,
+                               const char *fext,
                                char *directory_list,
                                char *completeName,
                                int *length );
@@ -110,7 +110,7 @@
                                char *aDirectory,
                                char *aName );
 extern void MakeCompleteName ( char *fname,
-                                 char *fext,
+                                 const char *fext,
                                  char *directory_list,
                                  char *completeName,
                                  int *length );
Index: Amaya.cleanup/thotlib/document/schemas.c
===================================================================
--- Amaya.cleanup.orig/thotlib/document/schemas.c	2007-10-17 21:09:13.000000000 +0100
+++ Amaya.cleanup/thotlib/document/schemas.c	2007-10-17 21:11:19.000000000 +0100
@@ -2726,7 +2726,7 @@
   AddANewNamespaceUri
   ----------------------------------------------------------------------*/
 static void AddANewNamespaceUri (PtrDocument pDoc, PtrElement element,
-                                 char *nsPrefix, char *NsUri)
+                                 char *nsPrefix, const char *NsUri)
 {
   PtrNsUriDescr  newUriDecl, uriDecl, prevUriDecl;
 
@@ -2763,7 +2763,7 @@
   Add a namespace declaration to the document
   ----------------------------------------------------------------------*/
 void SetNamespaceDeclaration (PtrDocument pDoc, PtrElement element,
-                              char *nsPrefix, char *NsUri)
+                              char *nsPrefix, const char *NsUri)
 {
   PtrNsUriDescr   uriDecl;
   ThotBool        found;
Index: Amaya.cleanup/thotlib/internals/f/schemas_f.h
===================================================================
--- Amaya.cleanup.orig/thotlib/internals/f/schemas_f.h	2007-10-17 21:11:56.000000000 +0100
+++ Amaya.cleanup/thotlib/internals/f/schemas_f.h	2007-10-17 21:12:25.000000000 +0100
@@ -104,7 +104,7 @@
 extern void SetNamespaceDeclaration ( PtrDocument pDoc,
                                       PtrElement element,
                                       char *nsPrefix,
-                                      char *NsUri );
+                                      const char *NsUri );
 extern void RemoveNamespaceDeclaration ( PtrDocument pDoc,
                                          PtrElement element );
 extern void ReplaceNamespaceDeclaration ( PtrDocument pDoc,
@@ -217,7 +217,7 @@
 extern void SetNamespaceDeclaration ( PtrDocument pDoc,
                                         PtrElement element,
                                         char *nsPrefix,
-                                        char *NsUri );
+                                        const char *NsUri );
 extern void RemoveNamespaceDeclaration ( PtrDocument pDoc,
                                            PtrElement element );
 extern void ReplaceNamespaceDeclaration ( PtrDocument pDoc,
Index: Amaya.cleanup/amaya/query.c
===================================================================
--- Amaya.cleanup.orig/amaya/query.c	2007-10-17 21:38:55.000000000 +0100
+++ Amaya.cleanup/amaya/query.c	2007-10-17 21:44:25.000000000 +0100
@@ -3417,7 +3417,6 @@
   char               *fileURL;
   char               *etag = NULL;
   HTParentAnchor     *dest_anc_parent;
-  char               *tmp;
   char               *esc_url;
   int                 UsePreconditions;
   char                url_name[MAX_LENGTH];
@@ -3436,7 +3435,7 @@
   else
     {
       /* should we protect the PUT against lost updates? */
-      tmp = TtaGetEnvString ("ENABLE_LOST_UPDATE_CHECK");
+      const char *tmp = TtaGetEnvString ("ENABLE_LOST_UPDATE_CHECK");
       if (tmp && *tmp && strcasecmp (tmp, "yes"))
         lost_update_check = FALSE;
 
@@ -3490,7 +3489,7 @@
   /* prepare the target URL */
   if (resource_name)
     {
-      tmp = strstr (urlName, resource_name);     
+      char *tmp = strstr (urlName, resource_name);     
       if (!tmp)
         {
           /* urlName does not include the resource name */
@@ -3623,7 +3622,7 @@
   charset = TtaGetDocumentCharset (docid);
   if (charset != UNDEFINED_CHARSET)
     {
-      tmp =  TtaGetCharsetName (charset);
+      const char *tmp =  TtaGetCharsetName (charset);
       if (tmp && *tmp != EOS)
         {
           tmp2 = TtaStrdup (tmp);
Index: Amaya.cleanup/thotlib/document/translation.c
===================================================================
--- Amaya.cleanup.orig/thotlib/document/translation.c	2007-10-17 21:29:26.000000000 +0100
+++ Amaya.cleanup/thotlib/document/translation.c	2007-10-17 21:29:56.000000000 +0100
@@ -4622,7 +4622,7 @@
   PtrTtAttribute      pAttr1;
   PtrDocument         pDoc;
   CHARSET             charset;
-  char               *charset_name;
+  const char         *charset_name;
   char               *startName = NULL;
   char               *endName = NULL;
   char               *ns_prefix;
Index: Amaya.cleanup/thotlib/include/ustring.h
===================================================================
--- Amaya.cleanup.orig/thotlib/include/ustring.h	2007-10-17 21:25:04.000000000 +0100
+++ Amaya.cleanup/thotlib/include/ustring.h	2007-10-17 21:25:21.000000000 +0100
@@ -76,7 +76,7 @@
 /*----------------------------------------------------------------------
   TtaGetCharsetName gives the constant string of the charset ISO name.
   ----------------------------------------------------------------------*/
-extern char *TtaGetCharsetName (CHARSET charset);
+extern const char *TtaGetCharsetName (CHARSET charset);
 
 extern int ustrcasecmp (const CHAR_T *, const CHAR_T *);
 extern CHAR_T *ustrcat (CHAR_T *, const CHAR_T *);
Index: Amaya.cleanup/thotlib/internals/f/ustring_f.h
===================================================================
--- Amaya.cleanup.orig/thotlib/internals/f/ustring_f.h	2007-10-17 21:25:29.000000000 +0100
+++ Amaya.cleanup/thotlib/internals/f/ustring_f.h	2007-10-17 21:25:58.000000000 +0100
@@ -39,7 +39,7 @@
 extern CHARSET TtaGetCharset ( char *charsetname );
 extern CHARSET TtaGetLocaleCharset ( void );
 extern CHARSET TtaGetDefaultCharset ( void );
-extern char *TtaGetCharsetName ( CHARSET charset );
+extern const char *TtaGetCharsetName ( CHARSET charset );
 
 #else /* __STDC__ */
 
@@ -76,7 +76,7 @@
 extern CHARSET TtaGetCharset ( char *charsetname );
 extern CHARSET TtaGetLocaleCharset ( void );
 extern CHARSET TtaGetDefaultCharset ( void );
-extern char *TtaGetCharsetName ( CHARSET charset );
+extern const char *TtaGetCharsetName ( CHARSET charset );
 
 #endif /* __STDC__ */
 #endif /* __CEXTRACT__ */
Index: Amaya.cleanup/thotlib/unicode/ustring.c
===================================================================
--- Amaya.cleanup.orig/thotlib/unicode/ustring.c	2007-10-17 21:22:51.000000000 +0100
+++ Amaya.cleanup/thotlib/unicode/ustring.c	2007-10-17 21:24:05.000000000 +0100
@@ -34,11 +34,11 @@
 };
 
 typedef struct {
-  char       *ISOCode;
+  const char *ISOCode;
   CHARSET     Charset;
 } CharsetCode;
 
-static CharsetCode CharsetCodeTable[] =
+static const CharsetCode CharsetCodeTable[] =
 {
     {"us-ascii",         US_ASCII},
     {"ascii",            US_ASCII},
@@ -476,7 +476,7 @@
 /*----------------------------------------------------------------------
   TtaGetCharsetName gives the constant string of the charset ISO name.
   ----------------------------------------------------------------------*/
-char *TtaGetCharsetName (CHARSET charset)
+const char *TtaGetCharsetName (CHARSET charset)
 {
   int index = 0;