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/before_html.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/before_html.c')
| -rw-r--r-- | src/treebuilder/before_html.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/treebuilder/before_html.c b/src/treebuilder/before_html.c index d5a0d22..1ed3717 100644 --- a/src/treebuilder/before_html.c +++ b/src/treebuilder/before_html.c @@ -32,7 +32,7 @@ hubbub_error handle_before_html(hubbub_treebuilder *treebuilder, /** \todo parse error */ break; case HUBBUB_TOKEN_COMMENT: - process_comment_append(treebuilder, token, + err = process_comment_append(treebuilder, token, treebuilder->context.document); break; case HUBBUB_TOKEN_CHARACTER: @@ -59,7 +59,7 @@ hubbub_error handle_before_html(hubbub_treebuilder *treebuilder, if (handled || err == HUBBUB_REPROCESS) { - int success; + hubbub_error e; void *html, *appended; /* We can't use insert_element() here, as it assumes @@ -78,31 +78,30 @@ hubbub_error handle_before_html(hubbub_treebuilder *treebuilder, tag.n_attributes = 0; tag.attributes = NULL; - success = treebuilder->tree_handler->create_element( + e = treebuilder->tree_handler->create_element( treebuilder->tree_handler->ctx, &tag, &html); } else { - success = treebuilder->tree_handler->create_element( + e = treebuilder->tree_handler->create_element( treebuilder->tree_handler->ctx, &token->data.tag, &html); } - if (success != 0) { - /** \todo errors */ - } + if (e != HUBBUB_OK) + return e; - success = treebuilder->tree_handler->append_child( + e = treebuilder->tree_handler->append_child( treebuilder->tree_handler->ctx, treebuilder->context.document, html, &appended); - if (success != 0) { - /** \todo errors */ - } treebuilder->tree_handler->unref_node( treebuilder->tree_handler->ctx, html); + if (e != HUBBUB_OK) + return e; + /* We can't use element_stack_push() here, as it * assumes that current_node is pointing at the index * before the one to insert at. For the first entry in |