diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2008-09-10 17:08:24 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2008-09-10 17:08:24 +0200 |
| commit | 7a01f11afbcc0a639cc3676572a41445f7edb65d (patch) | |
| tree | 2081d9de1db9fdc163a712dc24bd633989408208 /udev/lib/libudev-device.c | |
| parent | b21b95d7222f32940c8e9462c361e45041c9f7d6 (diff) | |
libudev: get rid of udev_utils.c
Diffstat (limited to 'udev/lib/libudev-device.c')
| -rw-r--r-- | udev/lib/libudev-device.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c index 416cae450d..78b644b01d 100644 --- a/udev/lib/libudev-device.c +++ b/udev/lib/libudev-device.c @@ -61,7 +61,7 @@ static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *f strlcpy(filename, udev_get_dev_path(udev), len); start = strlcat(filename, "/.udev/db/", len); strlcat(filename, devpath, len); - return path_encode(&filename[start], len - start); + return util_path_encode(&filename[start], len - start); } static int device_read_db(struct udev_device *udev_device) @@ -264,8 +264,8 @@ void udev_device_unref(struct udev_device *udev_device) free(udev_device->syspath); free(udev_device->devname); free(udev_device->subsystem); - name_list_cleanup(udev_device->udev, &udev_device->link_list); - name_list_cleanup(udev_device->udev, &udev_device->env_list); + util_name_list_cleanup(udev_device->udev, &udev_device->link_list); + util_name_list_cleanup(udev_device->udev, &udev_device->env_list); free(udev_device->action); free(udev_device->driver); free(udev_device->devpath_old); @@ -477,14 +477,14 @@ int device_set_devname(struct udev_device *udev_device, const char *devname) int device_add_devlink(struct udev_device *udev_device, const char *devlink) { - if (name_list_add(udev_device->udev, &udev_device->link_list, devlink, 0) == NULL) + if (util_name_list_add(udev_device->udev, &udev_device->link_list, devlink, 0) == NULL) return -ENOMEM; return 0; } int device_add_property(struct udev_device *udev_device, const char *property) { - if (name_list_add(udev_device->udev, &udev_device->env_list, property, 0) == NULL) + if (util_name_list_add(udev_device->udev, &udev_device->env_list, property, 0) == NULL) return -ENOMEM; return 0; } |