New upstream version 0.7.6

[mirror_zfs-debian.git] / lib / libzfs / libzfs_import.c

diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c
index f371d925bc59c4223089260bcb482fdc0700035b..39c0672938eb72cfb0e038093d09b12dc456d239 100644 (file)
--- a/lib/libzfs/libzfs_import.c
+++ b/lib/libzfs/libzfs_import.c
@@ -309,7 +309,7 @@ zpool_label_disk_wait(char *path, int timeout_ms)
                dev = udev_device_new_from_subsystem_sysname(udev,
                    "block", sysname);
                if ((dev != NULL) && udev_device_is_ready(dev)) {
-                       struct udev_list_entry *links, *link;
+                       struct udev_list_entry *links, *link = NULL;
 
                        ret = 0;
                        links = udev_device_get_devlinks_list_entry(dev);
@@ -2297,7 +2297,7 @@ find_aux(zpool_handle_t *zhp, void *data)
 
 /*
  * Determines if the pool is in use.  If so, it returns true and the state of
- * the pool as well as the name of the pool.  Both strings are allocated and
+ * the pool as well as the name of the pool.  Name string is allocated and
  * must be freed by the caller.
  */
 int