mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 02:27:36 +03:00
nvpair: Constify string functions
After addressing coverity complaints involving `nvpair_name()`, the compiler started complaining about dropping const. This lead to a rabbit hole where not only `nvpair_name()` needed to be constified, but also `nvpair_value_string()`, `fnvpair_value_string()` and a few other static functions, plus variable pointers throughout the code. The result became a fairly big change, so it has been split out into its own patch. Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu> Closes #14612
This commit is contained in:
committed by
Brian Behlendorf
parent
50f6934b9c
commit
d1807f168e
@@ -1620,7 +1620,7 @@ dsl_dataset_snapshot_check(void *arg, dmu_tx_t *tx)
|
||||
for (pair = nvlist_next_nvpair(cnt_track, NULL);
|
||||
pair != NULL; pair = nvlist_next_nvpair(cnt_track, pair)) {
|
||||
int error = 0;
|
||||
char *name;
|
||||
const char *name;
|
||||
uint64_t cnt = 0;
|
||||
dsl_dataset_t *ds;
|
||||
|
||||
@@ -1652,7 +1652,7 @@ dsl_dataset_snapshot_check(void *arg, dmu_tx_t *tx)
|
||||
pair != NULL; pair = nvlist_next_nvpair(ddsa->ddsa_snaps, pair)) {
|
||||
int error = 0;
|
||||
dsl_dataset_t *ds;
|
||||
char *name, *atp = NULL;
|
||||
const char *name, *atp = NULL;
|
||||
char dsname[ZFS_MAX_DATASET_NAME_LEN];
|
||||
|
||||
name = nvpair_name(pair);
|
||||
@@ -1877,7 +1877,7 @@ dsl_dataset_snapshot_sync(void *arg, dmu_tx_t *tx)
|
||||
for (pair = nvlist_next_nvpair(ddsa->ddsa_snaps, NULL);
|
||||
pair != NULL; pair = nvlist_next_nvpair(ddsa->ddsa_snaps, pair)) {
|
||||
dsl_dataset_t *ds;
|
||||
char *name, *atp;
|
||||
const char *name, *atp;
|
||||
char dsname[ZFS_MAX_DATASET_NAME_LEN];
|
||||
|
||||
name = nvpair_name(pair);
|
||||
@@ -1906,7 +1906,7 @@ dsl_dataset_snapshot(nvlist_t *snaps, nvlist_t *props, nvlist_t *errors)
|
||||
boolean_t needsuspend;
|
||||
int error;
|
||||
spa_t *spa;
|
||||
char *firstname;
|
||||
const char *firstname;
|
||||
nvlist_t *suspended = NULL;
|
||||
|
||||
pair = nvlist_next_nvpair(snaps, NULL);
|
||||
@@ -1925,8 +1925,8 @@ dsl_dataset_snapshot(nvlist_t *snaps, nvlist_t *props, nvlist_t *errors)
|
||||
for (pair = nvlist_next_nvpair(snaps, NULL); pair != NULL;
|
||||
pair = nvlist_next_nvpair(snaps, pair)) {
|
||||
char fsname[ZFS_MAX_DATASET_NAME_LEN];
|
||||
char *snapname = nvpair_name(pair);
|
||||
char *atp;
|
||||
const char *snapname = nvpair_name(pair);
|
||||
const char *atp;
|
||||
void *cookie;
|
||||
|
||||
atp = strchr(snapname, '@');
|
||||
|
||||
Reference in New Issue
Block a user