--- parser3/src/main/untaint.C 2003/03/20 14:19:10 1.115.2.12.2.6 +++ parser3/src/main/untaint.C 2003/03/20 15:05:59 1.115.2.12.2.7 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_UNTAINT_C="$Date: 2003/03/20 14:19:10 $"; +static const char* IDENT_UNTAINT_C="$Date: 2003/03/20 15:05:59 $"; #include "pa_string.h" @@ -231,12 +231,12 @@ CORD String::cstr_to_cord(Untaint_lang l bool whitespace=true; - size_t fragment_start=0; + size_t fragment_begin=0; size_t fragment_end; - for(Array_iterator i(fragments); i.has_next(); fragment_start=fragment_end) { + for(Array_iterator i(fragments); i.has_next(); fragment_begin=fragment_end) { const Fragment& fragment=i.next(); size_t fragment_length=fragment.length; - fragment_end=fragment_start+fragment_length; + fragment_end=fragment_begin+fragment_length; Untaint_lang to_lang=lang==UL_UNSPECIFIED?fragment.lang:lang; @@ -270,7 +270,7 @@ CORD String::cstr_to_cord(Untaint_lang l { const char *substr= CORD_to_const_char_star( - CORD_substr(body, fragment_start, fragment_length)); + CORD_substr(body, fragment_begin, fragment_length)); const void *client_ptr; size_t client_size; if(charsets) @@ -355,7 +355,7 @@ CORD String::cstr_to_cord(Untaint_lang l // tainted, untaint language: sql if(connection) { dest+=connection->quote(0, - CORD_substr(body, fragment_start, fragment_length), + CORD_substr(body, fragment_begin, fragment_length), fragment_length); ...^^^