Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
This commit is contained in:
commit
cad9fa40e1
|
@ -2228,7 +2228,8 @@ zfs_prop_get_userquota(zfs_handle_t *zhp, const char *propname,
|
||||||
return (err);
|
return (err);
|
||||||
|
|
||||||
if (literal) {
|
if (literal) {
|
||||||
(void) snprintf(propbuf, proplen, "%llu", propvalue);
|
(void) snprintf(propbuf, proplen, "%llu",
|
||||||
|
(u_longlong_t)propvalue);
|
||||||
} else if (propvalue == 0 &&
|
} else if (propvalue == 0 &&
|
||||||
(type == ZFS_PROP_USERQUOTA || type == ZFS_PROP_GROUPQUOTA)) {
|
(type == ZFS_PROP_USERQUOTA || type == ZFS_PROP_GROUPQUOTA)) {
|
||||||
(void) strlcpy(propbuf, "none", proplen);
|
(void) strlcpy(propbuf, "none", proplen);
|
||||||
|
|
Loading…
Reference in New Issue