summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2010-08-26 09:52:41 -0700
committerBrian Behlendorf <[email protected]>2010-08-27 15:34:03 -0700
commit0bc8fd7884fc603eb7646c43b1fc0b18e37e7d62 (patch)
tree08033422554b4945355739c0ac59193a9d29acb7 /cmd
parent0ccd9d24e4fdbe9cd07f838d0a62083e8eca95f2 (diff)
Fix gcc invalid prototype warnings
Gcc -Wall warn: 'invalid prototype' Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/zdb/zdb.c4
-rw-r--r--cmd/zdb/zdb_il.c44
-rw-r--r--cmd/ztest/ztest.c44
3 files changed, 46 insertions, 46 deletions
diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
index 012d009dc..11af8c0c3 100644
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@@ -87,7 +87,7 @@ libzfs_handle_t *g_zfs;
* debugging facilities.
*/
const char *
-_umem_debug_init()
+_umem_debug_init(void)
{
return ("default,verbose"); /* $UMEM_DEBUG setting */
}
@@ -1221,7 +1221,7 @@ static boolean_t sa_loaded;
sa_attr_type_t *sa_attr_table;
static void
-fuid_table_destroy()
+fuid_table_destroy(void)
{
if (fuid_table_loaded) {
zfs_fuid_table_destroy(&idx_tree, &domain_tree);
diff --git a/cmd/zdb/zdb_il.c b/cmd/zdb/zdb_il.c
index a0ed985f5..257aa6f4b 100644
--- a/cmd/zdb/zdb_il.c
+++ b/cmd/zdb/zdb_il.c
@@ -240,7 +240,7 @@ zil_prt_rec_acl(zilog_t *zilog, int txtype, lr_acl_t *lr)
(u_longlong_t)lr->lr_foid, (u_longlong_t)lr->lr_aclcnt);
}
-typedef void (*zil_prt_rec_func_t)();
+typedef void (*zil_prt_rec_func_t)(zilog_t *, int, void *);
typedef struct zil_rec_info {
zil_prt_rec_func_t zri_print;
char *zri_name;
@@ -248,27 +248,27 @@ typedef struct zil_rec_info {
} zil_rec_info_t;
static zil_rec_info_t zil_rec_info[TX_MAX_TYPE] = {
- { NULL, "Total " },
- { zil_prt_rec_create, "TX_CREATE " },
- { zil_prt_rec_create, "TX_MKDIR " },
- { zil_prt_rec_create, "TX_MKXATTR " },
- { zil_prt_rec_create, "TX_SYMLINK " },
- { zil_prt_rec_remove, "TX_REMOVE " },
- { zil_prt_rec_remove, "TX_RMDIR " },
- { zil_prt_rec_link, "TX_LINK " },
- { zil_prt_rec_rename, "TX_RENAME " },
- { zil_prt_rec_write, "TX_WRITE " },
- { zil_prt_rec_truncate, "TX_TRUNCATE " },
- { zil_prt_rec_setattr, "TX_SETATTR " },
- { zil_prt_rec_acl, "TX_ACL_V0 " },
- { zil_prt_rec_acl, "TX_ACL_ACL " },
- { zil_prt_rec_create, "TX_CREATE_ACL " },
- { zil_prt_rec_create, "TX_CREATE_ATTR " },
- { zil_prt_rec_create, "TX_CREATE_ACL_ATTR " },
- { zil_prt_rec_create, "TX_MKDIR_ACL " },
- { zil_prt_rec_create, "TX_MKDIR_ATTR " },
- { zil_prt_rec_create, "TX_MKDIR_ACL_ATTR " },
- { zil_prt_rec_write, "TX_WRITE2 " },
+ { NULL, "Total " },
+ { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_CREATE " },
+ { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_MKDIR " },
+ { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_MKXATTR " },
+ { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_SYMLINK " },
+ { (zil_prt_rec_func_t)zil_prt_rec_remove, "TX_REMOVE " },
+ { (zil_prt_rec_func_t)zil_prt_rec_remove, "TX_RMDIR " },
+ { (zil_prt_rec_func_t)zil_prt_rec_link, "TX_LINK " },
+ { (zil_prt_rec_func_t)zil_prt_rec_rename, "TX_RENAME " },
+ { (zil_prt_rec_func_t)zil_prt_rec_write, "TX_WRITE " },
+ { (zil_prt_rec_func_t)zil_prt_rec_truncate, "TX_TRUNCATE " },
+ { (zil_prt_rec_func_t)zil_prt_rec_setattr, "TX_SETATTR " },
+ { (zil_prt_rec_func_t)zil_prt_rec_acl, "TX_ACL_V0 " },
+ { (zil_prt_rec_func_t)zil_prt_rec_acl, "TX_ACL_ACL " },
+ { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_CREATE_ACL " },
+ { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_CREATE_ATTR " },
+ { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_CREATE_ACL_ATTR " },
+ { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_MKDIR_ACL " },
+ { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_MKDIR_ATTR " },
+ { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_MKDIR_ACL_ATTR " },
+ { (zil_prt_rec_func_t)zil_prt_rec_write, "TX_WRITE2 " },
};
/* ARGSUSED */
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
index 5e21e620d..fbc3c2cc9 100644
--- 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 */
}
@@ -1579,26 +1579,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 */
};
/*
@@ -5379,7 +5379,7 @@ print_time(hrtime_t t, char *timebuf)
}
static nvlist_t *
-make_random_props()
+make_random_props(void)
{
nvlist_t *props;