--- parser3/src/include/pa_string.h 2001/05/15 14:31:58 1.89 +++ parser3/src/include/pa_string.h 2001/05/17 10:22:24 1.93 @@ -5,29 +5,26 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_string.h,v 1.89 2001/05/15 14:31:58 parser Exp $ + $Id: pa_string.h,v 1.93 2001/05/17 10:22:24 parser Exp $ */ #ifndef PA_STRING_H #define PA_STRING_H #include "pa_config_includes.h" - -#include -#include - #include "pa_pool.h" #include "pa_types.h" class Table; /** - $MAIN:html-typo table elements must enlarge string not more that that + $MAIN:html-typo table elements must enlarge string not more that that. + that's a tradeoff - otherwise we'd have to scan string twice: - first for buffer length - second for replacements themselves */ -#define UNTAINT_TIMES_BIGGER 20 +#define UNTAINT_TIMES_BIGGER 10 #ifndef NO_STRING_ORIGIN # define STRING_APPEND_PARAMS \ @@ -86,7 +83,7 @@ public: enum { CR_PREALLOCATED_COUNT=2, ///< default preallocated item count - CR_GROW_PERCENT=60 ///< each time the String chunk_is_full() string expanded() + CR_GROW_COUNT=2 ///< each time the String chunk_is_full() string expanded() }; /// piece is tainted or not. the language to use when detaint @@ -272,7 +269,6 @@ private: bool chunk_is_full() { return append_here == link_row; } - int expand_times; void expand(); /// convert to C string, store to 'dest' which must be big enough for proper untaint