[udev] small cleanup udev-remove.c

[Kay Sievers <kay.sievers@vrfy.org>]

[-- Attachment #1: Type: text/plain, Size: 120 bytes --]


Here is a small cleanup. It replaces the malloc in udev-remove.c
with a struct, like we do in udev-add.c

thanks,
Kay


[-- Attachment #2: 01-struct-instead-of-malloc.diff --]
[-- Type: text/plain, Size: 1037 bytes --]

diff -Nru a/udev-remove.c b/udev-remove.c
--- a/udev-remove.c	Mon Dec 22 21:56:33 2003
+++ b/udev-remove.c	Mon Dec 22 21:56:33 2003
@@ -118,30 +118,26 @@
  */
 int udev_remove_device(char *path, char *subsystem)
 {
-	struct udevice *dev;
+	struct udevice dev;
 	char *temp;
 	int retval;
 
-	dev = malloc(sizeof(*dev));
-	if (dev == NULL)
-		return -ENOMEM;
-	memset(dev, 0, sizeof(*dev));
+	memset(&dev, 0, sizeof(dev));
 
-	retval = udevdb_get_dev(path, dev);
+	retval = udevdb_get_dev(path, &dev);
 	if (retval) {
 		dbg("'%s' not found in database, falling back on default name", path);
 		temp = strrchr(path, '/');
 		if (temp == NULL)
 			return -ENODEV;
-		strncpy(dev->name, &temp[1], sizeof(dev->name));
+		strncpy(dev.name, &temp[1], sizeof(dev.name));
 	}
 
-	dbg("name is '%s'", dev->name);
+	dbg("name is '%s'", dev.name);
 	udevdb_delete_dev(path);
 
-	sysbus_send_remove(dev->name, path);
+	sysbus_send_remove(dev.name, path);
 
-	retval = delete_node(dev);
-	free(dev);
+	retval = delete_node(&dev);
 	return retval;
 }