diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-10-08 21:54:39 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-10-08 21:54:39 +0200 |
| commit | 8a1733871ffe9bfc47958e9056fd53ce216b1802 (patch) | |
| tree | ad1f1aa33f2fcd15e1f194174827119469778db4 /src/libudev | |
| parent | 04eaa66837260d86c27c9121b626ad6219690384 (diff) | |
udev: remove SYMLINK "unique" option
Diffstat (limited to 'src/libudev')
| -rw-r--r-- | src/libudev/libudev-device.c | 10 | ||||
| -rw-r--r-- | src/libudev/libudev-private.h | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c index 972ace5d39..08476e6596 100644 --- a/src/libudev/libudev-device.c +++ b/src/libudev/libudev-device.c @@ -378,12 +378,12 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device, next = strchr(slink, ' '); while (next != NULL) { next[0] = '\0'; - udev_device_add_devlink(udev_device, slink, 0); + udev_device_add_devlink(udev_device, slink); slink = &next[1]; next = strchr(slink, ' '); } if (slink[0] != '\0') - udev_device_add_devlink(udev_device, slink, 0); + udev_device_add_devlink(udev_device, slink); } else if (startswith(property, "TAGS=")) { char tags[UTIL_PATH_SIZE]; char *next; @@ -503,7 +503,7 @@ int udev_device_read_db(struct udev_device *udev_device, const char *dbfile) switch(line[0]) { case 'S': util_strscpyl(filename, sizeof(filename), "/dev/", val, NULL); - udev_device_add_devlink(udev_device, filename, 0); + udev_device_add_devlink(udev_device, filename); break; case 'L': udev_device_set_devlink_priority(udev_device, atoi(val)); @@ -1505,7 +1505,7 @@ int udev_device_set_devnode(struct udev_device *udev_device, const char *devnode return 0; } -int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink, int unique) +int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink) { struct udev_list_entry *list_entry; @@ -1513,8 +1513,6 @@ int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink list_entry = udev_list_entry_add(&udev_device->devlinks_list, devlink, NULL); if (list_entry == NULL) return -ENOMEM; - if (unique) - udev_list_entry_set_num(list_entry, true); return 0; } diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h index 30c70e6428..2add8b3577 100644 --- a/src/libudev/libudev-private.h +++ b/src/libudev/libudev-private.h @@ -50,7 +50,7 @@ struct udev_device *udev_device_new(struct udev *udev); mode_t udev_device_get_devnode_mode(struct udev_device *udev_device); int udev_device_set_syspath(struct udev_device *udev_device, const char *syspath); int udev_device_set_devnode(struct udev_device *udev_device, const char *devnode); -int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink, int unique); +int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink); void udev_device_cleanup_devlinks_list(struct udev_device *udev_device); struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value); void udev_device_add_property_from_string_parse(struct udev_device *udev_device, const char *property); |