r13322 tlsa - in /trunk/libdom: include/dom/core/string.h src/core/node.c src/core/nodelist.c src/core/string.c src/core/string.h src/events/keyboard_event.c src/events/mouse_event.c

Author: tlsa Date: Thu Dec 22 04:24:04 2011 New Revision: 13322 URL: http://source.netsurf-browser.org?rev=13322&view=rev Log: Move dom_string data accessing functions to public header. Modified: trunk/libdom/include/dom/core/string.h trunk/libdom/src/core/node.c trunk/libdom/src/core/nodelist.c trunk/libdom/src/core/string.c trunk/libdom/src/core/string.h trunk/libdom/src/events/keyboard_event.c trunk/libdom/src/events/mouse_event.c Modified: trunk/libdom/include/dom/core/string.h URL: http://source.netsurf-browser.org/trunk/libdom/include/dom/core/string.h?... ============================================================================== --- trunk/libdom/include/dom/core/string.h (original) +++ trunk/libdom/include/dom/core/string.h Thu Dec 22 04:24:04 2011 @@ -44,6 +44,16 @@ /* Get the length, in characters, of a dom string */ uint32_t dom_string_length(dom_string *str); +/** + * 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); + /* Get the UCS-4 character at position index, the index should be in * [0, length), and length can be get by calling dom_string_length */ Modified: trunk/libdom/src/core/node.c URL: http://source.netsurf-browser.org/trunk/libdom/src/core/node.c?rev=13322&... ============================================================================== --- trunk/libdom/src/core/node.c (original) +++ trunk/libdom/src/core/node.c Thu Dec 22 04:24:04 2011 @@ -1197,8 +1197,8 @@ 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 @@ 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; Modified: trunk/libdom/src/core/nodelist.c URL: http://source.netsurf-browser.org/trunk/libdom/src/core/nodelist.c?rev=13... ============================================================================== --- trunk/libdom/src/core/nodelist.c (original) +++ trunk/libdom/src/core/nodelist.c Thu Dec 22 04:24:04 2011 @@ -87,8 +87,8 @@ 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 @@ 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_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; } Modified: trunk/libdom/src/core/string.c URL: http://source.netsurf-browser.org/trunk/libdom/src/core/string.c?rev=1332... ============================================================================== --- trunk/libdom/src/core/string.c (original) +++ trunk/libdom/src/core/string.c Thu Dec 22 04:24:04 2011 @@ -308,8 +308,8 @@ 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 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 @@ 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 @@ 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 @@ 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_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 @@ 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 @@ 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 @@ */ 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 @@ * @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 @@ * * \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; Modified: trunk/libdom/src/core/string.h URL: http://source.netsurf-browser.org/trunk/libdom/src/core/string.h?rev=1332... ============================================================================== --- trunk/libdom/src/core/string.h (original) +++ trunk/libdom/src/core/string.h Thu Dec 22 04:24:04 2011 @@ -18,15 +18,5 @@ /* 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 Modified: trunk/libdom/src/events/keyboard_event.c URL: http://source.netsurf-browser.org/trunk/libdom/src/events/keyboard_event.... ============================================================================== --- trunk/libdom/src/events/keyboard_event.c (original) +++ trunk/libdom/src/events/keyboard_event.c Thu Dec 22 04:24:04 2011 @@ -177,8 +177,8 @@ return DOM_NO_ERR; } - const char *data = _dom_string_data(m); - size_t len = _dom_string_byte_length(m); + const char *data = dom_string_data(m); + size_t len = dom_string_byte_length(m); if (len == SLEN("AltGraph") && strncmp(data, "AltGraph", len) == 0) { *state = ((evt->modifier_state & DOM_MOD_ALT_GRAPH) != 0); @@ -291,7 +291,7 @@ if (modifier_list == NULL) return DOM_NO_ERR; - const char *data = _dom_string_data(modifier_list); + const char *data = dom_string_data(modifier_list); const char *m = data; size_t len = 0; Modified: trunk/libdom/src/events/mouse_event.c URL: http://source.netsurf-browser.org/trunk/libdom/src/events/mouse_event.c?r... ============================================================================== --- trunk/libdom/src/events/mouse_event.c (original) +++ trunk/libdom/src/events/mouse_event.c Thu Dec 22 04:24:04 2011 @@ -229,8 +229,8 @@ return DOM_NO_ERR; } - const char *data = _dom_string_data(m); - size_t len = _dom_string_byte_length(m); + const char *data = dom_string_data(m); + size_t len = dom_string_byte_length(m); if (len == SLEN("AltGraph") && strncmp(data, "AltGraph", len) == 0) { *state = ((evt->modifier_state & DOM_MOD_ALT_GRAPH) != 0);