From: Sascha Wildner <saw@online.de>
Date: Tue, 6 May 2014 19:52:29 +0000 (+0200)
Subject: kernel: Fix some boolean_t vs. int confusion.
X-Git-Tag: v3.9.0~76
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/99ebfb7c19301cfdf9a5a87d225b64586998d69f

kernel: Fix some boolean_t vs. int confusion.

When boolean_t is defined to be _Bool instead of int (not part of this
commit), this is what gcc is sad about.
---

diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h
index a40b90b529..b8438394f9 100644
--- a/sys/ddb/db_sym.h
+++ b/sys/ddb/db_sym.h
@@ -24,7 +24,6 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/ddb/db_sym.h,v 1.19 1999/08/28 00:41:10 peter Exp $
- * $DragonFly: src/sys/ddb/db_sym.h,v 1.4 2006/05/20 02:42:01 dillon Exp $
  */
 
 #ifndef _DDB_DB_SYM_H_
@@ -91,7 +90,7 @@ void		db_symbol_values (c_db_sym_t, const char **, db_expr_t *);
 	db_symbol_values(db_search_symbol(val,DB_STGY_XTRN,offp),namep,0)
 					/* ditto, but no locals */
 
-int		db_eqname (const char *, const char *, int);
+boolean_t	db_eqname (const char *, const char *, int);
 					/* strcmp, modulo leading char */
 
 void		db_printsym (db_expr_t, db_strategy_t);
@@ -106,7 +105,7 @@ c_db_sym_t	X_db_lookup (db_symtab_t *stab, const char *symstr);
 c_db_sym_t	X_db_search_symbol (db_symtab_t *symtab, db_addr_t off,
 					db_strategy_t strategy,
 					db_expr_t *diffp);
-int		X_db_sym_numargs (db_symtab_t *, c_db_sym_t, int *,
+boolean_t	X_db_sym_numargs (db_symtab_t *, c_db_sym_t, int *,
 				      char **);
 void		X_db_symbol_values (db_symtab_t *symtab,
 					c_db_sym_t sym, const char **namep,
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index f13a03f872..4a725f952e 100644
--- a/sys/ddb/ddb.h
+++ b/sys/ddb/ddb.h
@@ -108,7 +108,7 @@ void		db_skip_to_eol (void);
 boolean_t	db_stop_at_pc (boolean_t *is_breakpoint);
 #define		db_strcpy	strcpy
 void		db_trap (int type, int code);
-int		db_value_of_name (const char *name, db_expr_t *valuep);
+boolean_t	db_value_of_name (const char *name, db_expr_t *valuep);
 void		db_write_bytes (vm_offset_t addr, size_t size, char *data);
 				/* machine-dependent */
 void		kdb_init (void);
diff --git a/sys/dev/netif/igb/if_igb.c b/sys/dev/netif/igb/if_igb.c
index 0044ef9ca0..15858db82a 100644
--- a/sys/dev/netif/igb/if_igb.c
+++ b/sys/dev/netif/igb/if_igb.c
@@ -2917,7 +2917,7 @@ igb_rel_hw_control(struct igb_softc *sc)
 	    ctrl_ext & ~E1000_CTRL_EXT_DRV_LOAD);
 }
 
-static int
+static boolean_t
 igb_is_valid_ether_addr(const uint8_t *addr)
 {
 	uint8_t zero_addr[ETHER_ADDR_LEN] = { 0, 0, 0, 0, 0, 0 };
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 2724dbaa03..0fa5e1769c 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -69,7 +69,7 @@ static struct radix_node_head *mask_rnheads[MAXCPU];
 static char rn_zeros[RN_MAXKEYLEN];
 static char rn_ones[RN_MAXKEYLEN] = RN_MAXKEYONES;
 
-static int rn_lexobetter(char *m, char *n);
+static boolean_t rn_lexobetter(char *m, char *n);
 static struct radix_mask *
     rn_new_radix_mask(struct radix_node *tt, struct radix_mask *nextmask);
 static boolean_t
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 5e442320db..0c0d421c77 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -65,7 +65,6 @@
  *
  *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/netinet/in_pcb.h,v 1.32.2.7 2003/01/24 05:11:34 sam Exp $
- * $DragonFly: src/sys/netinet/in_pcb.h,v 1.24 2008/09/04 09:08:22 hasso Exp $
  */
 
 #ifndef _NETINET_IN_PCB_H_
@@ -481,11 +480,11 @@ struct inpcb *
 struct inpcb *
 	in_pcblookup_hash (struct inpcbinfo *,
 			       struct in_addr, u_int, struct in_addr, u_int,
-			       int, struct ifnet *);
+			       boolean_t, struct ifnet *);
 struct inpcb *
 	in_pcblookup_pkthash (struct inpcbinfo *,
 			       struct in_addr, u_int, struct in_addr, u_int,
-			       int, struct ifnet *, const struct mbuf *);
+			       boolean_t, struct ifnet *, const struct mbuf *);
 void	in_pcbnotifyall (struct inpcbhead *, struct in_addr,
 	    int, void (*)(struct inpcb *, int));
 int	in_setpeeraddr (struct socket *so, struct sockaddr **nam);
