summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-03-25 20:42:17 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-03-25 20:42:17 +0000
commit17329e0a13c156e7292784b20a42a4413f44a9a8 (patch)
tree8f714c5cb8a600222a2e7576380b8a3a3f9c9065 /src
parent2ed308e762abfb3e3d8746dff24581831d796056 (diff)
downloadlibdom-17329e0a13c156e7292784b20a42a4413f44a9a8.tar.gz
libdom-17329e0a13c156e7292784b20a42a4413f44a9a8.tar.bz2
Squash warnings
svn path=/trunk/dom/; revision=6885
Diffstat (limited to 'src')
-rw-r--r--src/core/node.c2
-rw-r--r--src/core/string.c15
2 files changed, 7 insertions, 10 deletions
diff --git a/src/core/node.c b/src/core/node.c
index 23a0f80..518d88c 100644
--- a/src/core/node.c
+++ b/src/core/node.c
@@ -1556,7 +1556,7 @@ dom_exception _dom_node_get_user_data(dom_node_internal *node,
bool _dom_node_permitted_child(const dom_node_internal *parent,
const dom_node_internal *child)
{
- bool valid;
+ bool valid = false;
/* See DOM3Core $1.1.1 for details */
diff --git a/src/core/string.c b/src/core/string.c
index 3d30e3f..806531a 100644
--- a/src/core/string.c
+++ b/src/core/string.c
@@ -248,7 +248,7 @@ uint32_t dom_string_rindex(struct dom_string *str, uint32_t chr)
{
const uint8_t *s;
size_t clen, slen;
- uint32_t c, index;
+ uint32_t c, coff, index;
parserutils_error err;
if (str == NULL)
@@ -261,9 +261,9 @@ uint32_t dom_string_rindex(struct dom_string *str, uint32_t chr)
while (slen > 0) {
err = parserutils_charset_utf8_prev(s, slen,
- (uint32_t *) &clen);
+ (uint32_t *) &coff);
if (err == PARSERUTILS_OK) {
- err = parserutils_charset_utf8_to_ucs4(s + clen,
+ err = parserutils_charset_utf8_to_ucs4(s + coff,
slen - clen, &c, &clen);
}
@@ -372,7 +372,7 @@ dom_exception dom_string_substr(struct dom_string *str,
{
const uint8_t *s = str->ptr;
size_t slen = str->len;
- size_t b1, b2;
+ uint32_t b1, b2;
parserutils_error err;
/* Initialise the byte index of the start to 0 */
@@ -382,8 +382,7 @@ dom_exception dom_string_substr(struct dom_string *str,
/* Calculate the byte index of the start */
while (i1 > 0) {
- err = parserutils_charset_utf8_next(s, slen - b1, b1,
- (uint32_t *) &b1);
+ err = parserutils_charset_utf8_next(s, slen - b1, b1, &b1);
if (err != PARSERUTILS_OK) {
return DOM_NO_MEM_ERR;
}
@@ -396,9 +395,7 @@ dom_exception dom_string_substr(struct dom_string *str,
/* Calculate the byte index of the end */
while (i2 > 0) {
- err = parserutils_charset_utf8_next(s, slen - b2, b2,
- (uint32_t *) &b2);
-
+ err = parserutils_charset_utf8_next(s, slen - b2, b2, &b2);
if (err != PARSERUTILS_OK) {
return DOM_NO_MEM_ERR;
}