--- parser3/src/main/untaint.C	2003/01/31 12:10:48	1.115.2.5
+++ parser3/src/main/untaint.C	2003/01/31 12:34:38	1.115.2.6
@@ -1,11 +1,11 @@
 /** @file
 	Parser: String class part: untaint mechanizm.
 
-	Copyright(c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_UNTAINT_C="$Date: 2003/01/31 12:10:48 $";
+static const char* IDENT_UNTAINT_C="$Date: 2003/01/31 12:34:38 $";
 
 #include "pa_pool.h"
 #include "pa_value_includes.h"
@@ -22,14 +22,14 @@ static const char* IDENT_UNTAINT_C="$Dat
 
 #define escape(action) \
 	{ \
-		const char *src=fragment->ptr; \
+		const char* src=fragment->ptr; \
 		for(int size=fragment->size; size--; src++) \
 			action \
 	}
 #define _default  default: *dest++=*src; break
 #define encode(need_encode_func, prefix)  \
 			if(need_encode_func(*src)) { \
-				static const char *hex="0123456789ABCDEF"; \
+				static const char* hex="0123456789ABCDEF"; \
 				char chunk[3]={prefix}; \
 				chunk[1]=hex[((unsigned char)*src)/0x10]; \
 				chunk[2]=hex[((unsigned char)*src)%0x10]; \
@@ -67,7 +67,7 @@ inline bool need_http_header_encode(unsi
 
 //
 
-static const char * String_Untaint_lang_name[]={
+static const char*  String_Untaint_lang_name[]={
 	"U", ///< zero value handy for hash lookup @see untaint_lang_name2enum
 	"C", ///< clean
 	"T",  ///< tainted, untaint language as assigned later 
@@ -127,7 +127,7 @@ quoted-pair    = "\" CHAR
 
   if(strchr("()<>@,;:\\\"/[]?={} \t", *ptr))
 */
-inline bool need_quote_http_header(const char *ptr, size_t size) {
+inline bool need_quote_http_header(const char* ptr, size_t size) {
 	for(; size--; ptr++)
 		if(strchr(";\\\"= \t" /* excluded ()<>@, :/ ? []{} */, *ptr))
 			return true;
@@ -224,9 +224,9 @@ size_t String::cstr_bufsize(Untaint_lang
 			// tainted, untaint language: mail-header
 			if(charsets) {
 				int parts_count=1;
-				const char *prev=fragment->ptr;
+				const char* prev=fragment->ptr;
 				size_t size=fragment->size;
-				while(const char *comma_at=(const char*)memchr(prev, ',', size)) {
+				while(const char* comma_at=(const char*)memchr(prev, ',', size)) {
 					parts_count++;
 					size-=comma_at-prev;
 					prev=comma_at+1;
@@ -364,7 +364,7 @@ char *String::store_to(char *dest, Untai
 			}
 
 			{
-				const char *src=(const char *)client_ptr;
+				const char* src=(const char* )client_ptr;
 				for(int size=client_size; size--; src++) 
 					encode(need_uri_encode, '%');
 			}
@@ -387,11 +387,11 @@ char *String::store_to(char *dest, Untai
 				CharPtr charset_name=charsets->mail().name()->cstr();
 
 				// Subject: Re: parser3: =?koi8-r?Q?=D3=C5=CD=C9=CE=C1=D2?=
-				const char *src=(const char *)mail_ptr;
+				const char* src=(const char* )mail_ptr;
 				bool to_quoted_printable=false;
 
 				bool email=false;
-				for(const char *end=src+mail_size; src<end; src++) {
+				for(const char* end=src+mail_size; src<end; src++) {
 					//RFC   + An 'encoded-word' MUST NOT appear in any portion of an 'addr-spec'.
 					if(to_quoted_printable && (*src==',' || *src=='<')) {
 						email=*src=='<';