--- parser3/src/main/untaint.C	2003/04/08 07:55:25	1.115.2.12.2.21
+++ parser3/src/main/untaint.C	2003/04/08 11:08:12	1.115.2.12.2.24
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_UNTAINT_C="$Date: 2003/04/08 07:55:25 $";
+static const char* IDENT_UNTAINT_C="$Date: 2003/04/08 11:08:12 $";
 
 
 #include "pa_string.h"
@@ -183,13 +183,12 @@ String& String::append_to(String& dest,
 
 	// next: fragment infos
 	
-	if(lang==L_PASS_APPENDED) // without language-chage string?
+	if(lang==L_PASS_APPENDED) // without language-change?
 		dest.fragments.append(fragments);
 	else if(forced) //forcing passed lang?
 		dest.fragments+=Fragment(lang, length());
 	else if(lang&L_OPTIMIZE_BIT) {
-		Array_iterator<ArrayFragment::element_type> i(fragments);
-		while(i.has_next()) {
+		for(Array_iterator<ArrayFragment::element_type> i(fragments); i.has_next(); ) {
 			const Fragment fragment=i.next();
 			// main idea here:
 			// tainted piece would get OPTIMIZED bit from 'lang'
@@ -202,8 +201,7 @@ String& String::append_to(String& dest,
 				fragment.length);
 		}
 	} else { // The core idea: tainted pieces got marked with context's lang
-		Array_iterator<ArrayFragment::element_type> i(fragments);
-		while(i.has_next()) {
+		for(Array_iterator<ArrayFragment::element_type> i(fragments); i.has_next(); ) {
 			const Fragment fragment=i.next();
 			dest.fragments+=Fragment(
 				fragment.lang==L_TAINTED?lang:fragment.lang,
@@ -256,24 +254,24 @@ inline bool mail_header_char_valid_withi
 inline bool mail_header_nonspace_char(char c) {
 	return c != 0x20;
 }
-inline void ec_append(CORD_ec& result, bool& optimize, bool& whitespace, CORD_pos& pos, size_t size) {
+inline void ec_append(CORD_ec& result, bool& optimize, bool& whitespace, CORD_pos pos, size_t size) {
 	while(size--) {
 		CORD_ec_append(result, CORD_pos_fetch(pos));
 		CORD_next(pos);
 	}
 }
-inline void pa_CORD_pos_advance(CORD_pos& pos, size_t size) {
+inline void pa_CORD_pos_advance(CORD_pos pos, size_t n) {
 	while(true) {
 		size_t avail=CORD_pos_chars_left(pos);
 		if(avail==0) {
 			CORD_next(pos);
-			if(!--size)
+			if(!--n)
 				break;
-		} else if(avail<size) {
+		} else if(avail<n) {
 			CORD_pos_advance(pos, avail);
-			size-=avail;
-		} else { // avail>=size
-			CORD_pos_advance(pos, size);
+			n-=avail;
+		} else { // avail>=n
+			CORD_pos_advance(pos, n);
 			break;
 		}
 	}