--- parser3/src/main/pa_common.C	2016/09/21 14:01:45	1.292
+++ parser3/src/main/pa_common.C	2016/12/24 23:02:13	1.297
@@ -50,7 +50,7 @@
 #define pa_mkdir(path, mode) mkdir(path, mode)
 #endif
 
-volatile const char * IDENT_PA_COMMON_C="$Id: pa_common.C,v 1.292 2016/09/21 14:01:45 moko Exp $" IDENT_PA_COMMON_H IDENT_PA_HASH_H IDENT_PA_ARRAY_H IDENT_PA_STACK_H; 
+volatile const char * IDENT_PA_COMMON_C="$Id: pa_common.C,v 1.297 2016/12/24 23:02:13 moko Exp $" IDENT_PA_COMMON_H IDENT_PA_HASH_H IDENT_PA_ARRAY_H IDENT_PA_STACK_H; 
 
 // some maybe-undefined constants
 
@@ -156,9 +156,9 @@ File_read_result file_read(Request_chars
 			Charset* asked_charset=0;
 			if(params)
 				if(Value* vcharset_name=params->get(PA_CHARSET_NAME))
-					asked_charset=&::charsets.get(vcharset_name->as_string());
+					asked_charset=&pa_charsets.get(vcharset_name->as_string());
 
-			asked_charset=::charsets.checkBOM(result.str, result.length, asked_charset);
+			asked_charset=pa_charsets.checkBOM(result.str, result.length, asked_charset);
 
 			if(result.length && transcode_text_result && asked_charset){ // length must be checked because transcode returns CONST string in case length==0, which contradicts hacking few lines below
 				String::C body=String::C(result.str, result.length);
@@ -493,12 +493,7 @@ bool file_executable(const String& file_
 	return access(file_spec.taint_cstr(String::L_FILE_SPEC), X_OK)==0;
 }
 
-bool file_stat(const String& file_spec, 
-			size_t& rsize,
-			time_t& ratime,
-			time_t& rmtime,
-			time_t& rctime,
-			bool fail_on_read_problem) {
+bool file_stat(const String& file_spec, uint64_t& rsize, time_t& ratime, time_t& rmtime, time_t& rctime, bool fail_on_read_problem) {
 	const char* fname=file_spec.taint_cstr(String::L_FILE_SPEC); 
 	struct stat finfo;
 	if(stat(fname, &finfo)!=0) {
@@ -1251,7 +1246,7 @@ inline void CalcCrc32(const unsigned cha
 }
 
 
-const unsigned long pa_crc32(const char *in, size_t in_size){
+unsigned long pa_crc32(const char *in, size_t in_size){
 	unsigned long crc32=0xFFFFFFFF;
 
 	InitCrc32Table();
@@ -1274,7 +1269,7 @@ static void file_crc32_file_action(struc
 	}
 }
 
-const unsigned long pa_crc32(const String& file_spec){
+unsigned long pa_crc32(const String& file_spec){
 	unsigned long crc32=0xFFFFFFFF;
 	file_read_action_under_lock(file_spec, "crc32", file_crc32_file_action, &crc32);
 	return ~crc32; 
@@ -1301,7 +1296,7 @@ Charset* detect_charset(const char* cont
 			if(end)
 				*end=0; // terminator
 
-			return *begin?&charsets.get_direct(begin):0;
+			return *begin ? &pa_charsets.get_direct(begin) : 0;
 		}
 	}
 	return 0;
@@ -1328,7 +1323,7 @@ const char *pa_idna_encode(const char *i
 	String::C sIn(in,strlen(in));
 
 	if(!source_charset.isUTF8())
-		sIn=Charset::transcode(sIn, source_charset, UTF8_charset);
+		sIn=Charset::transcode(sIn, source_charset, pa_UTF8_charset);
 
 	int status=pa_convertUTF8toUTF32((const UTF8**)&sIn.str, (const UTF8*)(sIn.str+sIn.length), &utf32_end, utf32+MAX_IDNA_LENGTH-1, strictConversion);
 	if(status != conversionOK)
@@ -1369,7 +1364,7 @@ const char *pa_idna_decode(const char *i
 	*result_end='\0';
 
 	if(!asked_charset.isUTF8())
-		result = (char *)Charset::transcode(result, UTF8_charset, asked_charset).cstr();
+		result = (char *)Charset::transcode(result, pa_UTF8_charset, asked_charset).cstr();
 
 	return result;
 }