X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-monitor.c;h=751f19ae9235c582b9032f181eed28a63a5bbd1e;hb=98f10a9e2ada5d72a0c39b94a5b59d9da4f28753;hp=0dc8e10cbc68fa38d57ba43e2f30f544ab4fc3cc;hpb=38f27948cdafd8a4b90a6b4f1f54b89891983506;p=elogind.git

diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c
index 0dc8e10cb..751f19ae9 100644
--- a/udev/lib/libudev-monitor.c
+++ b/udev/lib/libudev-monitor.c
@@ -83,7 +83,7 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
 
 	udev_monitor->sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
 	if (udev_monitor->sock == -1) {
-		err(udev, "error getting socket: %s\n", strerror(errno));
+		err(udev, "error getting socket: %m\n");
 		free(udev_monitor);
 		return NULL;
 	}
@@ -106,7 +106,7 @@ struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev)
 
 	udev_monitor->sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
 	if (udev_monitor->sock == -1) {
-		err(udev, "error getting socket: %s\n", strerror(errno));
+		err(udev, "error getting socket: %m\n");
 		free(udev_monitor);
 		return NULL;
 	}
@@ -127,14 +127,14 @@ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
 	if (udev_monitor->snl.nl_family != 0) {
 		err = bind(udev_monitor->sock, (struct sockaddr *)&udev_monitor->snl, sizeof(struct sockaddr_nl));
 		if (err < 0) {
-			err(udev_monitor->udev, "bind failed: %s\n", strerror(errno));
+			err(udev_monitor->udev, "bind failed: %m\n");
 			return err;
 		}
 		info(udev_monitor->udev, "monitor %p listening on netlink\n", udev_monitor);
 	} else if (udev_monitor->sun.sun_family != 0) {
 		err = bind(udev_monitor->sock, (struct sockaddr *)&udev_monitor->sun, udev_monitor->addrlen);
 		if (err < 0) {
-			err(udev_monitor->udev, "bind failed: %s\n", strerror(errno));
+			err(udev_monitor->udev, "bind failed: %m\n");
 			return err;
 		}
 		/* enable receiving of the sender credentials */
@@ -284,7 +284,7 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
 		return NULL;
 	}
 
-	udev_device = device_init(udev_monitor->udev);
+	udev_device = device_new(udev_monitor->udev);
 	if (udev_device == NULL) {
 		return NULL;
 	}
@@ -308,7 +308,7 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
 		} else if (strncmp(key, "SUBSYSTEM=", 10) == 0) {
 			device_set_subsystem(udev_device, &key[10]);
 		} else if (strncmp(key, "DEVNAME=", 8) == 0) {
-			device_set_devname(udev_device, &key[8]);
+			device_set_devnode(udev_device, &key[8]);
 		} else if (strncmp(key, "DEVLINKS=", 9) == 0) {
 			char *slink = &key[9];
 			char *next = strchr(slink, ' ');
@@ -344,5 +344,6 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
 	}
 	device_set_devnum(udev_device, makedev(maj, min));
 
+	device_set_info_loaded(udev_device);
 	return udev_device;
 }