--- parser3/src/include/pa_charset.h 2003/01/31 12:34:29 1.20.2.10 +++ parser3/src/include/pa_charset.h 2003/03/07 11:02:11 1.20.2.16 @@ -8,7 +8,7 @@ #ifndef PA_CHARSET_H #define PA_CHARSET_H -static const char* IDENT_CHARSET_H="$Date: 2003/01/31 12:34:29 $"; +static const char* IDENT_CHARSET_H="$Date: 2003/03/07 11:02:11 $"; #include "pa_pool.h" #include "pa_exception.h" @@ -26,6 +26,8 @@ namespace PCRE { // defines +#define MAX_CHARSET_UNI_CODES 500 + # ifndef XMLCh typedef unsigned int XMLCh; # endif @@ -33,6 +35,12 @@ namespace PCRE { typedef unsigned char XMLByte; # endif +// forwards + +class GdomeDOMString_auto_ptr; + +// helpers + struct Charset_TransRec { XMLCh intCh; XMLByte extCh; @@ -42,7 +50,6 @@ struct Charset_TransRec { registers libxml transcoders */ class Charset: public PA_Object { - Pool pool_for_load; public: Charset(StringPtr aname, StringPtr afile_spec); @@ -53,12 +60,12 @@ public: bool isUTF8() const { return fisUTF8; } static void transcode(Pool& pool, - const Charset& source_transcoder, const void *source_body, size_t source_content_length, - const Charset& dest_transcoder, const void *& dest_body, size_t& dest_content_length + const Charset& source_transcoder, const void* source_body, size_t source_content_length, + const Charset& dest_transcoder, const void* & dest_body, size_t& dest_content_length ); #ifdef XML - xmlCharEncodingHandler *transcoder(const String *source); + xmlCharEncodingHandler& transcoder(StringPtr source); #endif public: @@ -71,22 +78,22 @@ private: void sort_ToTable(); void transcodeToUTF8(Pool& pool, - const void *source_body, size_t source_content_length, - const void *& dest_body, size_t& dest_content_length) const; + const void* source_body, size_t source_content_length, + const void* & dest_body, size_t& dest_content_length) const; void transcodeFromUTF8(Pool& pool, - const void *source_body, size_t source_content_length, - const void *& dest_body, size_t& dest_content_length) const; + const void* source_body, size_t source_content_length, + const void* & dest_body, size_t& dest_content_length) const; void transcodeToCharset(Pool& pool, const Charset& dest_transcoder, - const void *source_body, size_t source_content_length, - const void *& dest_body, size_t& dest_content_length) const; + const void* source_body, size_t source_content_length, + const void*& dest_body, size_t& dest_content_length) const; public: struct Tables { XMLCh fromTable[0x100]; - Charset_TransRec *toTable; + Charset_TransRec toTable[MAX_CHARSET_UNI_CODES]; uint toTableSize; }; @@ -100,53 +107,65 @@ private: #ifdef XML private: - void addEncoding(char *name_cstr); - void initTranscoder(const String *source, const char* name_cstr); + void addEncoding(char* name_cstr); + void initTranscoder(StringPtr source, const char* name_cstr); public: - /// converts GdomeDOMString string to char * - const char* transcode_cstr(GdomeDOMString *s); + /// converts GdomeDOMString string to char* + const char* transcode_cstr(GdomeDOMString* s); /// converts GdomeDOMString string to parser String - String& transcode(GdomeDOMString *s + StringPtr transcode(GdomeDOMString* s #ifndef NO_STRING_ORIGIN - , const String *origin + , StringPtr origin #endif ); - /// converts xmlChar* null-terminated string to char * - const char* transcode_cstr(xmlChar *s); + /// converts xmlChar* null-terminated string to char* + CharPtr transcode_cstr(xmlChar* s); /// converts xmlChar* null-terminated string to parser String - String& transcode(xmlChar *s + StringPtr transcode(xmlChar* s #ifndef NO_STRING_ORIGIN - , const String *origin + , StringPtr origin #endif ); - /** converts sized char * to xmlChar* - @returns xmlChar * which caller should free + + /** converts sized char* to xmlChar* + @returns xmlChar* WHICH CALLER SHOULD FREE */ - xmlChar *transcode_buf2xchar(const char* buf, size_t buf_size); - /// converts char * to GdomeDOMString + xmlChar* transcode_buf2xchar(const char* buf, size_t buf_size); + /** converts sized char* to gchar* + @returns gchar* WHICH CALLER SHOULD FREE + */ + gchar* transcode_buf2gchar(const char* buf, size_t buf_size); + /// converts char* to GdomeDOMString GdomeDOMString_auto_ptr transcode_buf2dom(const char* buf, size_t buf_size); /// converts parser String to GdomeDOMString - GdomeDOMString_auto_ptr transcode(const String& s); + GdomeDOMString_auto_ptr transcode(StringPtr s); private: - xmlCharEncodingHandler *ftranscoder; + typedef void* (*transcode_buf_malloc_func)(size_t size); + void* transcode_buf2mchar(transcode_buf_malloc_func malloc_func, + const char* buf, size_t buf_size); + +private: + + typedef smart_ptr xmlCharEncodingHandlerPtr; + xmlCharEncodingHandlerPtr fcreated_handler; + xmlCharEncodingHandler* ftranscoder; #endif }; DECLARE_OBJECT_PTR(Charset); -extern CharsetPtr UTF8_charset; - #ifdef XML /// Auto-object used to track GdomeDOMString usage class GdomeDOMString_auto_ptr { - GdomeDOMString *fstring; + GdomeDOMString* fstring; public: - explicit GdomeDOMString_auto_ptr(gchar *astring) : fstring(gdome_str_mkref(astring)) {} - explicit GdomeDOMString_auto_ptr(GdomeDOMString *astring) : fstring(astring) { + /// frees astring afterwards!!! + explicit GdomeDOMString_auto_ptr(gchar* astring) : fstring(gdome_str_mkref_own(astring)) {} + explicit GdomeDOMString_auto_ptr(GdomeDOMString* astring) : fstring(astring) { // not ref-ing, owning } ~GdomeDOMString_auto_ptr() { @@ -159,7 +178,7 @@ public: return fstring; } GdomeDOMString& operator*() { - return *fstring; + return* fstring; } // copying @@ -168,13 +187,13 @@ public: } GdomeDOMString_auto_ptr& operator =(const GdomeDOMString_auto_ptr& src) { if(this == &src) - return *this; + return* this; gdome_str_unref(fstring); fstring=src.fstring; gdome_str_ref(fstring); - return *this; + return* this; } }; #endif