diff options
| author | eschrock <none@none> | 2006-08-04 13:20:32 -0700 |
|---|---|---|
| committer | eschrock <none@none> | 2006-08-04 13:20:32 -0700 |
| commit | c08432ebe688ed6410b302771a9afd8e23e2a7cc (patch) | |
| tree | 4b44b9ddb083082f4d6e3fc7196a50b1460420f7 /usr/src/lib/libzfs/common/libzfs_util.c | |
| parent | 23a276b1252962c987a613be470dde26561247b8 (diff) | |
| download | illumos-joyent-c08432ebe688ed6410b302771a9afd8e23e2a7cc.tar.gz | |
6455228 zpool_mount_datasets() should take an additional flag
6455234 libzfs_error_description() should not abort if no error
6456642 Bug in libzfs_init()
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); } |