diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2009-04-15 11:02:53 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-04-15 11:02:53 +0000 |
commit | b50dc50a2b25c7cc77843b25adc41575cfce7fd6 (patch) | |
tree | 68d81123fda9d7df3aa15375e12ea034896a1c87 /src/treebuilder/after_body.c | |
parent | 051158ffe97eb9b4a1a4b9b5ea719c7e38509200 (diff) | |
download | libhubbub-b50dc50a2b25c7cc77843b25adc41575cfce7fd6.tar.gz libhubbub-b50dc50a2b25c7cc77843b25adc41575cfce7fd6.tar.bz2 |
Manually merge r7070 into trunk
svn path=/trunk/hubbub/; revision=7082
Diffstat (limited to 'src/treebuilder/after_body.c')
-rw-r--r-- | src/treebuilder/after_body.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/treebuilder/after_body.c b/src/treebuilder/after_body.c index beaed69..42e982b 100644 --- a/src/treebuilder/after_body.c +++ b/src/treebuilder/after_body.c @@ -30,7 +30,6 @@ hubbub_error handle_after_body(hubbub_treebuilder *treebuilder, case HUBBUB_TOKEN_CHARACTER: { /* mostly cribbed from process_characters_expect_whitespace */ - const uint8_t *data = token->data.character.ptr; size_t len = token->data.character.len; size_t c; @@ -42,12 +41,14 @@ hubbub_error handle_after_body(hubbub_treebuilder *treebuilder, break; } - /* Non-whitespace characters in token, so handle as in body */ + /* Whitespace characters in token, so handle as in body */ if (c > 0) { hubbub_token temp = *token; temp.data.character.len = c; - handle_in_body(treebuilder, &temp); + err = handle_in_body(treebuilder, &temp); + if (err != HUBBUB_OK) + return err; } /* Anything else, switch to in body */ @@ -62,7 +63,7 @@ hubbub_error handle_after_body(hubbub_treebuilder *treebuilder, } break; case HUBBUB_TOKEN_COMMENT: - process_comment_append(treebuilder, token, + err = process_comment_append(treebuilder, token, treebuilder->context.element_stack[ 0].node); break; @@ -76,7 +77,7 @@ hubbub_error handle_after_body(hubbub_treebuilder *treebuilder, if (type == HTML) { /* Process as if "in body" */ - handle_in_body(treebuilder, token); + err = handle_in_body(treebuilder, token); } else { /** \todo parse error */ treebuilder->context.mode = IN_BODY; |