--- parser3/src/include/pa_pool.h 2002/08/01 11:41:15 1.83 +++ parser3/src/include/pa_pool.h 2002/10/15 15:12:57 1.85 @@ -9,7 +9,7 @@ #ifndef PA_POOL_H #define PA_POOL_H -static const char* IDENT_POOL_H="$Date: 2002/08/01 11:41:15 $"; +static const char* IDENT_POOL_H="$Date: 2002/10/15 15:12:57 $"; #include "pa_config_includes.h" @@ -61,6 +61,11 @@ public: fail_register_cleanup(); } + //{@ helpers + void *copy(const void *buf, const size_t size); + char *copy(const char *cstr); + //}@ + //{@ source charset void set_source_charset(Charset& acharset); Charset& get_source_charset(); @@ -76,11 +81,19 @@ public: /// @see Charset::transcode_cstr(xmlChar *s); const char *transcode_cstr(xmlChar *s); /// @see Charset::transcode(xmlChar *s); - String& transcode(xmlChar *s); + String& transcode(xmlChar *s +#ifndef NO_STRING_ORIGIN + , const String *origin +#endif + ); /// @see Charset::transcode_cstr(GdomeDOMString *s); const char *transcode_cstr(GdomeDOMString *s); /// @see Charset::transcode(GdomeDOMString *s); - String& transcode(GdomeDOMString *s); + String& transcode(GdomeDOMString *s +#ifndef NO_STRING_ORIGIN + , const String *origin +#endif + ); /// @see Charset::transcode_cstr(const char *buf, size_t buf_size=0); xmlChar *transcode_buf2xchar(const char *buf, size_t buf_size=0); /// @see Charset::transcode(const String& s) @@ -173,10 +186,22 @@ public: void *malloc(size_t size, int place=0) const { return fpool->malloc(size, place); } void *calloc(size_t size) const { return fpool->calloc(size); } void register_cleanup(void (*cleanup) (void *), void *data) { fpool->register_cleanup(cleanup, data); } + void *copy(const void *buf, const size_t size) { return fpool->copy(buf, size); } + char *copy(const char *cstr) { return fpool->copy(cstr); } #ifdef XML const char *transcode_cstr(GdomeDOMString *s) { return fpool->transcode_cstr(s); } - String& transcode(GdomeDOMString *s) { return fpool->transcode(s); } + String& transcode(GdomeDOMString *s +#ifndef NO_STRING_ORIGIN + , const String *origin +#endif + ) { + return fpool->transcode(s +#ifndef NO_STRING_ORIGIN + , origin +#endif + ); + } #endif //}