summaryrefslogtreecommitdiff
path: root/lib/libzfs
diff options
context:
space:
mode:
authorJorgen Lundman <lundman@lundman.net>2012-11-29 05:56:07 +0000
committerBrian Behlendorf <behlendorf1@llnl.gov>2012-12-04 19:15:25 +0000
commit53c2ec1d1b3ffdc90c1c6516558e6b4da77c2446 (patch)
treefc318ed70d3e7b85e3d0585f581bc5e84f15b4e4 /lib/libzfs
parent2957f38d78d376431ab18d2f576099d682d7a711 (diff)
Diffstat (limited to 'lib/libzfs')
-rw-r--r--lib/libzfs/libzfs_util.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
index 16affd1cec21..42700877a6c4 100644
--- a/lib/libzfs/libzfs_util.c
+++ b/lib/libzfs/libzfs_util.c
@@ -1297,8 +1297,9 @@ str2shift(libzfs_handle_t *hdl, const char *buf)
break;
}
if (i == strlen(ends)) {
- zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
- "invalid numeric suffix '%s'"), buf);
+ if (hdl)
+ zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+ "invalid numeric suffix '%s'"), buf);
return (-1);
}
@@ -1313,8 +1314,9 @@ str2shift(libzfs_handle_t *hdl, const char *buf)
buf[3] == '\0'))))
return (10*i);
- zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
- "invalid numeric suffix '%s'"), buf);
+ if (hdl)
+ zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+ "invalid numeric suffix '%s'"), buf);
return (-1);
}