--- parser3/src/main/pa_string.C	2003/10/21 05:11:00	1.185
+++ parser3/src/main/pa_string.C	2003/11/20 17:46:02	1.190
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_STRING_C="$Date: 2003/10/21 05:11:00 $";
+static const char * const IDENT_STRING_C="$Date: 2003/11/20 17:46:02 $";
 
 #include "pcre.h"
 
@@ -43,7 +43,7 @@ int CORD_range_contains_chr_greater_then
     return(CORD_block_iter(x, i, CORD_range_contains_chr_greater_then_proc, &d) == 1/*alternatives: 0 normally ended, 2=struck 'n'*/);
 }
 
-static int CORD_block_count_proc(char c, size_t size, void* client_data)
+static int CORD_block_count_proc(char /*c*/, size_t /*size*/, void* client_data)
 {
     int* result=(int*)client_data;
     (*result)++;
@@ -194,7 +194,7 @@ void String::split(ArrayString& result,
 		   Language lang, int limit) const {
 	size_t self_length=length();
 	if(size_t delim_length=strlen(delim)) {
-		int pos_before;
+		size_t pos_before;
 		// while we have 'delim'...
 		for(; (pos_before=pos(delim, pos_after, lang))!=STRING_NOT_FOUND && limit; limit--) {
 			result+=&mid(pos_after, pos_before);
@@ -216,7 +216,7 @@ void String::split(ArrayString& result,
 		   const String& delim, Language lang, 
 		   int limit) const {
 	if(!delim.is_empty()) {
-		int pos_before;
+		size_t pos_before;
 		// while we have 'delim'...
 		for(; (pos_before=pos(delim, pos_after, lang))!=STRING_NOT_FOUND && limit; limit--) {
 			result+=&mid(pos_after, pos_before);
@@ -241,13 +241,13 @@ static void regex_options(const String*
 		int *result;
 		bool *flag;
     } regex_option[]={
-		{"i", "I", 0, PCRE_CASELESS, result}, // a=A
-		{"s", "S", 0, PCRE_DOTALL, result}, // \n\n$ [default]
-		{"x", "U", 0, PCRE_EXTENDED, result}, // whitespace in regex ignored
-		{"m", "M", PCRE_DOTALL, PCRE_MULTILINE, result}, // ^aaa\n$^bbb\n$
-		{"g", "G", 0, true, result+1}, // many rows
+		{"i", "I", 0, PCRE_CASELESS, result, 0}, // a=A
+		{"s", "S", 0, PCRE_DOTALL, result, 0}, // \n\n$ [default]
+		{"x", "U", 0, PCRE_EXTENDED, result, 0}, // whitespace in regex ignored
+		{"m", "M", PCRE_DOTALL, PCRE_MULTILINE, result, 0}, // ^aaa\n$^bbb\n$
+		{"g", "G", 0, 1, result+1, 0}, // many rows
 		{"'", 0, 0, 0, 0, &need_pre_post_match},
-		{0}
+		{0, 0, 0, 0, 0, 0}
     };
 	result[0]=PCRE_EXTRA | PCRE_DOTALL | PCRE_DOLLAR_ENDONLY;
 	result[1]=0;
@@ -410,7 +410,7 @@ String& String::change_case(Charset& sou
 		}	
 
 		unsigned char index;
-		for(const char* current=new_cstr; index=(unsigned char)*current; current++) {
+		for(const char* current=new_cstr; (index=(unsigned char)*current); current++) {
 			unsigned char c=a[index];
 			if(b)
 				c=b[c];