[PATCH] try to wait until the proper device file shows up in sysfs.

[elogind.git] / namedev_parse.c

diff --git a/namedev_parse.c b/namedev_parse.c
index 3578058a768c1fe0f66549d4dd72b071549fed11..33e0c89e2218676086b826c9c92e8ef140cf514f 100644 (file)
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -158,6 +158,10 @@ int namedev_init_rules(void)
                lineno++;
                dbg_parse("read '%s'", temp);
 
+               /* eat the whitespace */
+               while (isspace(*temp))
+                       ++temp;
+
                /* empty line? */
                if (*temp == 0x00)
                        continue;
@@ -166,10 +170,6 @@ int namedev_init_rules(void)
                if (*temp == COMMENT_CHARACTER)
                        continue;
 
-               /* eat the whitespace */
-               while (isspace(*temp))
-                       ++temp;
-
                memset(&dev, 0x00, sizeof(struct config_device));
 
                /* get the method */
@@ -257,7 +257,7 @@ keys:
                /* check presence of keys according to method type */
                switch (dev.type) {
                case LABEL:
-                       dbg_parse("LABEL name='%s', bus='%s', "
+                       dbg_parse(TYPE_LABEL " name='%s', bus='%s', "
                                  "sysfs_file='%s', sysfs_value='%s', symlink='%s'",
                                  dev.name, dev.bus, dev.sysfs_file,
                                  dev.sysfs_value, dev.symlink);
@@ -268,7 +268,7 @@ keys:
                                goto error;
                        break;
                case NUMBER:
-                       dbg_parse("NUMBER name='%s', bus='%s', id='%s', symlink='%s'",
+                       dbg_parse(TYPE_NUMBER "name='%s', bus='%s', id='%s', symlink='%s'",
                                  dev.name, dev.bus, dev.id, dev.symlink);
                        if ((*dev.name == '\0') ||
                            (*dev.bus == '\0') ||
@@ -276,7 +276,7 @@ keys:
                                goto error;
                        break;
                case TOPOLOGY:
-                       dbg_parse("TOPOLOGY name='%s', bus='%s', "
+                       dbg_parse(TYPE_TOPOLOGY "name='%s', bus='%s', "
                                  "place='%s', symlink='%s'",
                                  dev.name, dev.bus, dev.place, dev.symlink);
                        if ((*dev.name == '\0') ||
@@ -285,14 +285,14 @@ keys:
                                goto error;
                        break;
                case REPLACE:
-                       dbg_parse("REPLACE name='%s', kernel_name='%s', symlink='%s'",
+                       dbg_parse(TYPE_REPLACE "name='%s', kernel_name='%s', symlink='%s'",
                                  dev.name, dev.kernel_name, dev.symlink);
                        if ((*dev.name == '\0') ||
                            (*dev.kernel_name == '\0'))
                                goto error;
                        break;
                case CALLOUT:
-                       dbg_parse("CALLOUT name='%s', bus='%s', program='%s', "
+                       dbg_parse(TYPE_CALLOUT "name='%s', bus='%s', program='%s', "
                                  "id='%s', symlink='%s'",
                                  dev.name, dev.bus, dev.exec_program,
                                  dev.id, dev.symlink);
@@ -303,7 +303,7 @@ keys:
                                goto error;
                        break;
                default:
-                       dbg_parse("xxx default method");
+                       dbg_parse("unknown type of method");
                        goto error;
                }