X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-add.c;h=a71d435e327db824616935020e878faed987336f;hp=634a515c96db8e00665ffc86495e8a076e974089;hb=befd83cc4ee33f6a557b531d4a1be13472ec67cd;hpb=10950dfe84c064da2fde8d812c0c90cfba836d16

diff --git a/udev-add.c b/udev-add.c
index 634a515c9..a71d435e3 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -60,12 +60,12 @@ static int get_major_minor(struct sysfs_class_device *class_dev, struct udevice
 	if (dev == NULL)
 		goto exit;
 
-	dbg("dev = %s", dev);
+	dbg("dev='%s'", dev);
 
 	if (sscanf(dev, "%u:%u", &udev->major, &udev->minor) != 2)
 		goto exit;
 
-	dbg("found major = %d, minor = %d", udev->major, udev->minor);
+	dbg("found major=%d, minor=%d", udev->major, udev->minor);
 
 	retval = 0;
 exit:
@@ -129,7 +129,7 @@ static int create_node(struct udevice *dev)
 					    path, strerror(errno));
 					return retval;
 				}
-				dbg("created %s", path);
+				dbg("created '%s'", path);
 			}
 			*pos = '/';
 		}
@@ -155,7 +155,7 @@ static int create_node(struct udevice *dev)
 		else {
 			struct passwd *pw = getpwnam(dev->owner);
 			if (!pw)
-				dbg("user unknown: %s", dev->owner);
+				dbg("user unknown '%s'", dev->owner);
 			else
 				uid = pw->pw_uid;
 		}
@@ -169,7 +169,7 @@ static int create_node(struct udevice *dev)
 		else {
 			struct group *gr = getgrnam(dev->group);
 			if (!gr)
-				dbg("group unknown: %s", dev->group);
+				dbg("group unknown '%s'", dev->group);
 			else
 				gid = gr->gr_gid;
 		}
@@ -194,7 +194,7 @@ static struct sysfs_class_device *get_class_dev(char *device_name)
 	strcpy(dev_path, sysfs_path);
 	strcat(dev_path, device_name);
 
-	dbg("looking at %s", dev_path);
+	dbg("looking at '%s'", dev_path);
 
 	/* open up the sysfs class device for this thing... */
 	class_dev = sysfs_open_class_device(dev_path);
@@ -202,7 +202,7 @@ static struct sysfs_class_device *get_class_dev(char *device_name)
 		dbg ("sysfs_open_class_device failed");
 		goto exit;
 	}
-	dbg("class_dev->name = %s", class_dev->name);
+	dbg("class_dev->name='%s'", class_dev->name);
 
 exit:
 	return class_dev;
@@ -225,13 +225,12 @@ static int sleep_for_dev(char *path)
 	while (loop--) {
 		struct stat buf;
 
-		dbg("looking for %s", filename);
+		dbg("looking for '%s'", filename);
 		retval = stat(filename, &buf);
 		if (!retval)
 			goto exit;
 
-		/* sleep for a second or two to give the kernel a chance to
-		 * create the dev file */
+		/* sleep to give the kernel a chance to create the dev file */
 		sleep(1);
 	}
 	retval = -ENODEV;
@@ -245,6 +244,8 @@ int udev_add_device(char *path, char *subsystem)
 	struct udevice dev;
 	int retval = -EINVAL;
 
+	memset(&dev, 0x00, sizeof(dev));
+
 	/* for now, the block layer is the only place where block devices are */
 	if (strcmp(subsystem, "block") == 0)
 		dev.type = 'b';
@@ -274,7 +275,7 @@ int udev_add_device(char *path, char *subsystem)
 		dbg("udevdb_add_dev failed, but we are going to try to create the node anyway. "
 		    "But remove might not work properly for this device.");
 
-	dbg("name = %s", dev.name);
+	dbg("name='%s'", dev.name);
 	retval = create_node(&dev);
 
 exit:
@@ -283,4 +284,3 @@ exit:
 
 	return retval;
 }
-