--- parser3/src/include/pa_string.h 2001/04/07 11:55:32 1.75 +++ parser3/src/include/pa_string.h 2001/04/09 14:31:40 1.78 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_string.h,v 1.75 2001/04/07 11:55:32 paf Exp $ + $Id: pa_string.h,v 1.78 2001/04/09 14:31:40 paf Exp $ */ #ifndef PA_STRING_H @@ -111,9 +111,12 @@ public: public: - String(Pool& apool, const char *src=0, bool tainted=false); + String(Pool& apool, const char *src=0, size_t src_size=0, bool tainted=false); String(const String& src); size_t size() const { return fsize; } + /// convert to C string, store to 'dest' which must be big enough for proper untaint + char *store_to(char *dest, + Untaint_lang lang=UL_UNSPECIFIED, SQL_Connection *connection=0) const; /// convert to C string. if 'lang' known, forcing 'lang' to it char *cstr(Untaint_lang lang=UL_UNSPECIFIED, SQL_Connection *connection=0) const { char *result=(char *)malloc(size()*UNTAINT_TIMES_BIGGER+1); @@ -164,8 +167,8 @@ public: or marking ALL pieces of it with a @a lang when @a forced to. */ String& append(const String& src, Untaint_lang lang, bool forced=false); - String& operator += (const String& src) { return append(src, UL_PASS_APPENDED); } - String& operator += (const char *src) { return APPEND_CONST(src); } + String& operator << (const String& src) { return append(src, UL_PASS_APPENDED); } + String& operator << (const char *src) { return APPEND_CONST(src); } /// simple hash code of string. used by Hash uint hash_code() const; @@ -247,8 +250,6 @@ private: return append_here == link_row; } void expand(); - char *String::store_to(char *dest, - Untaint_lang lang=UL_UNSPECIFIED, SQL_Connection *connection=0) const; private: //disabled