X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fzdb%2Fzdb.c;h=a5ad7feb837239ac1e4c3ffc8b5b2f805d5465ff;hb=0e8d1b2d8b5f8515aada6b43e68483bcd96db85e;hp=1a458f6040bcbb3dee4f4930b9b4580ded2d2558;hpb=2598c0012dc33496539ce893a0af601c66cbb7e2;p=zfs.git

diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
index 1a458f6..a5ad7fe 100644
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@@ -55,7 +55,6 @@
 #include <sys/arc.h>
 #include <sys/ddt.h>
 #undef ZFS_MAXNAMELEN
-#undef verify
 #include <libzfs.h>
 
 #define	ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \
@@ -2888,7 +2887,7 @@ find_zpool(char **target, nvlist_t **configp, int dirc, char **dirv)
 	nvlist_t *match = NULL;
 	char *name = NULL;
 	char *sepp = NULL;
-	char sep;
+	char sep = 0;
 	int count = 0;
 	importargs_t args = { 0 };
 
@@ -3037,8 +3036,8 @@ main(int argc, char **argv)
 	}
 
 	kernel_init(FREAD);
-	g_zfs = libzfs_init();
-	ASSERT(g_zfs != NULL);
+	if ((g_zfs = libzfs_init()) == NULL)
+		return (1);
 
 	if (dump_all)
 		verbose = MAX(verbose, 1);