diff options
| -rw-r--r-- | lib/libnvpair/libnvpair.c | 4 | ||||
| -rw-r--r-- | lib/libnvpair/nvpair_alloc_system.c | 2 | ||||
| -rw-r--r-- | module/nvpair/fnvpair.c | 2 | ||||
| -rw-r--r-- | module/nvpair/nvpair.c | 6 | ||||
| -rw-r--r-- | module/nvpair/nvpair_alloc_fixed.c | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/lib/libnvpair/libnvpair.c b/lib/libnvpair/libnvpair.c index fd43a44c1..0123bb772 100644 --- a/lib/libnvpair/libnvpair.c +++ b/lib/libnvpair/libnvpair.c @@ -253,11 +253,11 @@ NVLIST_ARRPRTFUNC(int64_array, int64_t, longlong_t, "%lld") NVLIST_ARRPRTFUNC(uint64_array, uint64_t, u_longlong_t, "0x%llx") NVLIST_ARRPRTFUNC(string_array, char *, char *, "%s") -/*ARGSUSED*/ static int nvprint_nvlist(nvlist_prtctl_t pctl, void *private, nvlist_t *nvl, const char *name, nvlist_t *value) { + (void) private, (void) nvl; FILE *fp = pctl->nvprt_fp; indent(pctl, 1); @@ -273,11 +273,11 @@ nvprint_nvlist(nvlist_prtctl_t pctl, void *private, return (1); } -/*ARGSUSED*/ static int nvaprint_nvlist_array(nvlist_prtctl_t pctl, void *private, nvlist_t *nvl, const char *name, nvlist_t **valuep, uint_t count) { + (void) private, (void) nvl; FILE *fp = pctl->nvprt_fp; uint_t i; diff --git a/lib/libnvpair/nvpair_alloc_system.c b/lib/libnvpair/nvpair_alloc_system.c index 54dde1ee6..9771f58f6 100644 --- a/lib/libnvpair/nvpair_alloc_system.c +++ b/lib/libnvpair/nvpair_alloc_system.c @@ -36,10 +36,10 @@ nv_alloc_sys(nv_alloc_t *nva, size_t size) return (kmem_alloc(size, (int)(uintptr_t)nva->nva_arg)); } -/*ARGSUSED*/ static void nv_free_sys(nv_alloc_t *nva, void *buf, size_t size) { + (void) nva; kmem_free(buf, size); } diff --git a/module/nvpair/fnvpair.c b/module/nvpair/fnvpair.c index 3a4f07486..43c4b7359 100644 --- a/module/nvpair/fnvpair.c +++ b/module/nvpair/fnvpair.c @@ -82,13 +82,13 @@ fnvlist_pack(nvlist_t *nvl, size_t *sizep) return (packed); } -/*ARGSUSED*/ void fnvlist_pack_free(char *pack, size_t size) { #ifdef _KERNEL kmem_free(pack, size); #else + (void) size; free(pack); #endif } diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c index 668e4a978..8230cca20 100644 --- a/module/nvpair/nvpair.c +++ b/module/nvpair/nvpair.c @@ -576,6 +576,7 @@ nvlist_nv_alloc(int kmflag) return (nv_alloc_pushpage); } #else + (void) kmflag; return (nv_alloc_nosleep); #endif /* _KERNEL */ } @@ -2296,10 +2297,11 @@ nvlist_add_nvpair(nvlist_t *nvl, nvpair_t *nvp) * the values are taken from nvl in the case of duplicates. * Return 0 on success. */ -/*ARGSUSED*/ int nvlist_merge(nvlist_t *dst, nvlist_t *nvl, int flag) { + (void) flag; + if (nvl == NULL || dst == NULL) return (EINVAL); @@ -2803,10 +2805,10 @@ nvs_native_create(nvstream_t *nvs, nvs_native_t *native, char *buf, } } -/*ARGSUSED*/ static void nvs_native_destroy(nvstream_t *nvs) { + (void) nvs; } static int diff --git a/module/nvpair/nvpair_alloc_fixed.c b/module/nvpair/nvpair_alloc_fixed.c index c8a604a2b..ca3f68676 100644 --- a/module/nvpair/nvpair_alloc_fixed.c +++ b/module/nvpair/nvpair_alloc_fixed.c @@ -85,11 +85,11 @@ nv_fixed_alloc(nv_alloc_t *nva, size_t size) return ((void *)new); } -/*ARGSUSED*/ static void nv_fixed_free(nv_alloc_t *nva, void *buf, size_t size) { /* don't free memory in the pre-allocated buffer */ + (void) nva, (void) buf, (void) size; } static void |