X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Flibudev-monitor.c;h=92617e8888b3a12d583c2d920bc3824689b69eaa;hp=c8f07eae8f88aac3d3f43de813872f4ed3e20e6d;hb=11d543c1ee886ef30c3ef66d7176149d0b126fa5;hpb=b98fd8400542472bd0989a4f03358d403fb71f35 diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c index c8f07eae8..92617e888 100644 --- a/udev/lib/libudev-monitor.c +++ b/udev/lib/libudev-monitor.c @@ -257,25 +257,25 @@ struct udev_device *udev_monitor_get_device(struct udev_monitor *udev_monitor) bufpos += keylen + 1; if (strncmp(key, "DEVPATH=", 8) == 0) { - udev_device->devpath = strdup(&key[8]); + device_set_devpath(udev_device, &key[8]); } else if (strncmp(key, "SUBSYSTEM=", 10) == 0) { - udev_device->subsystem = strdup(&key[10]); + device_set_subsystem(udev_device, &key[10]); } else if (strncmp(key, "DEVNAME=", 8) == 0) { - udev_device->devname = strdup(&key[8]); + device_set_devname(udev_device, &key[8]); } else if (strncmp(key, "DEVLINKS=", 9) == 0) { char *slink = &key[9]; char *next = strchr(slink, ' '); while (next != NULL) { next[0] = '\0'; - name_list_add(&udev_device->link_list, slink, 0); + device_add_devlink(udev_device, slink); slink = &next[1]; next = strchr(slink, ' '); } if (slink[0] != '\0') - name_list_add(&udev_device->link_list, slink, 0); + device_add_devlink(udev_device, slink); } - name_list_add(&udev_device->env_list, key, 0); + device_add_property(udev_device, key); } return udev_device;