diff options
| -rw-r--r-- | cmd/zpool/zpool_main.c | 2 | ||||
| -rw-r--r-- | include/libzfs.h | 2 | ||||
| -rw-r--r-- | lib/libzfs/libzfs_crypto.c | 2 | ||||
| -rw-r--r-- | lib/libzfs/libzfs_pool.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c index ae35cbf4b..1d31fde46 100644 --- a/cmd/zpool/zpool_main.c +++ b/cmd/zpool/zpool_main.c @@ -1654,7 +1654,7 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name, char *vname; uint64_t notpresent; spare_cbdata_t spare_cb; - char *state; + const char *state; char *path = NULL; if (nvlist_lookup_nvlist_array(nv, ZPOOL_CONFIG_CHILDREN, diff --git a/include/libzfs.h b/include/libzfs.h index 71a588325..5288ff7f8 100644 --- a/include/libzfs.h +++ b/include/libzfs.h @@ -233,7 +233,7 @@ extern zpool_handle_t *zpool_open_canfail(libzfs_handle_t *, const char *); extern void zpool_close(zpool_handle_t *); extern const char *zpool_get_name(zpool_handle_t *); extern int zpool_get_state(zpool_handle_t *); -extern char *zpool_state_to_name(vdev_state_t, vdev_aux_t); +extern const char *zpool_state_to_name(vdev_state_t, vdev_aux_t); extern const char *zpool_pool_state_to_name(pool_state_t); extern void zpool_free_handles(libzfs_handle_t *); diff --git a/lib/libzfs/libzfs_crypto.c b/lib/libzfs/libzfs_crypto.c index 6ccee740f..9ad0fae7d 100644 --- a/lib/libzfs/libzfs_crypto.c +++ b/lib/libzfs/libzfs_crypto.c @@ -130,7 +130,7 @@ catch_signal(int sig) caught_interrupt = sig; } -static char * +static const char * get_format_prompt_string(zfs_keyformat_t format) { switch (format) { diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c index 5f1414271..cd14f2836 100644 --- a/lib/libzfs/libzfs_pool.c +++ b/lib/libzfs/libzfs_pool.c @@ -113,7 +113,7 @@ zpool_props_refresh(zpool_handle_t *zhp) return (0); } -static char * +static const char * zpool_get_prop_string(zpool_handle_t *zhp, zpool_prop_t prop, zprop_source_t *src) { @@ -181,7 +181,7 @@ zpool_get_prop_int(zpool_handle_t *zhp, zpool_prop_t prop, zprop_source_t *src) /* * Map VDEV STATE to printed strings. */ -char * +const char * zpool_state_to_name(vdev_state_t state, vdev_aux_t aux) { switch (state) { |