From c8aaecba0272665ba64380ec62d9fc6eba90c960 Mon Sep 17 00:00:00 2001 From: Andrew Sidwell Date: Sun, 10 Aug 2008 13:19:36 +0000 Subject: Remove process_in_head(), since it was identical in behaviour to handle_in_head(). Remove prototypes for functions no longer existent. svn path=/trunk/hubbub/; revision=4987 --- src/treebuilder/after_frameset.c | 2 +- src/treebuilder/after_head.c | 2 +- src/treebuilder/in_body.c | 2 +- src/treebuilder/in_frameset.c | 2 +- src/treebuilder/in_head.c | 15 --------------- src/treebuilder/in_head_noscript.c | 6 +++--- src/treebuilder/in_table.c | 2 +- src/treebuilder/modes.h | 7 ------- 8 files changed, 8 insertions(+), 30 deletions(-) (limited to 'src/treebuilder') diff --git a/src/treebuilder/after_frameset.c b/src/treebuilder/after_frameset.c index 37a03a5..b80d815 100644 --- a/src/treebuilder/after_frameset.c +++ b/src/treebuilder/after_frameset.c @@ -49,7 +49,7 @@ bool handle_after_frameset(hubbub_treebuilder *treebuilder, if (type == HTML) { handle_in_body(treebuilder, token); } else if (type == NOFRAMES) { - process_in_head(treebuilder, token); + handle_in_head(treebuilder, token); } else { /** \todo parse error */ } diff --git a/src/treebuilder/after_head.c b/src/treebuilder/after_head.c index 5bd4b40..3148e69 100644 --- a/src/treebuilder/after_head.c +++ b/src/treebuilder/after_head.c @@ -70,7 +70,7 @@ bool handle_after_head(hubbub_treebuilder *treebuilder, } /* Process as "in head" */ - reprocess = process_in_head(treebuilder, token); + reprocess = handle_in_head(treebuilder, token); if (!element_stack_pop(treebuilder, &ns, &otype, &node)) { diff --git a/src/treebuilder/in_body.c b/src/treebuilder/in_body.c index 7530d4c..c0bb019 100644 --- a/src/treebuilder/in_body.c +++ b/src/treebuilder/in_body.c @@ -221,7 +221,7 @@ bool process_start_tag(hubbub_treebuilder *treebuilder, type == META || type == NOFRAMES || type == SCRIPT || type == STYLE || type == TITLE) { /* Process as "in head" */ - process_in_head(treebuilder, token); + handle_in_head(treebuilder, token); } else if (type == BODY) { process_body_in_body(treebuilder, token); } else if (type == ADDRESS || type == ARTICLE || type == ASIDE || diff --git a/src/treebuilder/in_frameset.c b/src/treebuilder/in_frameset.c index 7b644ad..8e1d86d 100644 --- a/src/treebuilder/in_frameset.c +++ b/src/treebuilder/in_frameset.c @@ -54,7 +54,7 @@ bool handle_in_frameset(hubbub_treebuilder *treebuilder, insert_element_no_push(treebuilder, &token->data.tag); /** \todo ack sc flag */ } else if (type == NOFRAMES) { - process_in_head(treebuilder, token); + handle_in_head(treebuilder, token); } else { /** \todo parse error */ } diff --git a/src/treebuilder/in_head.c b/src/treebuilder/in_head.c index 2df1062..4867a5d 100644 --- a/src/treebuilder/in_head.c +++ b/src/treebuilder/in_head.c @@ -180,18 +180,3 @@ bool handle_in_head(hubbub_treebuilder *treebuilder, return reprocess; } - - - -/** - * Process a tag as if in the "in head" state. - * - * \param treebuilder The treebuilder instance - * \param token The token to process - * \return True to reprocess the token, false otherwise - */ -bool process_in_head(hubbub_treebuilder *treebuilder, - const hubbub_token *token) -{ - return handle_in_head(treebuilder, token); -} diff --git a/src/treebuilder/in_head_noscript.c b/src/treebuilder/in_head_noscript.c index cea5d88..c4addee 100644 --- a/src/treebuilder/in_head_noscript.c +++ b/src/treebuilder/in_head_noscript.c @@ -29,10 +29,10 @@ bool handle_in_head_noscript(hubbub_treebuilder *treebuilder, switch (token->type) { case HUBBUB_TOKEN_CHARACTER: - reprocess = process_in_head(treebuilder, token); + reprocess = handle_in_head(treebuilder, token); break; case HUBBUB_TOKEN_COMMENT: - reprocess = process_in_head(treebuilder, token); + reprocess = handle_in_head(treebuilder, token); break; case HUBBUB_TOKEN_DOCTYPE: /** \todo parse error */ @@ -50,7 +50,7 @@ bool handle_in_head_noscript(hubbub_treebuilder *treebuilder, } else if (type == LINK || type == META || type == NOFRAMES || type == STYLE) { /* Process as "in head" */ - reprocess = process_in_head(treebuilder, token); + reprocess = handle_in_head(treebuilder, token); } else if (type == HEAD || type == NOSCRIPT) { /** \todo parse error */ } else { diff --git a/src/treebuilder/in_table.c b/src/treebuilder/in_table.c index 70969dd..68d5ec7 100644 --- a/src/treebuilder/in_table.c +++ b/src/treebuilder/in_table.c @@ -164,7 +164,7 @@ bool handle_in_table(hubbub_treebuilder *treebuilder, reprocess = true; } else if (!tainted && (type == STYLE || type == SCRIPT)) { - process_in_head(treebuilder, token); + handle_in_head(treebuilder, token); } else if (!tainted && type == INPUT) { handled = process_input_in_table(treebuilder, token); } else { diff --git a/src/treebuilder/modes.h b/src/treebuilder/modes.h index 7c0a87b..16aacd9 100644 --- a/src/treebuilder/modes.h +++ b/src/treebuilder/modes.h @@ -88,11 +88,4 @@ bool handle_after_after_body(hubbub_treebuilder *treebuilder, bool handle_after_after_frameset(hubbub_treebuilder *treebuilder, const hubbub_token *token); -bool process_in_head(hubbub_treebuilder *treebuilder, - const hubbub_token *token); -bool process_in_table(hubbub_treebuilder *treebuilder, - const hubbub_token *token); -bool process_in_select(hubbub_treebuilder *treebuilder, - const hubbub_token *token); - #endif -- cgit v1.2.3