udevd: merge exec and run queue to minimize devpath string compares

[elogind.git] / udev / udev-rules.c

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 1647f5cb097aa2555b6fbf12778b9342811ab1a1..665ad71e80f3289a1234930e1ab0b06fa4c48503 100644 (file)
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -547,11 +547,12 @@ static int wait_for_file(struct udev_device *dev, const char *file, int timeout)
 {
        struct udev *udev = udev_device_get_udev(dev);
        char filepath[UTIL_PATH_SIZE];
-       char devicepath[UTIL_PATH_SIZE] = "";
+       char devicepath[UTIL_PATH_SIZE];
        struct stat stats;
        int loop = timeout * WAIT_LOOP_PER_SECOND;
 
        /* a relative path is a device attribute */
+       devicepath[0] = '\0';
        if (file[0] != '/') {
                util_strlcpy(devicepath, udev_get_sys_path(udev), sizeof(devicepath));
                util_strlcat(devicepath, udev_device_get_devpath(dev), sizeof(devicepath));
@@ -1842,7 +1843,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
        /* loop through token list, match, run actions or forward to next rule */
        cur = &rules->tokens[0];
        rule = cur;
-       while (cur != NULL && cur->type != TK_END) {
+       while (1) {
                unsigned int idx;
 
                dump_token(rules, cur);
@@ -2318,11 +2319,11 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                        cur = &rules->tokens[cur->key.rule_goto];
                        continue;
                case TK_A_LAST_RULE:
+               case TK_END:
                        break;
 
                case TK_M_PARENTS_MAX:
                case TK_M_MAX:
-               case TK_END:
                case TK_UNSET:
                        err(rules->udev, "wrong type %u\n", cur->type);
                        goto nomatch;