From 647580c8f1a7ab3e9b28baa443fdb27d1a786a95 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 4 Dec 2008 15:00:44 -0800 Subject: [PATCH] Refresh gcc-invalid-prototype branch --- .topdeps | 1 + .topmsg | 6 ++++++ zfs/lib/libspl/include/sys/zfs_context.h | 2 +- zfs/lib/libzfs/libzfs_mount.c | 4 ++-- zfs/lib/libzpool/include/sys/spa.h | 2 +- zfs/lib/libzpool/include/sys/zfs_znode.h | 4 ++-- zfs/lib/libzpool/spa_history.c | 2 +- zfs/lib/libzpool/spa_misc.c | 2 +- 8 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 .topdeps create mode 100644 .topmsg diff --git a/.topdeps b/.topdeps new file mode 100644 index 0000000000..1f7391f92b --- /dev/null +++ b/.topdeps @@ -0,0 +1 @@ +master diff --git a/.topmsg b/.topmsg new file mode 100644 index 0000000000..d1a9bb7a49 --- /dev/null +++ b/.topmsg @@ -0,0 +1,6 @@ +From: Brian Behlendorf +Subject: [PATCH] gcc invalid prototype + +Gcc -Wall warn: 'invalid prototype' + +Signed-off-by: Brian Behlendorf diff --git a/zfs/lib/libspl/include/sys/zfs_context.h b/zfs/lib/libspl/include/sys/zfs_context.h index 0e7019bba8..f924dd1a64 100644 --- a/zfs/lib/libspl/include/sys/zfs_context.h +++ b/zfs/lib/libspl/include/sys/zfs_context.h @@ -195,7 +195,7 @@ typedef struct kthread kthread_t; zk_thread_create(func, arg) #define thread_exit() thr_exit(NULL) -extern kthread_t *zk_thread_create(void (*func)(), void *arg); +extern kthread_t *zk_thread_create(void (*func)(void), void *arg); #define issig(why) (FALSE) #define ISSIG(thr, why) (FALSE) diff --git a/zfs/lib/libzfs/libzfs_mount.c b/zfs/lib/libzfs/libzfs_mount.c index 7c5c7f3eca..bdc254566e 100644 --- a/zfs/lib/libzfs/libzfs_mount.c +++ b/zfs/lib/libzfs/libzfs_mount.c @@ -93,7 +93,7 @@ zfs_share_type_t zfs_is_shared_proto(zfs_handle_t *, char **, static int (*iscsitgt_zfs_share)(const char *); static int (*iscsitgt_zfs_unshare)(const char *); static int (*iscsitgt_zfs_is_shared)(const char *); -static int (*iscsitgt_svc_online)(); +static int (*iscsitgt_svc_online)(void); /* * The share protocols table must be in the same order as the zfs_share_prot_t @@ -140,7 +140,7 @@ zfs_iscsi_init(void) "iscsitgt_zfs_unshare")) == NULL || (iscsitgt_zfs_is_shared = (int (*)(const char *))dlsym(libiscsitgt, "iscsitgt_zfs_is_shared")) == NULL || - (iscsitgt_svc_online = (int (*)(const char *))dlsym(libiscsitgt, + (iscsitgt_svc_online = (int (*)(void))dlsym(libiscsitgt, "iscsitgt_svc_online")) == NULL) { iscsitgt_zfs_share = NULL; iscsitgt_zfs_unshare = NULL; diff --git a/zfs/lib/libzpool/include/sys/spa.h b/zfs/lib/libzpool/include/sys/spa.h index 24b3ca4476..1029b38294 100644 --- a/zfs/lib/libzpool/include/sys/spa.h +++ b/zfs/lib/libzpool/include/sys/spa.h @@ -522,7 +522,7 @@ extern void vdev_cache_stat_fini(void); /* Initialization and termination */ extern void spa_init(int flags); extern void spa_fini(void); -extern void spa_boot_init(); +extern void spa_boot_init(void); /* properties */ extern int spa_prop_set(spa_t *spa, nvlist_t *nvp); diff --git a/zfs/lib/libzpool/include/sys/zfs_znode.h b/zfs/lib/libzpool/include/sys/zfs_znode.h index a5416525c7..db40968fa2 100644 --- a/zfs/lib/libzpool/include/sys/zfs_znode.h +++ b/zfs/lib/libzpool/include/sys/zfs_znode.h @@ -305,8 +305,8 @@ extern int zfs_rezget(znode_t *); extern void zfs_zinactive(znode_t *); extern void zfs_znode_delete(znode_t *, dmu_tx_t *); extern void zfs_znode_free(znode_t *); -extern void zfs_remove_op_tables(); -extern int zfs_create_op_tables(); +extern void zfs_remove_op_tables(void); +extern int zfs_create_op_tables(void); extern int zfs_sync(vfs_t *vfsp, short flag, cred_t *cr); extern dev_t zfs_cmpldev(uint64_t); extern int zfs_get_zplprop(objset_t *os, zfs_prop_t prop, uint64_t *value); diff --git a/zfs/lib/libzpool/spa_history.c b/zfs/lib/libzpool/spa_history.c index c997240c14..8b422cf8b9 100644 --- a/zfs/lib/libzpool/spa_history.c +++ b/zfs/lib/libzpool/spa_history.c @@ -176,7 +176,7 @@ spa_history_write(spa_t *spa, void *buf, uint64_t len, spa_history_phys_t *shpp, } static char * -spa_history_zone() +spa_history_zone(void) { #ifdef _KERNEL return (curproc->p_zone->zone_name); diff --git a/zfs/lib/libzpool/spa_misc.c b/zfs/lib/libzpool/spa_misc.c index 36046e6df1..e188b2da16 100644 --- a/zfs/lib/libzpool/spa_misc.c +++ b/zfs/lib/libzpool/spa_misc.c @@ -1329,7 +1329,7 @@ spa_busy(void) } void -spa_boot_init() +spa_boot_init(void) { spa_config_load(); }