--- parser3/src/classes/file.C	2003/07/24 11:31:19	1.111
+++ parser3/src/classes/file.C	2003/11/20 16:34:23	1.115
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_FILE_C="$Date: 2003/07/24 11:31:19 $";
+static const char * const IDENT_FILE_C="$Date: 2003/11/20 16:34:23 $";
 
 #include "pa_config_includes.h"
 
@@ -36,7 +36,7 @@ static const char* IDENT_FILE_C="$Date:
 class MFile: public Methoded {
 public: // VStateless_class
 	
-	Value* create_new_value() { return new VFile(); }
+	Value* create_new_value(Pool&) { return new VFile(); }
 
 public: // Methoded
 	bool used_directly() { return true; }
@@ -98,9 +98,9 @@ static const char* suexec_safe_env_lst[]
 
 // statics
 
-static const StringBody adate_name("adate");
-static const StringBody mdate_name("mdate");
-static const StringBody cdate_name("cdate");
+static const String::Body adate_name("adate");
+static const String::Body mdate_name("mdate");
+static const String::Body cdate_name("cdate");
 
 // methods
 
@@ -258,8 +258,8 @@ static void _exec_cgi(Request& r, Method
 	#define ECSTR(name, value_cstr) \
 		if(value_cstr) \
 			env.put( \
-				StringBody(#name), \
-				StringBody(value_cstr, 0)); \
+				String::Body(#name), \
+				String::Body(value_cstr, 0)); \
 	// passing SAPI::environment
 	if(const char *const *pairs=SAPI::environment(r.sapi_info)) {
 		while(const char* pair=*pairs++)
@@ -284,8 +284,8 @@ static void _exec_cgi(Request& r, Method
 	//String content_length(content_length_cstr);
 	ECSTR(CONTENT_LENGTH, content_length_cstr);
 	// SCRIPT_*
-	env.put(StringBody("SCRIPT_NAME"), script_name);
-	//env.put(StringBody("SCRIPT_FILENAME"), ??&script_name);
+	env.put(String::Body("SCRIPT_NAME"), script_name);
+	//env.put(String::Body("SCRIPT_FILENAME"), ??&script_name);
 
 	bool stdin_specified=false;
 	// environment & stdin from param
@@ -348,7 +348,6 @@ static void _exec_cgi(Request& r, Method
 	VFile& self=GET_SELF(r, VFile);
 
 	const String* body=real_out; // ^file:exec
-	Value* content_type=0;
 	const char* eol_marker=0; size_t eol_marker_size;
 	const String* header=0;
 	if(cgi) { // ^file:cgi
@@ -413,7 +412,7 @@ static void _exec_cgi(Request& r, Method
 	// $stderr
 	if(real_err->length())
 		self.fields().put(
-			StringBody("stderr"),
+			String::Body("stderr"),
 			new VString(*real_err));
 }
 static void _exec(Request& r, MethodParams& params) {
@@ -444,8 +443,10 @@ static void _list(Request& r, MethodPara
 			throw Exception(0, 
 				&regexp->mid(erroffset, regexp->length()), 
 				"regular expression syntax error - %s", errptr);
-	} else 
+	} else {
+		regexp=0; // not used, just to calm down compiler
 		regexp_code=0;
+	}
 
 
 	const char* absolute_path_cstr=r.absolute(relative_path.as_string()).cstr(String::L_FILE_SPEC);
@@ -509,11 +510,11 @@ static void _lock(Request& r, MethodPara
 }
 
 static int lastposafter(const String& s, size_t after, const char* substr, size_t substr_size, bool beforelast=false) {
-	size_t size;
+	size_t size=0; // just to calm down compiler
 	if(beforelast)
 		size=s.length();
 	int at;
-	while((at=s.pos(StringBody(substr, substr_size), after))!=STRING_NOT_FOUND) {
+	while((at=s.pos(String::Body(substr, substr_size), after))!=STRING_NOT_FOUND) {
 		size_t newafter=at+substr_size/*skip substr*/;
 		if(beforelast && newafter==size)
 			break;