diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2011-07-26 21:20:28 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-07-26 21:20:28 +0000 |
commit | 60c01918f34e99e5f9428fbc96cbcf62257c82fa (patch) | |
tree | 1c32acd13385f7d1a495654dcb2614e043bb4253 /src/treebuilder/in_select.c | |
parent | 9c2fbb29cc1d77e1d0600baf2d0f8bd9503ad419 (diff) | |
download | libhubbub-60c01918f34e99e5f9428fbc96cbcf62257c82fa.tar.gz libhubbub-60c01918f34e99e5f9428fbc96cbcf62257c82fa.tar.bz2 |
Fix build with GCC 4.6
svn path=/trunk/hubbub/; revision=12628
Diffstat (limited to 'src/treebuilder/in_select.c')
-rw-r--r-- | src/treebuilder/in_select.c | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/src/treebuilder/in_select.c b/src/treebuilder/in_select.c index cfddf4a..ab40c6c 100644 --- a/src/treebuilder/in_select.c +++ b/src/treebuilder/in_select.c @@ -52,10 +52,8 @@ hubbub_error handle_in_select(hubbub_treebuilder *treebuilder, err = handle_in_body(treebuilder, token); } else if (type == OPTION) { if (current_node(treebuilder) == OPTION) { - hubbub_error e; - e = element_stack_pop(treebuilder, &ns, &otype, + element_stack_pop(treebuilder, &ns, &otype, &node); - assert(e == HUBBUB_OK); treebuilder->tree_handler->unref_node( treebuilder->tree_handler->ctx, @@ -66,10 +64,8 @@ hubbub_error handle_in_select(hubbub_treebuilder *treebuilder, true); } else if (type == OPTGROUP) { if (current_node(treebuilder) == OPTION) { - hubbub_error e; - e = element_stack_pop(treebuilder, &ns, &otype, + element_stack_pop(treebuilder, &ns, &otype, &node); - assert(e == HUBBUB_OK); treebuilder->tree_handler->unref_node( treebuilder->tree_handler->ctx, @@ -77,10 +73,8 @@ hubbub_error handle_in_select(hubbub_treebuilder *treebuilder, } if (current_node(treebuilder) == OPTGROUP) { - hubbub_error e; - e = element_stack_pop(treebuilder, &ns, &otype, + element_stack_pop(treebuilder, &ns, &otype, &node); - assert(e == HUBBUB_OK); treebuilder->tree_handler->unref_node( treebuilder->tree_handler->ctx, @@ -93,10 +87,8 @@ hubbub_error handle_in_select(hubbub_treebuilder *treebuilder, type == TEXTAREA) { if (element_in_scope(treebuilder, SELECT, true)) { - hubbub_error e; - e = element_stack_pop_until(treebuilder, + element_stack_pop_until(treebuilder, SELECT); - assert(e == HUBBUB_OK); reset_insertion_mode(treebuilder); } else { /* fragment case */ @@ -120,10 +112,8 @@ hubbub_error handle_in_select(hubbub_treebuilder *treebuilder, if (type == OPTGROUP) { if (current_node(treebuilder) == OPTION && prev_node(treebuilder) == OPTGROUP) { - hubbub_error e; - e = element_stack_pop(treebuilder, &ns, &otype, + element_stack_pop(treebuilder, &ns, &otype, &node); - assert(e == HUBBUB_OK); treebuilder->tree_handler->unref_node( treebuilder->tree_handler->ctx, @@ -131,10 +121,8 @@ hubbub_error handle_in_select(hubbub_treebuilder *treebuilder, } if (current_node(treebuilder) == OPTGROUP) { - hubbub_error e; - e = element_stack_pop(treebuilder, &ns, &otype, + element_stack_pop(treebuilder, &ns, &otype, &node); - assert(e == HUBBUB_OK); treebuilder->tree_handler->unref_node( treebuilder->tree_handler->ctx, @@ -144,10 +132,8 @@ hubbub_error handle_in_select(hubbub_treebuilder *treebuilder, } } else if (type == OPTION) { if (current_node(treebuilder) == OPTION) { - hubbub_error e; - e = element_stack_pop(treebuilder, &ns, &otype, + element_stack_pop(treebuilder, &ns, &otype, &node); - assert(e == HUBBUB_OK); treebuilder->tree_handler->unref_node( treebuilder->tree_handler->ctx, @@ -157,10 +143,8 @@ hubbub_error handle_in_select(hubbub_treebuilder *treebuilder, } } else if (type == SELECT) { if (element_in_scope(treebuilder, SELECT, true)) { - hubbub_error e; - e = element_stack_pop_until(treebuilder, + element_stack_pop_until(treebuilder, SELECT); - assert(e == HUBBUB_OK); reset_insertion_mode(treebuilder); } else { /* fragment case */ |