X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-rules.c;h=55d7e30c0215ceb4fdf019dd3e412a560dad07c4;hb=8fef0ff25c9fd7e5bb99d66f43c6357e4996a3cc;hp=4e85760bd4402a388573463e426ac362edcadf37;hpb=b59e246565337d6c6967059dd15a52a15277433e;p=elogind.git diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 4e85760bd..55d7e30c0 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -1131,7 +1131,7 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type, token->key.type = type; token->key.op = op; rule_tmp->token_cur++; - if (rule_tmp->token_cur >= ARRAY_SIZE(rule_tmp->token)) { + if (rule_tmp->token_cur >= ELEMENTSOF(rule_tmp->token)) { log_error("temporary rule array too small\n"); return -1; } @@ -1344,7 +1344,7 @@ static int add_rule(struct udev_rules *rules, char *line, }; unsigned int i; - for (i = 0; i < ARRAY_SIZE(blacklist); i++) + for (i = 0; i < ELEMENTSOF(blacklist); i++) if (strcmp(attr, blacklist[i]) == 0) { log_error("invalid ENV attribute, '%s' can not be set %s:%u\n", attr, filename, lineno); continue;