X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=6ccb8d4ba42917aed8669cf4e78bff03cc500a6e;hp=7db36a7de5f3777428951f9312c0c78de0b62b8a;hb=6bb1301835dbd6ff54e1becb5b684fedb0e4caaf;hpb=310de3ab00b77b09a897b93ed0272b82ebc4f73b

diff --git a/discover/udev.c b/discover/udev.c
index 7db36a7..6ccb8d4 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -41,11 +41,15 @@ static int udev_destructor(void *p)
 {
 	struct pb_udev *udev = p;
 
-	udev_monitor_unref(udev->monitor);
-	udev->monitor = NULL;
+	if (udev->monitor) {
+		udev_monitor_unref(udev->monitor);
+		udev->monitor = NULL;
+	}
 
-	udev_unref(udev->udev);
-	udev->udev = NULL;
+	if (udev->udev) {
+		udev_unref(udev->udev);
+		udev->udev = NULL;
+	}
 
 	return 0;
 }
@@ -263,23 +267,18 @@ static int udev_handle_dev_change(struct pb_udev *udev, struct udev_device *dev)
 static int udev_handle_dev_action(struct udev_device *dev, const char *action)
 {
 	struct pb_udev *udev = udev_get_userdata(udev_device_get_udev(dev));
+	struct udev_list_entry *list;
+	const char *name;
 
-#ifdef DEBUG
-	{
-		struct udev_list_entry *list;
-		const char *name;
-
-		list = udev_device_get_properties_list_entry(dev);
-		name = udev_device_get_sysname(dev);
+	list = udev_device_get_properties_list_entry(dev);
+	name = udev_device_get_sysname(dev);
 
-		pb_debug("%s: action %s, device %s\n", __func__, action, name);
-		pb_debug("%s properties:\n", __func__);
+	pb_debug("udev: action %s, device %s\n", action, name);
+	pb_debug("udev: properties:\n");
 
-		for (; list; list = udev_list_entry_get_next(list))
-			pb_log("\t%-20s: %s\n", udev_list_entry_get_name(list),
-					udev_list_entry_get_value(list));
-	} while (0);
-#endif
+	for (; list; list = udev_list_entry_get_next(list))
+		pb_debug("\t%-20s: %s\n", udev_list_entry_get_name(list),
+				udev_list_entry_get_value(list));
 
 	if (!strcmp(action, "add"))
 		return udev_handle_dev_add(udev, dev);
@@ -322,11 +321,6 @@ static int udev_enumerate(struct udev *udev)
 
 	list = udev_enumerate_get_list_entry(enumerate);
 
-	if (!list) {
-		pb_log("udev_enumerate_get_list_entry failed\n");
-		goto fail;
-	}
-
 	udev_list_entry_foreach(entry, list) {
 		const char *syspath;
 		struct udev_device *dev;
@@ -431,7 +425,7 @@ struct pb_udev *udev_init(struct device_handler *handler,
 	struct pb_udev *udev;
 	int result;
 
-	udev = talloc(handler, struct pb_udev);
+	udev = talloc_zero(handler, struct pb_udev);
 	talloc_set_destructor(udev, udev_destructor);
 	udev->handler = handler;
 
@@ -439,7 +433,7 @@ struct pb_udev *udev_init(struct device_handler *handler,
 
 	if (!udev->udev) {
 		pb_log("udev_new failed\n");
-		goto fail_new;
+		goto fail;
 	}
 
 	udev_set_userdata(udev->udev, udev);
@@ -448,11 +442,11 @@ struct pb_udev *udev_init(struct device_handler *handler,
 
 	result = udev_setup_monitor(udev->udev, &udev->monitor);
 	if (result)
-		goto fail_monitor;
+		goto fail;
 
 	result = udev_enumerate(udev->udev);
 	if (result)
-		goto fail_enumerate;
+		goto fail;
 
 	waiter_register_io(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN,
 		udev_process, udev->monitor);
@@ -461,11 +455,7 @@ struct pb_udev *udev_init(struct device_handler *handler,
 
 	return udev;
 
-fail_monitor:
-	udev_monitor_unref(udev->monitor);
-fail_enumerate:
-	udev_unref(udev->udev);
-fail_new:
+fail:
 	talloc_free(udev);
 	return NULL;
 }