add util_resolve_subsys_kernel()

[elogind.git] / udev / udev-event.c

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 59ae7c5378633195ad5c89641b7aab63156ab955..05bb022d1b46f7d82b5b8b0b8cadefab65662b23 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -34,10 +34,9 @@ struct udev_event *udev_event_new(struct udev_device *dev)
 {
        struct udev_event *event;
 
-       event = malloc(sizeof(struct udev_event));
+       event = calloc(1, sizeof(struct udev_event));
        if (event == NULL)
                return NULL;
-       memset(event, 0x00, sizeof(struct udev_event));
 
        event->dev = dev;
        event->udev = udev_device_get_udev(dev);
@@ -52,7 +51,7 @@ struct udev_event *udev_event_new(struct udev_device *dev)
 
 void udev_event_unref(struct udev_event *event)
 {
-       udev_list_cleanup(event->udev, &event->run_list);
+       udev_list_cleanup_entries(event->udev, &event->run_list);
        dbg(event->udev, "free event %p\n", event);
        free(event);
 }
@@ -141,7 +140,7 @@ int udev_event_apply_subsys_kernel(struct udev_event *udev_event, const char *st
        if (read_value) {
                const char *val;
 
-               val = udev_device_get_attr_value(dev, attr);
+               val = udev_device_get_sysattr_value(dev, attr);
                if (val != NULL)
                        util_strlcpy(result, val, maxsize);
                else
@@ -359,7 +358,7 @@ found:
                                if (value[0] == '\0' && event->dev_parent != NULL && event->dev_parent != event->dev) {
                                        const char *val;
 
-                                       val = udev_device_get_attr_value(event->dev_parent, attr);
+                                       val = udev_device_get_sysattr_value(event->dev_parent, attr);
                                        if (val != NULL)
                                                util_strlcpy(value, val, sizeof(value));
                                }
@@ -371,7 +370,7 @@ found:
 
                                        do {
                                                dbg(event->udev, "looking at '%s'\n", udev_device_get_syspath(dev_parent));
-                                               val = udev_device_get_attr_value(dev_parent, attr);
+                                               val = udev_device_get_sysattr_value(dev_parent, attr);
                                                if (val != NULL) {
                                                        util_strlcpy(value, val, sizeof(value));
                                                        break;
@@ -732,7 +731,7 @@ int udev_event_execute_run(struct udev_event *event)
                        util_strlcpy(program, cmd, sizeof(program));
                        udev_event_apply_format(event, program, sizeof(program));
                        envp = udev_device_get_properties_envp(event->dev);
-                       if (run_program(event->udev, program, envp, NULL, 0, NULL) != 0) {
+                       if (util_run_program(event->udev, program, envp, NULL, 0, NULL) != 0) {
                                if (!udev_list_entry_get_flag(list_entry))
                                        err = -1;
                        }