cstyle: Resolve C style issues

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

diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c
index d1fa98e67854707e43580b1f4f2a82860469ae3b..b5a079c0eb143552d9d96728326e64986f590775 100644 (file)
--- a/lib/libzfs/libzfs_import.c
+++ b/lib/libzfs/libzfs_import.c
@@ -168,7 +168,7 @@ fix_paths(nvlist_t *nv, name_entry_t *names)
                        }
 
                        if ((strlen(path) == strlen(ne->ne_name)) &&
-                           !strncmp(path, ne->ne_name, strlen(path))) {
+                           strncmp(path, ne->ne_name, strlen(path)) == 0) {
                                best = ne;
                                break;
                        }
@@ -997,7 +997,7 @@ err_blkid3:
 err_blkid2:
        blkid_put_cache(cache);
 err_blkid1:
-       return err;
+       return (err);
 }
 #endif /* HAVE_LIBBLKID */
 
@@ -1125,14 +1125,14 @@ zpool_find_import_impl(libzfs_handle_t *hdl, importargs_t *iarg)
                         *            when access from Xen dom0.
                         */
                        if ((strncmp(name, "watchdog", 8) == 0) ||
-                           (strncmp(name, "fuse", 4) == 0)     ||
-                           (strncmp(name, "ppp", 3) == 0)      ||
-                           (strncmp(name, "tty", 3) == 0)      ||
-                           (strncmp(name, "vcs", 3) == 0)      ||
-                           (strncmp(name, "parport", 7) == 0)  ||
-                           (strncmp(name, "lp", 2) == 0)       ||
-                           (strncmp(name, "fd", 2) == 0)       ||
-                           (strncmp(name, "hpet", 4) == 0)     ||
+                           (strncmp(name, "fuse", 4) == 0) ||
+                           (strncmp(name, "ppp", 3) == 0) ||
+                           (strncmp(name, "tty", 3) == 0) ||
+                           (strncmp(name, "vcs", 3) == 0) ||
+                           (strncmp(name, "parport", 7) == 0) ||
+                           (strncmp(name, "lp", 2) == 0) ||
+                           (strncmp(name, "fd", 2) == 0) ||
+                           (strncmp(name, "hpet", 4) == 0) ||
                            (strncmp(name, "core", 4) == 0))
                                continue;
 
@@ -1165,7 +1165,7 @@ zpool_find_import_impl(libzfs_handle_t *hdl, importargs_t *iarg)
                                    ZPOOL_CONFIG_POOL_NAME, &pname) == 0)) {
 
                                        if (strcmp(iarg->poolname, pname))
-                                              matched = B_FALSE;
+                                               matched = B_FALSE;
 
                                } else if (iarg->guid != 0) {
                                        uint64_t this_guid;