--- parser3/src/main/pa_charset.C	2003/01/31 12:10:46	1.33.2.5
+++ parser3/src/main/pa_charset.C	2003/02/04 12:08:56	1.33.2.7
@@ -1,14 +1,13 @@
 /** @file
 	Parser: Charset connection implementation.
 
-	Copyright(c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan<paf@design.ru>(http://paf.design.ru)
 */
 
-static const char* IDENT_CHARSET_C="$Date: 2003/01/31 12:10:46 $";
+static const char* IDENT_CHARSET_C="$Date: 2003/02/04 12:08:56 $";
 
 #include "pa_charset.h"
-#include "pa_value_includes.h"
 
 #ifdef XML
 #include "libxml/encoding.h"
@@ -42,7 +41,7 @@ inline void cstr2ctypes(unsigned char *t
 		ctypes_table[c]|=bit;
 	}
 }
-inline unsigned int to_wchar_code(const char *cstr) {
+inline unsigned int to_wchar_code(const char* cstr) {
 	if(!cstr || !*cstr)
 		return 0;
 	if(cstr[1]==0)
@@ -51,7 +50,7 @@ inline unsigned int to_wchar_code(const
 	char *error_pos;
 	return(unsigned int)strtol(cstr, &error_pos, 0);
 }
-inline bool to_bool(const char *cstr) {
+inline bool to_bool(const char* cstr) {
 	return cstr && *cstr!=0;
 }
 static void element2ctypes(unsigned char c, bool belongs,
@@ -559,7 +558,7 @@ void Charset::addEncoding(char *name_cst
 	xmlRegisterCharEncodingHandler(handler);
 }
 
-void Charset::initTranscoder(const String *source, const char *name_cstr) {
+void Charset::initTranscoder(const String *source, const char* name_cstr) {
 	ftranscoder=xmlFindCharEncodingHandler(name_cstr);
 	transcoder(source); // check right way
 }
@@ -572,11 +571,11 @@ xmlCharEncodingHandler *Charset::transco
 	return ftranscoder;
 }
 
-const char *Charset::transcode_cstr(xmlChar *s) {
+const char* Charset::transcode_cstr(xmlChar *s) {
 	if(!s)
 		return "";
 
-	int inlen=strlen((const char *)s);
+	int inlen=strlen((const char* )s);
 	int outlen=inlen+1; // max
 	char *out=(char *)malloc(outlen*sizeof(char));
 	
@@ -607,7 +606,7 @@ String& Charset::transcode(xmlChar *s
 	result.APPEND_CLEAN(transcode_cstr(s), 0/*auto-size*/, origin->origin().file, origin->origin().line);
 	return result; 
 }
-const char *Charset::transcode_cstr(GdomeDOMString *s) { 
+const char* Charset::transcode_cstr(GdomeDOMString *s) { 
 	return s?transcode_cstr(BAD_CAST s->str):"";
 }
 String& Charset::transcode(GdomeDOMString *s
@@ -621,7 +620,7 @@ String& Charset::transcode(GdomeDOMStrin
 }
 
 /// @test less memory using -maybe- xmlParserInputBufferCreateMem
-xmlChar *Charset::transcode_buf2xchar(const char *buf, size_t buf_size) {
+xmlChar *Charset::transcode_buf2xchar(const char* buf, size_t buf_size) {
 	unsigned char *out;
 	int outlen;
 	int error;
@@ -647,11 +646,11 @@ xmlChar *Charset::transcode_buf2xchar(co
 	out[outlen/*surely would be less then on input*/]=0;
 	return (xmlChar *)out;
 }
-GdomeDOMString_auto_ptr Charset::transcode_buf2dom(const char *buf, size_t buf_size) { 
+GdomeDOMString_auto_ptr Charset::transcode_buf2dom(const char* buf, size_t buf_size) { 
 	return GdomeDOMString_auto_ptr((gchar*)transcode_buf2xchar(buf, buf_size));
 }
 GdomeDOMString_auto_ptr Charset::transcode(const String& s) { 
-	const char *cstr=s.cstr(String::UL_UNSPECIFIED);
+	const char* cstr=s.cstr(String::UL_UNSPECIFIED);
 
 	return transcode_buf2dom(cstr, strlen(cstr)); 
 }