summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2008-12-22 16:30:27 -0800
committerBrian Behlendorf <[email protected]>2008-12-22 16:30:27 -0800
commita6152094d0d032579a6b65035452d9654e5a12c4 (patch)
tree70dca2b4bc6a1cbe4071010323f66d01be4780c7 /cmd
parent262c2c49c17f934a61d08d7f061ee2d1b64574cd (diff)
parent6a394806f5a393e1aca968f5f4aaaf0d45ba232f (diff)
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
Diffstat (limited to 'cmd')
-rw-r--r--cmd/ztest/ztest.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
index 9274885b2..f9730e0c9 100644
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@ -260,7 +260,7 @@ static void usage(boolean_t) __NORETURN;
* debugging facilities.
*/
const char *
-_umem_debug_init()
+_umem_debug_init(void)
{
return ("default,verbose"); /* $UMEM_DEBUG setting */
}
@@ -763,19 +763,19 @@ ztest_replay_remove(ztest_replay_t *zr, lr_remove_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 */
- NULL, /* TX_WRITE */
- NULL, /* TX_TRUNCATE */
- NULL, /* TX_SETATTR */
- NULL, /* TX_ACL */
+ 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 */
+ NULL, /* TX_WRITE */
+ NULL, /* TX_TRUNCATE */
+ NULL, /* TX_SETATTR */
+ NULL, /* TX_ACL */
};
/*