diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-01-26 14:12:45 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-01-26 14:12:45 +0100 |
| commit | fa639f3ae770ffccdd9f97430b0883d01bc821ce (patch) | |
| tree | 2226a563d42b6d6d1e107ac879bc9b6956922300 | |
| parent | 243d182543c7edc3980e1ae41712bb0b96df46bd (diff) | |
udev: event - introduce and use internal udev_device_shallow_clone()
| -rw-r--r-- | src/libudev/libudev-device.c | 21 | ||||
| -rw-r--r-- | src/libudev/libudev-private.h | 1 | ||||
| -rw-r--r-- | src/udev/udev-event.c | 5 |
3 files changed, 23 insertions, 4 deletions
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c index 193c706d89..08331a2329 100644 --- a/src/libudev/libudev-device.c +++ b/src/libudev/libudev-device.c @@ -1944,3 +1944,24 @@ int udev_device_rename(struct udev_device *udev_device, const char *name) return 0; } + +struct udev_device *udev_device_shallow_clone(struct udev_device *old_device) +{ + struct udev_device *device; + + if (old_device == NULL) + return NULL; + + device = udev_device_new(old_device->udev); + if (!device) { + errno = ENOMEM; + + return NULL; + } + + udev_device_set_syspath(device, udev_device_get_syspath(old_device)); + udev_device_set_subsystem(device, udev_device_get_subsystem(old_device)); + udev_device_set_devnum(device, udev_device_get_devnum(old_device)); + + return device; +} diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h index 017b6cc63b..31f150c764 100644 --- a/src/libudev/libudev-private.h +++ b/src/libudev/libudev-private.h @@ -38,6 +38,7 @@ int udev_get_rules_path(struct udev *udev, char **path[], usec_t *ts_usec[]); /* libudev-device.c */ struct udev_device *udev_device_new(struct udev *udev); +struct udev_device *udev_device_shallow_clone(struct udev_device *old_device); mode_t udev_device_get_devnode_mode(struct udev_device *udev_device); uid_t udev_device_get_devnode_uid(struct udev_device *udev_device); gid_t udev_device_get_devnode_gid(struct udev_device *udev_device); diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index e5b2259fda..d6c9cfc60d 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -809,11 +809,8 @@ void udev_event_execute_rules(struct udev_event *event, if (major(udev_device_get_devnum(dev)) != 0) udev_node_remove(dev); } else { - event->dev_db = udev_device_new(event->udev); + event->dev_db = udev_device_shallow_clone(dev); if (event->dev_db != NULL) { - udev_device_set_syspath(event->dev_db, udev_device_get_syspath(dev)); - udev_device_set_subsystem(event->dev_db, udev_device_get_subsystem(dev)); - udev_device_set_devnum(event->dev_db, udev_device_get_devnum(dev)); udev_device_read_db(event->dev_db, NULL); udev_device_set_info_loaded(event->dev_db); |