diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-03-13 19:31:40 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-03-13 21:25:57 +0900 |
commit | e7f5d708d36dafdda898db049bca916f3f34dbce (patch) | |
tree | 474ae344e69523520ec39fcc7be9d48d9beaa0e3 /src/udev/udev-rules.c | |
parent | a0244c5de46c9d7018d2216f5ff44130247563eb (diff) | |
download | systemd-e7f5d708d36dafdda898db049bca916f3f34dbce.tar.gz |
udev-rules: inline rule_line_append_token()
Diffstat (limited to 'src/udev/udev-rules.c')
-rw-r--r-- | src/udev/udev-rules.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 3c2fbc9df2..04220d97db 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -477,14 +477,6 @@ static UdevRuleSubstituteType rule_get_substitution_type(const char *str) { return SUBST_TYPE_PLAIN; } -static void rule_line_append_token(UdevRuleLine *rule_line, UdevRuleToken *token) { - assert(rule_line); - assert(token); - - token->rule_line = rule_line; - LIST_APPEND(tokens, rule_line->tokens, token); -} - static int rule_line_add_token(UdevRuleLine *rule_line, UdevRuleTokenType type, UdevRuleOperatorType op, char *value, void *data) { _cleanup_(udev_rule_token_freep) UdevRuleToken *token = NULL; UdevRuleMatchType match_type = _MATCH_TYPE_INVALID; @@ -571,9 +563,10 @@ static int rule_line_add_token(UdevRuleLine *rule_line, UdevRuleTokenType type, .match_type = match_type, .attr_subst_type = subst_type, .attr_match_remove_trailing_whitespace = remove_trailing_whitespace, + .rule_line = rule_line, }; - rule_line_append_token(rule_line, token); + LIST_APPEND(tokens, rule_line->tokens, token); if (token->type == TK_A_NAME) SET_FLAG(rule_line->type, LINE_HAS_NAME, true); @@ -1139,7 +1132,7 @@ static void sort_tokens(UdevRuleLine *rule_line) { min_token = t; LIST_REMOVE(tokens, old_tokens, min_token); - rule_line_append_token(rule_line, min_token); + LIST_APPEND(tokens, rule_line->tokens, min_token); } } |