From f291fa658efd146540b03ce386133632bde237bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Fri, 10 Dec 2021 00:08:19 +0100 Subject: [PATCH] t/z_diff/socket, zfs: main: fix unused argument warnings, ARGSUSED tags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Brian Behlendorf Reviewed-by: Rich Ercolani Signed-off-by: Ahelenia ZiemiaƄska Closes #12829 --- cmd/zfs/zfs_main.c | 13 +++++-------- .../tests/functional/cli_root/zfs_diff/socket.c | 1 - 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index d5d1817687..5aa2508c38 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -3760,7 +3760,6 @@ zfs_do_list(int argc, char **argv) * The '-p' flag creates all the non-existing ancestors of the target first. * The '-u' flag prevents file systems from being remounted during rename. */ -/* ARGSUSED */ static int zfs_do_rename(int argc, char **argv) { @@ -3859,7 +3858,6 @@ zfs_do_rename(int argc, char **argv) * * Promotes the given clone fs to be the parent */ -/* ARGSUSED */ static int zfs_do_promote(int argc, char **argv) { @@ -5095,10 +5093,10 @@ who_type2weight(zfs_deleg_who_type_t who_type) return (res); } -/* ARGSUSED */ static int who_perm_compare(const void *larg, const void *rarg, void *unused) { + (void) unused; const who_perm_node_t *l = larg; const who_perm_node_t *r = rarg; zfs_deleg_who_type_t ltype = l->who_perm.who_type; @@ -5118,10 +5116,10 @@ who_perm_compare(const void *larg, const void *rarg, void *unused) return (-1); } -/* ARGSUSED */ static int deleg_perm_compare(const void *larg, const void *rarg, void *unused) { + (void) unused; const deleg_perm_node_t *l = larg; const deleg_perm_node_t *r = rarg; int res = strncmp(l->dpn_perm.dp_name, r->dpn_perm.dp_name, @@ -7210,10 +7208,10 @@ typedef struct unshare_unmount_node { uu_avl_node_t un_avlnode; } unshare_unmount_node_t; -/* ARGSUSED */ static int unshare_unmount_compare(const void *larg, const void *rarg, void *unused) { + (void) unused; const unshare_unmount_node_t *l = larg; const unshare_unmount_node_t *r = rarg; @@ -8614,6 +8612,8 @@ zfs_do_wait(int argc, char **argv) static int zfs_do_version(int argc, char **argv) { + (void) argc, (void) argv; + if (zfs_version_print() == -1) return (1); @@ -8738,7 +8738,6 @@ main(int argc, char **argv) /* * Attach/detach the given dataset to/from the given jail */ -/* ARGSUSED */ static int zfs_do_jail_impl(int argc, char **argv, boolean_t attach) { @@ -8776,7 +8775,6 @@ zfs_do_jail_impl(int argc, char **argv, boolean_t attach) * * Attach the given dataset to the given jail */ -/* ARGSUSED */ static int zfs_do_jail(int argc, char **argv) { @@ -8788,7 +8786,6 @@ zfs_do_jail(int argc, char **argv) * * Detach the given dataset from the given jail */ -/* ARGSUSED */ static int zfs_do_unjail(int argc, char **argv) { diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_diff/socket.c b/tests/zfs-tests/tests/functional/cli_root/zfs_diff/socket.c index a8c814e7b5..be4bf31dde 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_diff/socket.c +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_diff/socket.c @@ -24,7 +24,6 @@ #include #include -/* ARGSUSED */ int main(int argc, char *argv[]) {