diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2006-12-08 09:48:53 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2006-12-08 09:48:53 +0100 |
| commit | 9dd0c2573b1e3a6f18356e4db6cee5e5329ecb67 (patch) | |
| tree | 70dcbc629bdc600aa48e8dab838d2a9f29cd697c /udev_rules_parse.c | |
| parent | 768cd81b7db0737240c759f59edd6d3399e1707a (diff) | |
rename config "filename" to "dir"
Diffstat (limited to 'udev_rules_parse.c')
| -rw-r--r-- | udev_rules_parse.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/udev_rules_parse.c b/udev_rules_parse.c index 535b59590a..3f7e43f839 100644 --- a/udev_rules_parse.c +++ b/udev_rules_parse.c @@ -627,7 +627,7 @@ static int parse_file(struct udev_rules *rules, const char *filename) err("can't open '%s' as rules file: %s", filename, strerror(errno)); return -1; } - dbg("reading '%s' as rules file", filename); + info("reading '%s' as rules file", filename); /* loop through the whole file */ cur = 0; @@ -683,18 +683,18 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names) rules->resolve_names = resolve_names; /* parse rules file or all matching files in directory */ - if (stat(udev_rules_filename, &stats) != 0) + if (stat(udev_rules_dir, &stats) != 0) return -1; if ((stats.st_mode & S_IFMT) != S_IFDIR) { - dbg("parse single rules file '%s'", udev_rules_filename); - retval = parse_file(rules, udev_rules_filename); + dbg("parse single rules file '%s'", udev_rules_dir); + retval = parse_file(rules, udev_rules_dir); } else { struct name_entry *name_loop, *name_tmp; LIST_HEAD(name_list); - dbg("parse rules directory '%s'", udev_rules_filename); - retval = add_matching_files(&name_list, udev_rules_filename, RULEFILE_SUFFIX); + dbg("parse rules directory '%s'", udev_rules_dir); + retval = add_matching_files(&name_list, udev_rules_dir, RULESFILE_SUFFIX); list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) { if (stat(name_loop->name, &stats) == 0) { |