--- parser3/src/include/pa_request.h 2001/03/19 17:42:12 1.62 +++ parser3/src/include/pa_request.h 2001/03/20 17:52:37 1.64.2.2 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_request.h,v 1.62 2001/03/19 17:42:12 paf Exp $ + $Id: pa_request.h,v 1.64.2.2 2001/03/20 17:52:37 paf Exp $ */ #ifndef PA_REQUEST_H @@ -62,7 +62,7 @@ public: Request(Pool& apool, Info& ainfo, - String::Untaint_lang adefault_lang ///< all tainted data default untainted + String::Untaint_lang adefault_lang ///< all tainted data default untainting lang ); ~Request() {} @@ -77,33 +77,29 @@ public: /// executes ops void execute(const Array& ops); - /// compiles the file, maybe forcing it's class \a name and \a base_class. + /// compiles the file, maybe forcing it's class @a name and @a base_class. VStateless_class *use_file( const char *file, bool fail_on_read_problem=true, const String *name=0, VStateless_class *base_class=0); // core.C - /// compiles a \a source buffer + /// compiles a @a source buffer VStateless_class *use_buf( const char *source, const char *file, VStateless_class *aclass=0, const String *name=0, VStateless_class *base_class=0); // core.C - /// processes any code-junction there may be inside of \a value + /// processes any code-junction there may be inside of @a value Value& process( Value& value, const String *name=0, bool intercept_string=true); // execute.C - /// write(const) = clean - void write(const String& astring) { - wcontext->write(astring, String::Untaint_lang::NO); - } /// appending, sure of clean string inside - void write_no_lang(String& astring) { - wcontext->write(astring, String::Untaint_lang::NO); + void write_no_lang(const String& astring) { + wcontext->write(astring, String::UL_NO); } /// appending string, passing language built into string being written - void write_pass_lang(String& astring) { - wcontext->write(astring, String::Untaint_lang::PASS_APPENDED); + void write_pass_lang(const String& astring) { + wcontext->write(astring, String::UL_PASS_APPENDED); } /// appending possible string, assigning untaint language void write_assign_lang(Value& avalue) { @@ -111,11 +107,11 @@ public: } /// appending possible string, passing language built into string being written void write_pass_lang(Value& avalue) { - wcontext->write(avalue, String::Untaint_lang::PASS_APPENDED); + wcontext->write(avalue, String::UL_PASS_APPENDED); } /// appending sure value, that would be converted to clean string void write_no_lang(Value& avalue) { - wcontext->write(avalue, String::Untaint_lang::NO); + wcontext->write(avalue, String::UL_NO); } /// appending sure value, not VString void write_expr_result(Value& avalue) { @@ -123,12 +119,13 @@ public: } /// handy is-value-a-junction ensurer - void fail_if_junction_(bool is, Value& value, const String& method_name, char *msg); + void fail_if_junction_(bool is, Value& value, + const String& method_name, const char *msg); - /// returns relative to \a path path to \a file + /// returns relative to @a path path to @a file char *relative(const char *path, const char *file); - /// returns an absolute \a path to relative \a name + /// returns an absolute @a path to relative @a name char *absolute(const char *name); public: