diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2007-09-30 21:10:50 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2007-09-30 21:10:50 +0000 |
commit | e0e38d906c8974bb22a0368a9709af9590362927 (patch) | |
tree | f7f4c1acff769e9a7f6cd0f1c037ba2c28a66593 /bindings/xml/xmlparser.c | |
parent | 49e419c9b75cc149e7f4c898c31aed33f4b2c960 (diff) | |
download | libdom-e0e38d906c8974bb22a0368a9709af9590362927.tar.gz libdom-e0e38d906c8974bb22a0368a9709af9590362927.tar.bz2 |
DOM Strings are now capable of containing either UTF-8 or UTF-16 encoded data.
The charset used for strings within a document is specified at document creation time. Whilst it is possible to mix charsets within a document, it's not recommended.
Things that need fixing:
+ dom_string_get_data() doesn't return the charset. Better would be to permit
the client to request a charset for the data to be returned in.
+ Interned node name strings will break if the document is UTF-16
(dom_document_create()). In fact, these could quite happily be globals,
rather than allocating a set for each document.
+ Other usage of dom string constructors need checking for sanity
+ DOM Strings need to gain more utility APIs (such as getting the character
length of a string, string concatenation etc).
svn path=/trunk/dom/; revision=3614
Diffstat (limited to 'bindings/xml/xmlparser.c')
-rw-r--r-- | bindings/xml/xmlparser.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bindings/xml/xmlparser.c b/bindings/xml/xmlparser.c index 6f1516b..9541a7c 100644 --- a/bindings/xml/xmlparser.c +++ b/bindings/xml/xmlparser.c @@ -182,6 +182,7 @@ xml_parser *xml_parser_create(const char *enc, const char *int_enc, /* Create key for user data registration */ err = dom_string_create_from_ptr_no_doc((dom_alloc) alloc, pw, + DOM_STRING_UTF8, (const uint8_t *) "__xmlnode", SLEN("__xmlnode"), &parser->udkey); if (err != DOM_NO_ERR) { @@ -194,6 +195,7 @@ xml_parser *xml_parser_create(const char *enc, const char *int_enc, /* Get DOM implementation */ /* Create a string representation of the features we want */ err = dom_string_create_from_ptr_no_doc((dom_alloc) alloc, pw, + DOM_STRING_UTF8, (const uint8_t *) "XML", SLEN("XML"), &features); if (err != DOM_NO_ERR) { dom_string_unref(parser->udkey); @@ -327,6 +329,7 @@ void xml_parser_start_document(void *ctx) /* qname */ NULL, /* doctype */ NULL, &doc, + DOM_STRING_UTF8, (dom_alloc) parser->alloc, parser->pw); if (err != DOM_NO_ERR) { |