diff options
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_util.c')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_util.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_util.c b/usr/src/lib/libzfs/common/libzfs_util.c index b09834e57d..f2369efb5d 100644 --- a/usr/src/lib/libzfs/common/libzfs_util.c +++ b/usr/src/lib/libzfs/common/libzfs_util.c @@ -151,10 +151,9 @@ libzfs_error_description(libzfs_handle_t *hdl) case EZFS_UNKNOWN: return (dgettext(TEXT_DOMAIN, "unknown error")); default: - abort(); + assert(hdl->libzfs_error == 0); + return (dgettext(TEXT_DOMAIN, "no error")); } - - /* NOTREACHED */ } /*PRINTFLIKE2*/ @@ -437,7 +436,7 @@ libzfs_init(void) return (NULL); } - if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR)) == NULL) { + if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR)) < 0) { free(hdl); return (NULL); } |