diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2011-12-22 10:24:04 +0000 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2011-12-22 10:24:04 +0000 |
commit | 70d69c686d657be26c94e176b002f7f754d4cb19 (patch) | |
tree | afd88cc4a079573cc76d7adbbb0abf6fa93e1d60 /src/core | |
parent | 59d42e4810ab1f077043c3f152480a5f5deb0d3f (diff) | |
download | libdom-70d69c686d657be26c94e176b002f7f754d4cb19.tar.gz libdom-70d69c686d657be26c94e176b002f7f754d4cb19.tar.bz2 |
Move dom_string data accessing functions to public header.
svn path=/trunk/libdom/; revision=13322
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/node.c | 8 | ||||
-rw-r--r-- | src/core/nodelist.c | 12 | ||||
-rw-r--r-- | src/core/string.c | 52 | ||||
-rw-r--r-- | src/core/string.h | 10 |
4 files changed, 36 insertions, 46 deletions
diff --git a/src/core/node.c b/src/core/node.c index 34c80e0..988ed1d 100644 --- a/src/core/node.c +++ b/src/core/node.c @@ -1197,8 +1197,8 @@ dom_exception _dom_node_is_supported(dom_node_internal *node, UNUSED(node); - dom_implementation_has_feature(_dom_string_data(feature), - _dom_string_data(version), &has); + dom_implementation_has_feature(dom_string_data(feature), + dom_string_data(version), &has); *result = has; @@ -1685,8 +1685,8 @@ dom_exception _dom_node_get_feature(dom_node_internal *node, UNUSED(node); - dom_implementation_has_feature(_dom_string_data(feature), - _dom_string_data(version), &has); + dom_implementation_has_feature(dom_string_data(feature), + dom_string_data(version), &has); if (has) { *result = node; diff --git a/src/core/nodelist.c b/src/core/nodelist.c index 58a2d12..1100329 100644 --- a/src/core/nodelist.c +++ b/src/core/nodelist.c @@ -87,8 +87,8 @@ dom_exception _dom_nodelist_create(dom_document *doc, nodelist_type type, if (type == DOM_NODELIST_BY_NAME) { assert(tagname != NULL); l->data.n.any_name = false; - if (_dom_string_byte_length(tagname) == 1) { - const char *ch = _dom_string_data(tagname); + if (dom_string_byte_length(tagname) == 1) { + const char *ch = dom_string_data(tagname); if (*ch == '*') { l->data.n.any_name = true; } @@ -99,8 +99,8 @@ dom_exception _dom_nodelist_create(dom_document *doc, nodelist_type type, l->data.ns.any_localname = false; l->data.ns.any_namespace = false; if (localname != NULL) { - if (_dom_string_byte_length(localname) == 1) { - const char *ch = _dom_string_data(localname); + if (dom_string_byte_length(localname) == 1) { + const char *ch = dom_string_data(localname); if (*ch == '*') { l->data.ns.any_localname = true; } @@ -108,8 +108,8 @@ dom_exception _dom_nodelist_create(dom_document *doc, nodelist_type type, dom_string_ref(localname); } if (namespace != NULL) { - if (_dom_string_byte_length(namespace) == 1) { - const char *ch = _dom_string_data(namespace); + if (dom_string_byte_length(namespace) == 1) { + const char *ch = dom_string_data(namespace); if (*ch == '*') { l->data.ns.any_namespace = true; } diff --git a/src/core/string.c b/src/core/string.c index dde24a8..c5859af 100644 --- a/src/core/string.c +++ b/src/core/string.c @@ -308,8 +308,8 @@ uint32_t dom_string_index(dom_string *str, uint32_t chr) uint32_t c, index; parserutils_error err; - s = (const uint8_t *) _dom_string_data(str); - slen = _dom_string_byte_length(str); + s = (const uint8_t *) dom_string_data(str); + slen = dom_string_byte_length(str); index = 0; @@ -345,8 +345,8 @@ uint32_t dom_string_rindex(dom_string *str, uint32_t chr) uint32_t c, coff, index; parserutils_error err; - s = (const uint8_t *) _dom_string_data(str); - slen = _dom_string_byte_length(str); + s = (const uint8_t *) dom_string_data(str); + slen = dom_string_byte_length(str); index = dom_string_length(str); @@ -385,8 +385,8 @@ uint32_t dom_string_length(dom_string *str) size_t slen, clen; parserutils_error err; - s = (const uint8_t *) _dom_string_data(str); - slen = _dom_string_byte_length(str); + s = (const uint8_t *) dom_string_data(str); + slen = dom_string_byte_length(str); err = parserutils_charset_utf8_length(s, slen, &clen); if (err != PARSERUTILS_OK) { @@ -411,8 +411,8 @@ dom_exception dom_string_at(dom_string *str, uint32_t index, uint32_t c, i; parserutils_error err; - s = (const uint8_t *) _dom_string_data(str); - slen = _dom_string_byte_length(str); + s = (const uint8_t *) dom_string_data(str); + slen = dom_string_byte_length(str); i = 0; @@ -464,10 +464,10 @@ dom_exception dom_string_concat(dom_string *s1, dom_string *s2, assert(s1 != NULL); assert(s2 != NULL); - s1ptr = (const uint8_t *) _dom_string_data(s1); - s2ptr = (const uint8_t *) _dom_string_data(s2); - s1len = _dom_string_byte_length(s1); - s2len = _dom_string_byte_length(s2); + s1ptr = (const uint8_t *) dom_string_data(s1); + s2ptr = (const uint8_t *) dom_string_data(s2); + s1len = dom_string_byte_length(s1); + s2len = dom_string_byte_length(s2); concat = malloc(sizeof(dom_string)); @@ -512,8 +512,8 @@ dom_exception dom_string_concat(dom_string *s1, dom_string *s2, dom_exception dom_string_substr(dom_string *str, uint32_t i1, uint32_t i2, dom_string **result) { - const uint8_t *s = (const uint8_t *) _dom_string_data(str); - size_t slen = _dom_string_byte_length(str); + const uint8_t *s = (const uint8_t *) dom_string_data(str); + size_t slen = dom_string_byte_length(str); uint32_t b1, b2; parserutils_error err; @@ -573,10 +573,10 @@ dom_exception dom_string_insert(dom_string *target, uint32_t ins = 0; parserutils_error err; - t = (const uint8_t *) _dom_string_data(target); - tlen = _dom_string_byte_length(target); - s = (const uint8_t *) _dom_string_data(source); - slen = _dom_string_byte_length(source); + t = (const uint8_t *) dom_string_data(target); + tlen = dom_string_byte_length(target); + s = (const uint8_t *) dom_string_data(source); + slen = dom_string_byte_length(source); clen = dom_string_length(target); @@ -661,10 +661,10 @@ dom_exception dom_string_replace(dom_string *target, uint32_t b1, b2; parserutils_error err; - t = (const uint8_t *) _dom_string_data(target); - tlen = _dom_string_byte_length(target); - s = (const uint8_t *) _dom_string_data(source); - slen = _dom_string_byte_length(source); + t = (const uint8_t *) dom_string_data(target); + tlen = dom_string_byte_length(target); + s = (const uint8_t *) dom_string_data(source); + slen = dom_string_byte_length(source); /* Initialise the byte index of the start to 0 */ b1 = 0; @@ -743,8 +743,8 @@ dom_exception dom_string_replace(dom_string *target, */ uint32_t dom_string_hash(dom_string *str) { - const uint8_t *s = (const uint8_t *) _dom_string_data(str); - size_t slen = _dom_string_byte_length(str); + const uint8_t *s = (const uint8_t *) dom_string_data(str); + size_t slen = dom_string_byte_length(str); uint32_t hash = 0x811c9dc5; while (slen > 0) { @@ -787,7 +787,7 @@ dom_exception _dom_exception_from_lwc_error(lwc_error err) * @note: This function is just provided for the convenience of accessing the * raw C string character, no change on the result string is allowed. */ -const char *_dom_string_data(dom_string *str) +const char *dom_string_data(dom_string *str) { if (str->type == DOM_STRING_CDATA) { return (const char *) str->data.cdata.ptr; @@ -800,7 +800,7 @@ const char *_dom_string_data(dom_string *str) * * \param str The dom_string object */ -size_t _dom_string_byte_length(dom_string *str) +size_t dom_string_byte_length(dom_string *str) { if (str->type == DOM_STRING_CDATA) { return str->data.cdata.len; diff --git a/src/core/string.h b/src/core/string.h index 3d5844a..796a2ea 100644 --- a/src/core/string.h +++ b/src/core/string.h @@ -18,15 +18,5 @@ dom_exception _dom_string_create_from_lwcstring(struct lwc_string_s *str, /* Map the lwc_error to dom_exception */ dom_exception _dom_exception_from_lwc_error(lwc_error err); -/** - * Get the raw character data of the dom_string. - * @note: This function is just provided for the convenience of accessing the - * raw C string character, no change on the result string is allowed. - */ -const char *_dom_string_data(dom_string *str); - -/* Get the byte length of this dom_string */ -size_t _dom_string_byte_length(dom_string *str); - #endif |