X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=libudev%2Flibudev-enumerate.c;h=186abb927e3dd189373269eaed4d36215a5cc397;hp=986c1fc3d5ace0f432908764c494f638ce4661c2;hb=79ef2e97d96ca0dbb9a06fa410f126ccfe638841;hpb=3bf768245b98479a14190e1e1d32ef5fae3ddf8a

diff --git a/libudev/libudev-enumerate.c b/libudev/libudev-enumerate.c
index 986c1fc3d..186abb927 100644
--- a/libudev/libudev-enumerate.c
+++ b/libudev/libudev-enumerate.c
@@ -251,7 +251,6 @@ struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enumerate *ude
 		unsigned int i;
 		unsigned int max;
 		struct syspath *prev = NULL, *move_later = NULL;
-		size_t move_later_prefix;
 
 		udev_list_cleanup_entries(udev_enumerate->udev, &udev_enumerate->devices_list);
 		qsort(udev_enumerate->devices, udev_enumerate->devices_cur, sizeof(struct syspath), syspath_cmp);
@@ -259,6 +258,7 @@ struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enumerate *ude
 		max = udev_enumerate->devices_cur;
 		for (i = 0; i < max; i++) {
 			struct syspath *entry = &udev_enumerate->devices[i];
+			size_t move_later_prefix = 0;
 
 			/* skip duplicated entries */
 			if (prev != NULL &&
@@ -559,7 +559,7 @@ static int scan_dir_and_add_devices(struct udev_enumerate *udev_enumerate,
 	if (subdir1 != NULL)
 		l = util_strpcpyl(&s, l, "/", subdir1, NULL);
 	if (subdir2 != NULL)
-		l = util_strpcpyl(&s, l, "/", subdir2, NULL);
+		util_strpcpyl(&s, l, "/", subdir2, NULL);
 	dir = opendir(path);
 	if (dir == NULL)
 		return -1;