X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-remove.c;h=9db63ed93e536111266fcf694d3cdd00aff4e5da;hp=6d7e2ad22a9c6d8af3becb485709a05e8d1ab202;hb=724257d97b452dd563ea1a3a5cdc53b18e8dcb34;hpb=a56ef382869bb76ade6d26cd7e8adc983ca3f89e

diff --git a/udev-remove.c b/udev-remove.c
index 6d7e2ad22..9db63ed93 100644
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -31,6 +31,7 @@
 #include "udev.h"
 #include "udev_version.h"
 #include "udev_dbus.h"
+#include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
@@ -73,7 +74,7 @@ static int delete_node(struct udevice *dev)
 	strncpy(filename, udev_root, sizeof(filename));
 	strncat(filename, dev->name, sizeof(filename));
 
-	dbg("unlinking node '%s'", filename);
+	info("removing device node '%s'", filename);
 	retval = unlink(filename);
 	if (retval) {
 		dbg("unlink(%s) failed with error '%s'",
@@ -118,30 +119,26 @@ static int delete_node(struct udevice *dev)
  */
 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;
 }