X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-watch.c;h=f51a10dcabdd410589f3cdcdf1fd4386044d6214;hb=95ce1875d79162324a5eb67f6a0ffbbdd5d29921;hp=9e1b8d8553e3650f39519df602153072281a04ce;hpb=4281da1fa6fda10c15bee984825fc607a8385004;p=elogind.git

diff --git a/udev/udev-watch.c b/udev/udev-watch.c
index 9e1b8d855..f51a10dca 100644
--- a/udev/udev-watch.c
+++ b/udev/udev-watch.c
@@ -72,8 +72,6 @@ void udev_watch_restore(struct udev *udev)
 			size_t l;
 			ssize_t len;
 			struct udev_device *dev;
-			int maj, min;
-			char type;
 
 			if (ent->d_name[0] == '.')
 				continue;
@@ -85,9 +83,7 @@ void udev_watch_restore(struct udev *udev)
 				goto unlink;
 			s[len] = '\0';
 
-			if (sscanf(s, "%c%i:%i", &type, &maj, &min) != 3)
-				goto unlink;
-			dev = udev_device_new_from_devnum(udev, type, makedev(maj, min));
+			dev = udev_device_new_from_id_filename(udev, s);
 			if (dev == NULL)
 				goto unlink;
 
@@ -158,9 +154,6 @@ struct udev_device *udev_watch_lookup(struct udev *udev, int wd)
 	char *s;
 	size_t l;
 	ssize_t len;
-	int maj, min;
-	char type;
-	dev_t devnum;
 
 	if (inotify_fd < 0 || wd < 0)
 		return NULL;
@@ -173,8 +166,5 @@ struct udev_device *udev_watch_lookup(struct udev *udev, int wd)
 		return NULL;
 	s[len] = '\0';
 
-	if (sscanf(s, "%c%i:%i", &type, &maj, &min) != 3)
-		return NULL;
-	devnum = makedev(maj, min);
-	return udev_device_new_from_devnum(udev, type, devnum);
+	return udev_device_new_from_id_filename(udev, s);
 }