080 release

[elogind.git] / udev_rules_parse.c

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 6e978d74b4f17a3c26c7132b8ff117d102af4947..4fcd6db08ee362bec4233683df6143956baa1364 100644 (file)
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -28,10 +28,7 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "logging.h"
 #include "udev_rules.h"
 
 
@@ -413,12 +410,9 @@ static int add_to_rules(struct udev_rules *rules, char *line)
                                        rule->ignore_remove = 1;
                                }
                        }
-                       if (value[0] == '\0') {
-                               dbg("name empty device should be ignored");
-                               rule->name.operation = operation;
-                               rule->ignore_device = 1;
-                       } else
-                               add_rule_key(rule, &rule->name, operation, value);
+                       if (value[0] == '\0')
+                               dbg("name empty, not creation supressed");
+                       add_rule_key(rule, &rule->name, operation, value);
                        continue;
                }
 
@@ -541,7 +535,7 @@ static int parse_file(struct udev_rules *rules, const char *filename)
        int retval = 0;
 
        if (file_map(filename, &buf, &bufsize) != 0) {
-               err("can't open '%s' as rules file", filename);
+               err("can't open '%s' as rules file: %s", filename, strerror(errno));
                return -1;
        }
        dbg("reading '%s' as rules file", filename);
@@ -620,7 +614,7 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
                                else
                                        dbg("empty rules file '%s'", name_loop->name);
                        } else
-                               dbg("could not read '%s'", name_loop->name);
+                               err("could not read '%s': %s", name_loop->name, strerror(errno));
                        list_del(&name_loop->node);
                        free(name_loop);
                }
@@ -629,7 +623,7 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
        return retval;
 }
 
-void udev_rules_close(struct udev_rules *rules)
+void udev_rules_cleanup(struct udev_rules *rules)
 {
        if (rules->buf) {
                free(rules->buf);