[PATCH] misc code cleanups.

[elogind.git] / namedev_parse.c

diff --git a/namedev_parse.c b/namedev_parse.c
index 98e822dfef4bd82c34350179602b6e02d780b741..b15be0e6fa7d5894c9c8bc0a3a19f07034300a06 100644 (file)
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -21,8 +21,10 @@
  *
  */
 
-/* define this to enable parsing debugging */
+#ifdef DEBUG
+/* define this to enable parsing debugging also */
 /* #define DEBUG_PARSER */
+#endif
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -34,6 +36,7 @@
 #include <errno.h>
 
 #include "udev.h"
+#include "logging.h"
 #include "namedev.h"
 
 static int add_config_dev(struct config_device *new_dev)
@@ -117,7 +120,6 @@ void dump_perm_dev_list(void)
                dump_perm_dev(dev);
 }
 
-
 int namedev_init_rules(void)
 {
        char line[255];
@@ -230,7 +232,9 @@ int namedev_init_rules(void)
                                continue;
                        }
 
-                       dbg_parse("unknown type of field '%s'", temp2);
+                       dbg("unknown type of field '%s'", temp2);
+                       dbg("You might be using a rules file in the old format, please fix.");
+                       goto error;
                }
 
                /* simple plausibility check for given keys */
@@ -245,12 +249,13 @@ int namedev_init_rules(void)
                        goto error;
                }
 
+               dev.config_line = lineno;
                retval = add_config_dev(&dev);
                if (retval) {
                        dbg("add_config_dev returned with error %d", retval);
                        continue;
 error:
-                       dbg("%s:%d:%Zd: parse error, rule skipped",
+                       dbg("%s:%d:%d: parse error, rule skipped",
                                  udev_rules_filename, lineno, temp - line);
                }
        }
@@ -318,7 +323,7 @@ int namedev_init_permissions(void)
                        dbg("cannot parse line '%s'", line);
                        continue;
                }
-               strncpy(dev.group, temp2, sizeof(dev.owner));
+               strncpy(dev.group, temp2, sizeof(dev.group));
 
                if (!temp) {
                        dbg("cannot parse line: %s", line);
@@ -339,6 +344,5 @@ int namedev_init_permissions(void)
 exit:
        fclose(fd);
        return retval;
-}      
-
+}