aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-02-02 15:09:23 -05:00
Code

Make init_dom_scanner() take the state arg and drop a macro

Browse Source
This commit is contained in:
Jonas Fonseca 2005-12-31 01:55:38 +01:00 committed by Jonas Fonseca
parent 7489c134f7
commit 9264221635
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dom/scanner.c
View File

@ -153,8 +153,8 @@ init_dom_scanner_info(struct dom_scanner_info *scanner_info)
} }
void void
init_dom_scanner_state(struct dom_scanner *scanner, struct dom_scanner_info *scanner_info, init_dom_scanner(struct dom_scanner *scanner, struct dom_scanner_info *scanner_info,
struct dom_string *string, int state) struct dom_string *string, int state)
{ {
if (!scanner_info->initialized) { if (!scanner_info->initialized) {
init_dom_scanner_info(scanner_info); init_dom_scanner_info(scanner_info);

7
src/dom/scanner.h
View File

@ -91,11 +91,8 @@ struct dom_scanner_info {
/* Initializes the scanner. */ /* Initializes the scanner. */
void init_dom_scanner_state(struct dom_scanner *scanner, struct dom_scanner_info *scanner_info, void init_dom_scanner(struct dom_scanner *scanner, struct dom_scanner_info *scanner_info,
struct dom_string *string, int state); struct dom_string *string, int state);
#define init_dom_scanner(scanner, info, string) \
init_dom_scanner_state(scanner, info, string, 0)
/* The number of tokens in the scanners token table: /* The number of tokens in the scanners token table:
* At best it should be big enough to contain properties with space separated * At best it should be big enough to contain properties with space separated

2
src/dom/select.c
View File

@ -391,7 +391,7 @@ parse_dom_select(struct dom_select *select, struct dom_stack *stack,
struct dom_scanner scanner; struct dom_scanner scanner;
struct dom_select_node sel; struct dom_select_node sel;
init_dom_scanner(&scanner, &dom_css_scanner_info, string); init_dom_scanner(&scanner, &dom_css_scanner_info, string, 0);
memset(&sel, 0, sizeof(sel)); memset(&sel, 0, sizeof(sel));

9
src/dom/sgml/parser.c
View File

@ -295,10 +295,8 @@ parse_sgml_plain(struct dom_stack *stack, struct dom_scanner *scanner)
/* Parse the <?xml data="attributes"?>. */ /* Parse the <?xml data="attributes"?>. */
struct dom_scanner attr_scanner; struct dom_scanner attr_scanner;
init_dom_scanner_state(&attr_scanner, init_dom_scanner(&attr_scanner, &sgml_scanner_info,
&sgml_scanner_info, &token->string, SGML_STATE_ELEMENT);
&token->string,
SGML_STATE_ELEMENT);
if (dom_scanner_has_tokens(&attr_scanner)) if (dom_scanner_has_tokens(&attr_scanner))
parse_sgml_attributes(stack, &attr_scanner); parse_sgml_attributes(stack, &attr_scanner);
@ -362,7 +360,8 @@ sgml_parsing_push(struct dom_stack *stack, struct dom_node *node, void *data)
parsing->depth = parser->stack.depth; parsing->depth = parser->stack.depth;
get_dom_stack_top(&parser->stack)->immutable = 1; get_dom_stack_top(&parser->stack)->immutable = 1;
init_dom_scanner(&parsing->scanner, &sgml_scanner_info, &node->string); init_dom_scanner(&parsing->scanner, &sgml_scanner_info, &node->string,
SGML_STATE_TEXT);
} }
static void static void