X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=udev%2Fudev_db.c;h=34bdef375398093070cf60545224e5e5de1821da;hb=e598c5738c2dc85a3e93c3f68cd88e8eea51215b;hp=432aa6cbb825bafcc798a539b777be48aeab5f21;hpb=17fcfb5972977b6a3aedca6ad2aa8d1fbfbc761d;p=elogind.git

diff --git a/udev/udev_db.c b/udev/udev_db.c
index 432aa6cbb..34bdef375 100644
--- a/udev/udev_db.c
+++ b/udev/udev_db.c
@@ -88,7 +88,7 @@ int udev_db_get_devices_by_name(struct udev *udev, const char *name, struct list
 
 	dir = opendir(dirname);
 	if (dir == NULL) {
-		info(udev, "no index directory '%s': %s\n", dirname, strerror(errno));
+		info(udev, "no index directory '%s': %m\n", dirname);
 		rc = -1;
 		goto out;
 	}
@@ -147,7 +147,7 @@ int udev_db_add_device(struct udevice *udevice)
 		ret = symlink(udevice->name, filename);
 		udev_selinux_resetfscreatecon(udevice->udev);
 		if (ret != 0) {
-			err(udevice->udev, "unable to create db link '%s': %s\n", filename, strerror(errno));
+			err(udevice->udev, "unable to create db link '%s': %m\n", filename);
 			return -1;
 		}
 	} else {
@@ -156,7 +156,7 @@ int udev_db_add_device(struct udevice *udevice)
 
 		f = fopen(filename, "w");
 		if (f == NULL) {
-			err(udevice->udev, "unable to create db file '%s': %s\n", filename, strerror(errno));
+			err(udevice->udev, "unable to create db file '%s': %m\n", filename);
 			return -1;
 		}
 		dbg(udevice->udev, "storing data for device '%s' in '%s'\n", udevice->dev->devpath, filename);
@@ -203,7 +203,7 @@ int udev_db_get_device(struct udevice *udevice, const char *devpath)
 	devpath_to_db_path(udevice->udev, devpath, filename, sizeof(filename));
 
 	if (lstat(filename, &stats) != 0) {
-		info(udevice->udev, "no db file to read %s: %s\n", filename, strerror(errno));
+		info(udevice->udev, "no db file to read %s: %m\n", filename);
 		return -1;
 	}
 	if ((stats.st_mode & S_IFMT) == S_IFLNK) {
@@ -215,7 +215,7 @@ int udev_db_get_device(struct udevice *udevice, const char *devpath)
 		if (target_len > 0)
 			target[target_len] = '\0';
 		else {
-			info(udevice->udev, "error reading db link %s: %s\n", filename, strerror(errno));
+			info(udevice->udev, "error reading db link %s: %m\n", filename);
 			return -1;
 		}
 		dbg(udevice->udev, "db link points to '%s'\n", target);
@@ -224,7 +224,7 @@ int udev_db_get_device(struct udevice *udevice, const char *devpath)
 	}
 
 	if (file_map(filename, &buf, &bufsize) != 0) {
-		info(udevice->udev, "error reading db file %s: %s\n", filename, strerror(errno));
+		info(udevice->udev, "error reading db file %s: %m\n", filename);
 		return -1;
 	}
 
@@ -292,36 +292,3 @@ int udev_db_delete_device(struct udevice *udevice)
 
 	return 0;
 }
-
-int udev_db_get_all_entries(struct udev *udev, struct list_head *name_list)
-{
-	char dbpath[PATH_MAX];
-	DIR *dir;
-
-	util_strlcpy(dbpath, udev_get_dev_path(udev), sizeof(dbpath));
-	util_strlcat(dbpath, "/.udev/db", sizeof(dbpath));
-	dir = opendir(dbpath);
-	if (dir == NULL) {
-		info(udev, "no udev_db available '%s': %s\n", dbpath, strerror(errno));
-		return -1;
-	}
-
-	while (1) {
-		struct dirent *ent;
-		char device[UTIL_PATH_SIZE];
-
-		ent = readdir(dir);
-		if (ent == NULL || ent->d_name[0] == '\0')
-			break;
-		if (ent->d_name[0] == '.')
-			continue;
-
-		util_strlcpy(device, ent->d_name, sizeof(device));
-		util_path_decode(device);
-		name_list_add(udev, name_list, device, 1);
-		dbg(udev, "added '%s'\n", device);
-	}
-
-	closedir(dir);
-	return 0;
-}