Fix gcc unused variable warnings

[zfs.git] / cmd / ztest / ztest.c

diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
index 5e21e62..ad73735 100644 (file)
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@ -359,7 +359,7 @@ static void usage(boolean_t) __NORETURN;
  * debugging facilities.
  */
 const char *
-_umem_debug_init()
+_umem_debug_init(void)
 {
        return ("default,verbose"); /* $UMEM_DEBUG setting */
 }
@@ -1042,6 +1042,7 @@ ztest_pattern_set(void *buf, uint64_t size, uint64_t value)
                *ip++ = value;
 }
 
+#ifndef NDEBUG
 static boolean_t
 ztest_pattern_match(void *buf, uint64_t size, uint64_t value)
 {
@@ -1054,6 +1055,7 @@ ztest_pattern_match(void *buf, uint64_t size, uint64_t value)
 
        return (diff == 0);
 }
+#endif
 
 static void
 ztest_bt_generate(ztest_block_tag_t *bt, objset_t *os, uint64_t object,
@@ -1579,26 +1581,26 @@ ztest_replay_setattr(ztest_ds_t *zd, lr_setattr_t *lr, boolean_t byteswap)
 }
 
 zil_replay_func_t *ztest_replay_vector[TX_MAX_TYPE] = {
-       NULL,                   /* 0 no such transaction type */
-       ztest_replay_create,    /* TX_CREATE */
-       NULL,                   /* TX_MKDIR */
-       NULL,                   /* TX_MKXATTR */
-       NULL,                   /* TX_SYMLINK */
-       ztest_replay_remove,    /* TX_REMOVE */
-       NULL,                   /* TX_RMDIR */
-       NULL,                   /* TX_LINK */
-       NULL,                   /* TX_RENAME */
-       ztest_replay_write,     /* TX_WRITE */
-       ztest_replay_truncate,  /* TX_TRUNCATE */
-       ztest_replay_setattr,   /* TX_SETATTR */
-       NULL,                   /* TX_ACL */
-       NULL,                   /* TX_CREATE_ACL */
-       NULL,                   /* TX_CREATE_ATTR */
-       NULL,                   /* TX_CREATE_ACL_ATTR */
-       NULL,                   /* TX_MKDIR_ACL */
-       NULL,                   /* TX_MKDIR_ATTR */
-       NULL,                   /* TX_MKDIR_ACL_ATTR */
-       NULL,                   /* TX_WRITE2 */
+       NULL,                           /* 0 no such transaction type */
+       (zil_replay_func_t *)ztest_replay_create,       /* TX_CREATE */
+       NULL,                                           /* TX_MKDIR */
+       NULL,                                           /* TX_MKXATTR */
+       NULL,                                           /* TX_SYMLINK */
+       (zil_replay_func_t *)ztest_replay_remove,       /* TX_REMOVE */
+       NULL,                                           /* TX_RMDIR */
+       NULL,                                           /* TX_LINK */
+       NULL,                                           /* TX_RENAME */
+       (zil_replay_func_t *)ztest_replay_write,        /* TX_WRITE */
+       (zil_replay_func_t *)ztest_replay_truncate,     /* TX_TRUNCATE */
+       (zil_replay_func_t *)ztest_replay_setattr,      /* TX_SETATTR */
+       NULL,                                           /* TX_ACL */
+       NULL,                                           /* TX_CREATE_ACL */
+       NULL,                                           /* TX_CREATE_ATTR */
+       NULL,                                           /* TX_CREATE_ACL_ATTR */
+       NULL,                                           /* TX_MKDIR_ACL */
+       NULL,                                           /* TX_MKDIR_ATTR */
+       NULL,                                           /* TX_MKDIR_ACL_ATTR */
+       NULL,                                           /* TX_WRITE2 */
 };
 
 /*
@@ -1998,6 +2000,8 @@ ztest_io(ztest_ds_t *zd, uint64_t object, uint64_t offset)
        case ZTEST_IO_SETATTR:
                (void) ztest_setattr(zd, object);
                break;
+       default:
+               break;
        }
 
        umem_free(data, blocksize);
@@ -2580,7 +2584,7 @@ ztest_vdev_attach_detach(ztest_ds_t *zd, uint64_t id)
 vdev_t *
 grow_vdev(vdev_t *vd, void *arg)
 {
-       spa_t *spa = vd->vdev_spa;
+       ASSERTV(spa_t *spa = vd->vdev_spa);
        size_t *newsize = arg;
        size_t fsize;
        int fd;
@@ -5379,7 +5383,7 @@ print_time(hrtime_t t, char *timebuf)
 }
 
 static nvlist_t *
-make_random_props()
+make_random_props(void)
 {
        nvlist_t *props;