--- parser3/src/classes/table.C 2003/01/21 15:51:07 1.172 +++ parser3/src/classes/table.C 2003/01/31 12:34:27 1.172.2.2 @@ -1,11 +1,11 @@ /** @file Parser: @b table parser class. - Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_TABLE_C="$Date: 2003/01/21 15:51:07 $"; +static const char* IDENT_TABLE_C="$Date: 2003/01/31 12:34:27 $"; #include "classes.h" #include "pa_common.h" @@ -19,7 +19,7 @@ static const char* IDENT_TABLE_C="$Date: class MTable : public Methoded { public: // VStateless_class - Value *create_new_value(Pool& pool) { return new(pool) VTable(pool); } + ValuePtr create_new_value() { return ValuePtr(new VTable()); } public: MTable(Pool& pool); @@ -143,7 +143,7 @@ static void _load(Request& r, const Stri Array *columns; #ifndef NO_STRING_ORIGIN const Origin& origin=method_name.origin(); - const char *file=origin.file; + const char* file=origin.file; uint line=origin.line; #endif if(nameless) { @@ -600,7 +600,7 @@ static void _join(Request& r, const Stri class Table_sql_event_handlers: public SQL_Driver_query_event_handlers { public: Table_sql_event_handlers(Pool& apool, const String& amethod_name, - const String& astatement_string, const char *astatement_cstr) : + const String& astatement_string, const char* astatement_cstr) : pool(apool), method_name(amethod_name), statement_string(astatement_string), @@ -615,7 +615,7 @@ public: try { String *column=new(pool) String(pool); column->APPEND_TAINTED( - (const char *)ptr, size, + (const char* )ptr, size, statement_cstr, 0); columns+=column; return false; @@ -647,7 +647,7 @@ public: String *cell=new(pool) String(pool); if(size) cell->APPEND_TAINTED( - (const char *)ptr, size, + (const char* )ptr, size, statement_cstr, table->size()-1); (*row)+=cell; return false; @@ -660,7 +660,7 @@ public: private: Pool& pool; const String& method_name; - const String& statement_string; const char *statement_cstr; + const String& statement_string; const char* statement_cstr; Array& columns; Array *row; public: @@ -699,7 +699,7 @@ static void _sql(Request& r, const Strin Temp_lang temp_lang(r, String::UL_SQL); const String& statement_string=r.process_to_string(statement); - const char *statement_cstr= + const char* statement_cstr= statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name)); Table_sql_event_handlers handlers(pool, method_name, statement_string, statement_cstr);