diff options
| author | ahrens <none@none> | 2008-08-01 23:14:55 -0700 |
|---|---|---|
| committer | ahrens <none@none> | 2008-08-01 23:14:55 -0700 |
| commit | b6c10d8075f5dee6b99f706ed08f3b012a8dcbdd (patch) | |
| tree | 89b2fec094756ad52e73830cc2f110cf9f65350f /usr/src | |
| parent | cf170fc06cee7b670cc5ccf1fe83dce33fb2592b (diff) | |
| download | illumos-gate-b6c10d8075f5dee6b99f706ed08f3b012a8dcbdd.tar.gz | |
6701797 want user properties on snapshots (fix lint)
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/zfs/zfs_main.c | 1 | ||||
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_sendrecv.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c index ca0538eaa2..a2b12cb71a 100644 --- a/usr/src/cmd/zfs/zfs_main.c +++ b/usr/src/cmd/zfs/zfs_main.c @@ -1286,7 +1286,6 @@ static int inherit_recurse_cb(zfs_handle_t *zhp, void *data) { char *propname = data; - int ret; zfs_prop_t prop = zfs_name_to_prop(propname); /* diff --git a/usr/src/lib/libzfs/common/libzfs_sendrecv.c b/usr/src/lib/libzfs/common/libzfs_sendrecv.c index bcbfb65f39..332c5bb437 100644 --- a/usr/src/lib/libzfs/common/libzfs_sendrecv.c +++ b/usr/src/lib/libzfs/common/libzfs_sendrecv.c @@ -1230,7 +1230,7 @@ again: zfs_cmd_t zc = { 0 }; zc.zc_cookie = B_TRUE; /* clear current props */ - snprintf(zc.zc_name, sizeof (zc.zc_name), + (void) snprintf(zc.zc_name, sizeof (zc.zc_name), "%s@%s", fsname, nvpair_name(snapelem)); if (zcmd_write_src_nvlist(hdl, &zc, props) == 0) { @@ -1831,7 +1831,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap, if (err == 0 && snapprops_nvlist) { zfs_cmd_t zc2 = { 0 }; - strcpy(zc2.zc_name, zc.zc_value); + (void) strcpy(zc2.zc_name, zc.zc_value); if (zcmd_write_src_nvlist(hdl, &zc2, snapprops_nvlist) == 0) { (void) zfs_ioctl(hdl, ZFS_IOC_SET_PROP, &zc2); zcmd_free_nvlists(&zc2); |