Merge branch 'gcc-cast' into refs/top-bases/gcc-branch

This commit is contained in:
Brian Behlendorf 2009-07-07 13:50:29 -07:00
commit cad9fa40e1
1 changed files with 2 additions and 1 deletions

View File

@ -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);