Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
This commit is contained in:
commit
e56aa929e8
|
@ -1495,7 +1495,7 @@ zfs_do_upgrade(int argc, char **argv)
|
||||||
boolean_t showversions = B_FALSE;
|
boolean_t showversions = B_FALSE;
|
||||||
int ret;
|
int ret;
|
||||||
upgrade_cbdata_t cb = { 0 };
|
upgrade_cbdata_t cb = { 0 };
|
||||||
char c;
|
signed char c;
|
||||||
int flags = ZFS_ITER_ARGS_CAN_BE_PATHS;
|
int flags = ZFS_ITER_ARGS_CAN_BE_PATHS;
|
||||||
|
|
||||||
/* check options */
|
/* check options */
|
||||||
|
@ -2251,7 +2251,7 @@ zfs_do_snapshot(int argc, char **argv)
|
||||||
{
|
{
|
||||||
boolean_t recursive = B_FALSE;
|
boolean_t recursive = B_FALSE;
|
||||||
int ret;
|
int ret;
|
||||||
char c;
|
signed char c;
|
||||||
nvlist_t *props;
|
nvlist_t *props;
|
||||||
|
|
||||||
if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0) {
|
if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0) {
|
||||||
|
|
Loading…
Reference in New Issue