X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-util.c;h=55bac9a476c18d6273c90daf014a2ac9be6a69bc;hb=9925ab0451b307b5766b12134bdc178e4c89f297;hp=aa544fea2291da4be0c20642f70fee3c3e89c717;hpb=4c9dff47f696b1e6c89cc6e0a7ba683067927821;p=elogind.git

diff --git a/udev/lib/libudev-util.c b/udev/lib/libudev-util.c
index aa544fea2..55bac9a47 100644
--- a/udev/lib/libudev-util.c
+++ b/udev/lib/libudev-util.c
@@ -64,17 +64,12 @@ ssize_t util_get_sys_driver(struct udev *udev, const char *syspath, char *driver
 
 int util_resolve_sys_link(struct udev *udev, char *syspath, size_t size)
 {
-	struct stat statbuf;
 	char link_target[UTIL_PATH_SIZE];
 
 	int len;
 	int i;
 	int back;
 
-	if (lstat(syspath, &statbuf) < 0)
-		return -1;
-	if (!S_ISLNK(statbuf.st_mode))
-		return -1;
 	len = readlink(syspath, link_target, sizeof(link_target));
 	if (len <= 0)
 		return -1;
@@ -97,61 +92,6 @@ int util_resolve_sys_link(struct udev *udev, char *syspath, size_t size)
 	return 0;
 }
 
-struct util_name_entry *util_name_list_add(struct udev *udev, struct list_head *name_list,
-					   const char *name, const char *value, int sort)
-{
-	struct util_name_entry *name_loop;
-	struct util_name_entry *name_new;
-
-	/* avoid duplicate entries */
-	list_for_each_entry(name_loop, name_list, node) {
-		if (strcmp(name_loop->name, name) == 0) {
-			dbg(udev, "'%s' is already in the list\n", name);
-			return name_loop;
-		}
-	}
-
-	if (sort) {
-		list_for_each_entry(name_loop, name_list, node) {
-			if (strcmp(name_loop->name, name) > 0)
-				break;
-		}
-	}
-
-	name_new = malloc(sizeof(struct util_name_entry));
-	if (name_new == NULL)
-		return NULL;
-	memset(name_new, 0x00, sizeof(struct util_name_entry));
-	name_new->name = strdup(name);
-	if (name_new->name == NULL) {
-		free(name_new);
-		return NULL;
-	}
-	if (value != NULL) {
-		name_new->value = strdup(value);
-		if (name_new->value == NULL) {
-			free(name_new);
-			return NULL;
-		}
-	}
-	dbg(udev, "adding '%s=%s'\n", name_new->name, name_new->value);
-	list_add_tail(&name_new->node, &name_loop->node);
-	return name_new;
-}
-
-void util_name_list_cleanup(struct udev *udev, struct list_head *name_list)
-{
-	struct util_name_entry *name_loop;
-	struct util_name_entry *name_tmp;
-
-	list_for_each_entry_safe(name_loop, name_tmp, name_list, node) {
-		list_del(&name_loop->node);
-		free(name_loop->name);
-		free(name_loop->value);
-		free(name_loop);
-	}
-}
-
 int util_log_priority(const char *priority)
 {
 	char *endptr;