From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kay Sievers Date: Mon, 22 Dec 2003 22:32:11 +0000 Subject: [udev] small cleanup udev-remove.c MIME-Version: 1 Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" Message-Id: List-Id: To: linux-hotplug@vger.kernel.org --T4sUOijqQbZv57TR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --T4sUOijqQbZv57TR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="01-struct-instead-of-malloc.diff" 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; } --T4sUOijqQbZv57TR-- ------------------------------------------------------- This SF.net email is sponsored by: IBM Linux Tutorials. Become an expert in LINUX or just sharpen your skills. Sign up for IBM's Free Linux Tutorials. Learn everything from the bash shell to sys admin. Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click _______________________________________________ Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net Linux-hotplug-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel