aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-09-28 03:06:20 -04:00
Code

Some minor cleanup of token string access

Browse Source
This commit is contained in:
Jonas Fonseca 2005-12-28 16:34:42 +01:00 committed by Jonas Fonseca
parent 6e163b186c
commit ec7b293e4e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dom/scanner.h
View File

@ -24,6 +24,9 @@ struct dom_scanner_token {
struct dom_string string;
};
#define skip_dom_scanner_token_char(token) \
do { (token)->string.string++; (token)->string.length--; } while (0)
/* The naming of these two macros is a bit odd .. we compare often with
* "static" strings (I don't have a better word) so the macro name should
* be short. --jonas */

6
src/dom/select.c
View File

@ -183,7 +183,7 @@ get_scanner_token_number(struct dom_scanner_token *token)
return -1;
number += token->string.string[0] - '0';
token->string.string++, token->string.length--;
skip_dom_scanner_token_char(token);
}
return number;
@ -414,7 +414,7 @@ parse_dom_select(struct dom_select *select, struct dom_stack *stack,
case CSS_TOKEN_IDENT:
sel.node.type = DOM_NODE_ELEMENT;
copy_dom_string(&sel.node.string, &token->string);
if (token->string.length == 1 && token->string.string[0] == '*')
if (dom_scanner_token_contains(token, "*"))
sel.match.element |= DOM_SELECT_ELEMENT_UNIVERSAL;
break;
@ -424,7 +424,7 @@ parse_dom_select(struct dom_select *select, struct dom_stack *stack,
sel.node.type = DOM_NODE_ATTRIBUTE;
sel.match.attribute |= DOM_SELECT_ATTRIBUTE_ID;
/* Skip the leading '#'. */
token->string.string++, token->string.length--;
skip_dom_scanner_token_char(token);
break;
case '[':