X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev_parse.c;h=b15be0e6fa7d5894c9c8bc0a3a19f07034300a06;hp=0712c3b44769350d268845b2bd858d5588407fa8;hb=87171e46cd9d179e0bb5549c4d74769a1be86e64;hpb=851cd18d81f7bce79947a014f19a6cb97141311d diff --git a/namedev_parse.c b/namedev_parse.c index 0712c3b44..b15be0e6f 100644 --- a/namedev_parse.c +++ b/namedev_parse.c @@ -36,6 +36,7 @@ #include #include "udev.h" +#include "logging.h" #include "namedev.h" static int add_config_dev(struct config_device *new_dev) @@ -119,7 +120,6 @@ void dump_perm_dev_list(void) dump_perm_dev(dev); } - int namedev_init_rules(void) { char line[255]; @@ -249,6 +249,7 @@ 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); @@ -322,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); @@ -343,6 +344,5 @@ int namedev_init_permissions(void) exit: fclose(fd); return retval; -} - +}