diff --git a/sys/netinet6/ipsec.c b/sys/netinet6/ipsec.c
index 0e5d1d4155..58fcfbafe6 100644
--- a/sys/netinet6/ipsec.c
+++ b/sys/netinet6/ipsec.c
@@ -2680,7 +2680,7 @@ bad:
 int
 ipsec6_output_trans(struct ipsec_output_state *state, u_char *nexthdrp,
 		    struct mbuf *mprev, struct secpolicy *sp, int flags,
-		    int *tun)
+		    boolean_t *tun)
 {
 	struct ip6_hdr *ip6;
 	struct ipsecrequest *isr = NULL;
@@ -2835,7 +2835,7 @@ ipsec6_output_trans(struct ipsec_output_state *state, u_char *nexthdrp,
 
 	/* if we have more to go, we need a tunnel mode processing */
 	if (isr != NULL)
-		*tun = 1;
+		*tun = TRUE;
 	lwkt_reltoken(&key_token);
 	return 0;
 
diff --git a/sys/netinet6/ipsec6.h b/sys/netinet6/ipsec6.h
index da740edcf9..dfe4da75c3 100644
--- a/sys/netinet6/ipsec6.h
+++ b/sys/netinet6/ipsec6.h
@@ -1,5 +1,4 @@
 /*	$FreeBSD: src/sys/netinet6/ipsec6.h,v 1.3.2.2 2001/07/03 11:01:54 ume Exp $	*/
-/*	$DragonFly: src/sys/netinet6/ipsec6.h,v 1.5 2006/05/20 02:42:12 dillon Exp $	*/
 /*	$KAME: ipsec.h,v 1.44 2001/03/23 08:08:47 itojun Exp $	*/
 
 /*
@@ -77,7 +76,7 @@ extern size_t ipsec6_hdrsiz (struct mbuf *, u_int, struct inpcb *);
 extern const char *ipsec6_logpacketstr (struct ip6_hdr *, u_int32_t);
 
 extern int ipsec6_output_trans (struct ipsec_output_state *, u_char *,
-	struct mbuf *, struct secpolicy *, int, int *);
+	struct mbuf *, struct secpolicy *, int, boolean_t *);
 extern int ipsec6_output_tunnel (struct ipsec_output_state *,
 	struct secpolicy *, int);
 extern int ipsec6_tunnel_validate (struct mbuf *, int, u_int,
diff --git a/sys/vfs/tmpfs/tmpfs.h b/sys/vfs/tmpfs/tmpfs.h
index 9cccd5629b..b7ef7d350c 100644
--- a/sys/vfs/tmpfs/tmpfs.h
+++ b/sys/vfs/tmpfs/tmpfs.h
@@ -425,7 +425,7 @@ void	tmpfs_itimes(struct vnode *, const struct timespec *,
 
 void	tmpfs_update(struct vnode *);
 int	tmpfs_truncate(struct vnode *, off_t);
-int	tmpfs_node_ctor(void *obj, void *privdata, int flags);
+boolean_t tmpfs_node_ctor(void *obj, void *privdata, int flags);
 
 /* --------------------------------------------------------------------- */
 
diff --git a/sys/vfs/tmpfs/tmpfs_vfsops.c b/sys/vfs/tmpfs/tmpfs_vfsops.c
index 248c4dbad3..e9ae2cdfe9 100644
--- a/sys/vfs/tmpfs/tmpfs_vfsops.c
+++ b/sys/vfs/tmpfs/tmpfs_vfsops.c
@@ -78,7 +78,7 @@ static int	tmpfs_fhtovp(struct mount *, struct vnode *, struct fid *, struct vno
 static int	tmpfs_statfs(struct mount *, struct statfs *, struct ucred *cred);
 
 /* --------------------------------------------------------------------- */
-int
+boolean_t
 tmpfs_node_ctor(void *obj, void *privdata, int flags)
 {
 	struct tmpfs_node *node = obj;
@@ -92,7 +92,7 @@ tmpfs_node_ctor(void *obj, void *privdata, int flags)
 	node->tn_vpstate = TMPFS_VNODE_WANT;
 	bzero(&node->tn_spec, sizeof(node->tn_spec));
 
-	return (1);
+	return (TRUE);
 }
 
 static void
diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c
index 7d331b5f7a..63912a461c 100644
--- a/sys/vm/default_pager.c
+++ b/sys/vm/default_pager.c
@@ -52,8 +52,8 @@
 
 static void default_pager_dealloc (vm_object_t);
 static int default_pager_getpage (vm_object_t, vm_page_t *, int);
-static void default_pager_putpages (vm_object_t, vm_page_t *, int, 
-		boolean_t, int *);
+static void default_pager_putpages (vm_object_t, vm_page_t *, int,
+		int, int *);
 static boolean_t default_pager_haspage (vm_object_t, vm_pindex_t);
 /*
  * pagerops for OBJT_DEFAULT - "default pager".
@@ -116,7 +116,7 @@ default_pager_getpage(vm_object_t object, vm_page_t *mpp, int seqaccess)
  */
 static void
 default_pager_putpages(vm_object_t object, vm_page_t *mpp, int count,
-		       boolean_t sync, int *rtvals)
+		       int sync, int *rtvals)
 {
 	swap_pager_putpages(object, mpp, count, sync, rtvals);
 }
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index 6199d397da..f91f0ceda5 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -57,8 +57,7 @@
 
 static void dev_pager_dealloc (vm_object_t);
 static int dev_pager_getpage (vm_object_t, vm_page_t *, int);
-static void dev_pager_putpages (vm_object_t, vm_page_t *, int, 
-		boolean_t, int *);
+static void dev_pager_putpages (vm_object_t, vm_page_t *, int, int, int *);
 static boolean_t dev_pager_haspage (vm_object_t, vm_pindex_t);
 
 /* list of device pager objects */
@@ -239,7 +238,7 @@ dev_pager_getpage(vm_object_t object, vm_page_t *mpp, int seqaccess)
  */
 static void
 dev_pager_putpages(vm_object_t object, vm_page_t *m,
-		   int count, boolean_t sync, int *rtvals)
+		   int count, int sync, int *rtvals)
 {
 	panic("dev_pager_putpage called");
 }
diff --git a/sys/vm/phys_pager.c b/sys/vm/phys_pager.c
index c56b58f92b..708676a240 100644
--- a/sys/vm/phys_pager.c
+++ b/sys/vm/phys_pager.c
@@ -98,7 +98,7 @@ phys_pager_getpage(vm_object_t object, vm_page_t *mpp, int seqaccess)
  */
 static void
 phys_pager_putpages(vm_object_t object, vm_page_t *m, int count,
-		    boolean_t sync, int *rtvals)
+		    int sync, int *rtvals)
 {
 
 	panic("phys_pager_putpage called");
diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
index f7e282e636..b4cf3757d7 100644
--- a/sys/vm/pmap.h
+++ b/sys/vm/pmap.h
@@ -62,7 +62,6 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/pmap.h,v 1.33.2.4 2002/03/06 22:44:24 silby Exp $
- * $DragonFly: src/sys/vm/pmap.h,v 1.29 2008/08/25 17:01:42 dillon Exp $
  */
 
 /*
@@ -161,7 +160,7 @@ vm_paddr_t	 pmap_extract (pmap_t pmap, vm_offset_t va);
 void		 pmap_growkernel (vm_offset_t, vm_offset_t);
 void		 pmap_init (void);
 boolean_t	 pmap_is_modified (struct vm_page *m);
-boolean_t	 pmap_ts_referenced (struct vm_page *m);
+int		 pmap_ts_referenced (struct vm_page *m);
 vm_offset_t	 pmap_map (vm_offset_t *, vm_paddr_t, vm_paddr_t, int);
 void		 pmap_object_init_pt (pmap_t pmap, vm_offset_t addr,
 		    vm_prot_t prot, vm_object_t object, vm_pindex_t pindex,
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 433a1b3977..a96cde4cca 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -1473,7 +1473,7 @@ swap_pager_getpage(vm_object_t object, vm_page_t *mpp, int seqaccess)
  */
 void
 swap_pager_putpages(vm_object_t object, vm_page_t *m, int count,
-		    boolean_t sync, int *rtvals)
+		    int sync, int *rtvals)
 {
 	int i;
 	int n = 0;
diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index 4653f3a49b..6414ace886 100644
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -37,7 +37,6 @@
  *
  *	from: @(#)swap_pager.h	7.1 (Berkeley) 12/5/90
  * $FreeBSD: src/sys/vm/swap_pager.h,v 1.28.2.1 2000/10/13 07:13:23 dillon Exp $
- * $DragonFly: src/sys/vm/swap_pager.h,v 1.6 2008/08/10 22:09:52 dillon Exp $
  */
 
 /*
@@ -96,7 +95,7 @@ extern int vm_swapcache_use_chflags;
 extern struct blist *swapblist;
 extern int nswap_lowat, nswap_hiwat;
 
-void swap_pager_putpages (vm_object_t, struct vm_page **, int, boolean_t, int *);
+void swap_pager_putpages (vm_object_t, struct vm_page **, int, int, int *);
 boolean_t swap_pager_haspage (vm_object_t object, vm_pindex_t pindex);
 int swap_pager_swapoff (int devidx);
 
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 1d15720836..76ba0d5e2f 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -318,7 +318,7 @@ void vm_object_deallocate_list(struct vm_object_dealloc_list **);
 void vm_object_terminate (vm_object_t);
 void vm_object_set_writeable_dirty (vm_object_t);
 void vm_object_init (void);
-void vm_object_page_clean (vm_object_t, vm_pindex_t, vm_pindex_t, boolean_t);
+void vm_object_page_clean (vm_object_t, vm_pindex_t, vm_pindex_t, int);
 void vm_object_page_remove (vm_object_t, vm_pindex_t, vm_pindex_t, boolean_t);
 void vm_object_pmap_copy (vm_object_t, vm_pindex_t, vm_pindex_t);
 void vm_object_pmap_copy_1 (vm_object_t, vm_pindex_t, vm_pindex_t);
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index 3640e2b819..193813f2dd 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -127,7 +127,7 @@ dead_pager_putpages(vm_object_t object, vm_page_t *m, int count, int flags,
 /*
  * No requirements.
  */
-static int
+static boolean_t
 dead_pager_haspage(vm_object_t object, vm_pindex_t pindex)
 {
 	return FALSE;
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 80514f214e..16722999cc 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -75,7 +75,7 @@
 
 static void vnode_pager_dealloc (vm_object_t);
 static int vnode_pager_getpage (vm_object_t, vm_page_t *, int);
-static void vnode_pager_putpages (vm_object_t, vm_page_t *, int, boolean_t, int *);
+static void vnode_pager_putpages (vm_object_t, vm_page_t *, int, int, int *);
 static boolean_t vnode_pager_haspage (vm_object_t, vm_pindex_t);
 
 struct pagerops vnodepagerops = {
@@ -624,7 +624,7 @@ vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *mpp, int bytecount,
  */
 static void
 vnode_pager_putpages(vm_object_t object, vm_page_t *m, int count,
-		     boolean_t sync, int *rtvals)
+		     int sync, int *rtvals)
 {
 	int rtval;
 	struct vnode *vp;
diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h
index 986e057ad0..8925f3d125 100644
--- a/sys/vm/vnode_pager.h
+++ b/sys/vm/vnode_pager.h
@@ -37,7 +37,6 @@
  *
  *	@(#)vnode_pager.h	8.1 (Berkeley) 6/11/93
  * $FreeBSD: src/sys/vm/vnode_pager.h,v 1.14 1999/12/29 04:55:12 peter Exp $
- * $DragonFly: src/sys/vm/vnode_pager.h,v 1.6 2006/05/20 02:42:15 dillon Exp $
  */
 
 #ifndef	_VM_VNODE_PAGER_H_
@@ -60,8 +59,7 @@ struct vnode *vnode_pager_lock (vm_object_t);
  * XXX should go away soon.
  */
 int vnode_pager_generic_getpages (struct vnode *, vm_page_t *, int, int, int);
-int vnode_pager_generic_putpages (struct vnode *, vm_page_t *, int,
-					boolean_t, int *);
+int vnode_pager_generic_putpages (struct vnode *, vm_page_t *, int, int, int *);
 #endif
 
 #endif				/* _VM_VNODE_PAGER_H_ */