diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/libnvpair.h | 11 | ||||
| -rw-r--r-- | include/libzfs.h | 2 | ||||
| -rw-r--r-- | include/sys/dmu_recv.h | 4 | ||||
| -rw-r--r-- | include/sys/nvpair.h | 17 |
4 files changed, 19 insertions, 15 deletions
diff --git a/include/libnvpair.h b/include/libnvpair.h index 738afaec7..09b224b4d 100644 --- a/include/libnvpair.h +++ b/include/libnvpair.h @@ -42,9 +42,10 @@ extern "C" { * are all imported from <sys/nvpair.h> included above. */ -_LIBNVPAIR_H int nvpair_value_match(nvpair_t *, int, char *, char **); -_LIBNVPAIR_H int nvpair_value_match_regex(nvpair_t *, int, char *, regex_t *, - char **); +_LIBNVPAIR_H int nvpair_value_match(nvpair_t *, int, const char *, + const char **); +_LIBNVPAIR_H int nvpair_value_match_regex(nvpair_t *, int, const char *, + regex_t *, const char **); _LIBNVPAIR_H void nvlist_print(FILE *, nvlist_t *); _LIBNVPAIR_H int nvlist_print_json(FILE *, nvlist_t *); @@ -156,7 +157,7 @@ NVLIST_PRINTCTL_SVDECL(nvlist_prtctlop_uint32, uint32_t); NVLIST_PRINTCTL_SVDECL(nvlist_prtctlop_int64, int64_t); NVLIST_PRINTCTL_SVDECL(nvlist_prtctlop_uint64, uint64_t); NVLIST_PRINTCTL_SVDECL(nvlist_prtctlop_double, double); -NVLIST_PRINTCTL_SVDECL(nvlist_prtctlop_string, char *); +NVLIST_PRINTCTL_SVDECL(nvlist_prtctlop_string, const char *); NVLIST_PRINTCTL_SVDECL(nvlist_prtctlop_hrtime, hrtime_t); NVLIST_PRINTCTL_SVDECL(nvlist_prtctlop_nvlist, nvlist_t *); @@ -185,7 +186,7 @@ NVLIST_PRINTCTL_AVDECL(nvlist_prtctlop_int32_array, int32_t *); NVLIST_PRINTCTL_AVDECL(nvlist_prtctlop_uint32_array, uint32_t *); NVLIST_PRINTCTL_AVDECL(nvlist_prtctlop_int64_array, int64_t *); NVLIST_PRINTCTL_AVDECL(nvlist_prtctlop_uint64_array, uint64_t *); -NVLIST_PRINTCTL_AVDECL(nvlist_prtctlop_string_array, char **); +NVLIST_PRINTCTL_AVDECL(nvlist_prtctlop_string_array, const char **); NVLIST_PRINTCTL_AVDECL(nvlist_prtctlop_nvlist_array, nvlist_t **); #undef NVLIST_PRINTCTL_AVDECL /* was just for "clarity" above */ diff --git a/include/libzfs.h b/include/libzfs.h index 05b4dfe35..4f8eeb72a 100644 --- a/include/libzfs.h +++ b/include/libzfs.h @@ -533,7 +533,7 @@ _LIBZFS_H int zfs_prop_get_written(zfs_handle_t *zhp, const char *propname, char *propbuf, int proplen, boolean_t literal); _LIBZFS_H int zfs_prop_get_feature(zfs_handle_t *zhp, const char *propname, char *buf, size_t len); -_LIBZFS_H uint64_t getprop_uint64(zfs_handle_t *, zfs_prop_t, char **); +_LIBZFS_H uint64_t getprop_uint64(zfs_handle_t *, zfs_prop_t, const char **); _LIBZFS_H uint64_t zfs_prop_get_int(zfs_handle_t *, zfs_prop_t); _LIBZFS_H int zfs_prop_inherit(zfs_handle_t *, const char *, boolean_t); _LIBZFS_H const char *zfs_prop_values(zfs_prop_t); diff --git a/include/sys/dmu_recv.h b/include/sys/dmu_recv.h index 538c73610..3390ca108 100644 --- a/include/sys/dmu_recv.h +++ b/include/sys/dmu_recv.h @@ -79,8 +79,8 @@ typedef struct dmu_recv_cookie { objlist_t *drc_ignore_objlist; } dmu_recv_cookie_t; -int dmu_recv_begin(char *, char *, dmu_replay_record_t *, - boolean_t, boolean_t, boolean_t, nvlist_t *, nvlist_t *, char *, +int dmu_recv_begin(const char *, const char *, dmu_replay_record_t *, + boolean_t, boolean_t, boolean_t, nvlist_t *, nvlist_t *, const char *, dmu_recv_cookie_t *, zfs_file_t *, offset_t *); int dmu_recv_stream(dmu_recv_cookie_t *, offset_t *); int dmu_recv_end(dmu_recv_cookie_t *, void *); diff --git a/include/sys/nvpair.h b/include/sys/nvpair.h index 09b3a81f7..33eda9be1 100644 --- a/include/sys/nvpair.h +++ b/include/sys/nvpair.h @@ -232,7 +232,8 @@ _SYS_NVPAIR_H int nvlist_lookup_int64(const nvlist_t *, const char *, int64_t *); _SYS_NVPAIR_H int nvlist_lookup_uint64(const nvlist_t *, const char *, uint64_t *); -_SYS_NVPAIR_H int nvlist_lookup_string(nvlist_t *, const char *, char **); +_SYS_NVPAIR_H int nvlist_lookup_string(const nvlist_t *, const char *, + const char **); _SYS_NVPAIR_H int nvlist_lookup_nvlist(nvlist_t *, const char *, nvlist_t **); _SYS_NVPAIR_H int nvlist_lookup_boolean_array(nvlist_t *, const char *, boolean_t **, uint_t *); @@ -267,14 +268,14 @@ _SYS_NVPAIR_H int nvlist_lookup_double(const nvlist_t *, const char *, _SYS_NVPAIR_H int nvlist_lookup_nvpair(nvlist_t *, const char *, nvpair_t **); _SYS_NVPAIR_H int nvlist_lookup_nvpair_embedded_index(nvlist_t *, const char *, - nvpair_t **, int *, char **); + nvpair_t **, int *, const char **); _SYS_NVPAIR_H boolean_t nvlist_exists(const nvlist_t *, const char *); _SYS_NVPAIR_H boolean_t nvlist_empty(const nvlist_t *); /* processing nvpair */ _SYS_NVPAIR_H nvpair_t *nvlist_next_nvpair(nvlist_t *, const nvpair_t *); _SYS_NVPAIR_H nvpair_t *nvlist_prev_nvpair(nvlist_t *, const nvpair_t *); -_SYS_NVPAIR_H char *nvpair_name(const nvpair_t *); +_SYS_NVPAIR_H const char *nvpair_name(const nvpair_t *); _SYS_NVPAIR_H data_type_t nvpair_type(const nvpair_t *); _SYS_NVPAIR_H int nvpair_type_is_array(const nvpair_t *); _SYS_NVPAIR_H int nvpair_value_boolean_value(const nvpair_t *, boolean_t *); @@ -287,7 +288,7 @@ _SYS_NVPAIR_H int nvpair_value_int32(const nvpair_t *, int32_t *); _SYS_NVPAIR_H int nvpair_value_uint32(const nvpair_t *, uint32_t *); _SYS_NVPAIR_H int nvpair_value_int64(const nvpair_t *, int64_t *); _SYS_NVPAIR_H int nvpair_value_uint64(const nvpair_t *, uint64_t *); -_SYS_NVPAIR_H int nvpair_value_string(nvpair_t *, char **); +_SYS_NVPAIR_H int nvpair_value_string(const nvpair_t *, const char **); _SYS_NVPAIR_H int nvpair_value_nvlist(nvpair_t *, nvlist_t **); _SYS_NVPAIR_H int nvpair_value_boolean_array(nvpair_t *, boolean_t **, uint_t *); @@ -300,7 +301,8 @@ _SYS_NVPAIR_H int nvpair_value_int32_array(nvpair_t *, int32_t **, uint_t *); _SYS_NVPAIR_H int nvpair_value_uint32_array(nvpair_t *, uint32_t **, uint_t *); _SYS_NVPAIR_H int nvpair_value_int64_array(nvpair_t *, int64_t **, uint_t *); _SYS_NVPAIR_H int nvpair_value_uint64_array(nvpair_t *, uint64_t **, uint_t *); -_SYS_NVPAIR_H int nvpair_value_string_array(nvpair_t *, char ***, uint_t *); +_SYS_NVPAIR_H int nvpair_value_string_array(nvpair_t *, const char ***, + uint_t *); _SYS_NVPAIR_H int nvpair_value_nvlist_array(nvpair_t *, nvlist_t ***, uint_t *); _SYS_NVPAIR_H int nvpair_value_hrtime(nvpair_t *, hrtime_t *); #if !defined(_KERNEL) && !defined(_STANDALONE) @@ -373,7 +375,8 @@ _SYS_NVPAIR_H uint8_t fnvlist_lookup_uint8(const nvlist_t *, const char *); _SYS_NVPAIR_H uint16_t fnvlist_lookup_uint16(const nvlist_t *, const char *); _SYS_NVPAIR_H uint32_t fnvlist_lookup_uint32(const nvlist_t *, const char *); _SYS_NVPAIR_H uint64_t fnvlist_lookup_uint64(const nvlist_t *, const char *); -_SYS_NVPAIR_H char *fnvlist_lookup_string(nvlist_t *, const char *); +_SYS_NVPAIR_H const char *fnvlist_lookup_string(const nvlist_t *, + const char *); _SYS_NVPAIR_H nvlist_t *fnvlist_lookup_nvlist(nvlist_t *, const char *); _SYS_NVPAIR_H boolean_t *fnvlist_lookup_boolean_array(nvlist_t *, const char *, uint_t *); @@ -406,7 +409,7 @@ _SYS_NVPAIR_H uint8_t fnvpair_value_uint8(const nvpair_t *nvp); _SYS_NVPAIR_H uint16_t fnvpair_value_uint16(const nvpair_t *nvp); _SYS_NVPAIR_H uint32_t fnvpair_value_uint32(const nvpair_t *nvp); _SYS_NVPAIR_H uint64_t fnvpair_value_uint64(const nvpair_t *nvp); -_SYS_NVPAIR_H char *fnvpair_value_string(nvpair_t *nvp); +_SYS_NVPAIR_H const char *fnvpair_value_string(const nvpair_t *nvp); _SYS_NVPAIR_H nvlist_t *fnvpair_value_nvlist(nvpair_t *nvp); #ifdef __cplusplus |