Fix various compilation warnings for gcc-4.2.

Approved by:	re (bruce)

8 files changed, 13 insertions, 24 deletions

diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c
index 12b9f53..4cfdf1a 100644
--- a/sys/netatm/atm_cm.c
+++ b/sys/netatm/atm_cm.c
@@ -2612,7 +2612,7 @@ atm_cm_timeout(tip)
 	 * Back-off to cvc control block
 	 */
 	cvp = (Atm_connvc *)
-			((caddr_t)tip - (int)(&((Atm_connvc *)0)->cvc_time));
+		((caddr_t)tip - offsetof(Atm_connvc, cvc_time));
 
 	/*
 	 * Process timeout based on protocol state
diff --git a/sys/netatm/ipatm/ipatm_event.c b/sys/netatm/ipatm/ipatm_event.c
index c266afa..4f53347 100644
--- a/sys/netatm/ipatm/ipatm_event.c
+++ b/sys/netatm/ipatm/ipatm_event.c
@@ -82,7 +82,7 @@ ipatm_timeout(tip)
 	 * Back-off to ipvcc control block
 	 */
 	ivp = (struct ipvcc *)
-			((caddr_t)tip - (int)(&((struct ipvcc *)0)->iv_time));
+		((caddr_t)tip - offsetof(struct ipvcc, iv_time));
 
 	/*
 	 * Process timeout based on protocol state
diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c
index 8e57e6e..32ee4d1 100644
--- a/sys/netatm/spans/spans_proto.c
+++ b/sys/netatm/spans/spans_proto.c
@@ -214,7 +214,7 @@ spans_timer(tip)
 	 * Back-off to SPANS control block
 	 */
 	spp = (struct spans *)
-		((caddr_t)tip - (int)(&((struct spans *)0)->sp_time));
+		((caddr_t)tip - offsetof(struct spans, sp_time));
 
 	ATM_DEBUG2("spans_timer: spp=%p,state=%d\n",
 			spp, spp->sp_state);
@@ -363,8 +363,8 @@ spans_vctimer(tip)
 	/*
 	 * Get VCCB and SPANS control block addresses
 	 */
-	svp = (struct spans_vccb *) ((caddr_t)tip -
-			(int)(&((struct vccb *)0)->vc_time));
+	svp = (struct spans_vccb *)
+		((caddr_t)tip - offsetof(struct vccb, vc_time));
 	spp = (struct spans *)svp->sv_pif->pif_siginst;
 
 	ATM_DEBUG3("spans_vctimer: svp=%p, sstate=%d, ustate=%d\n",
diff --git a/sys/netatm/uni/sscf_uni_lower.c b/sys/netatm/uni/sscf_uni_lower.c
index 1286cea..2458ee6 100644
--- a/sys/netatm/uni/sscf_uni_lower.c
+++ b/sys/netatm/uni/sscf_uni_lower.c
@@ -142,7 +142,7 @@ sscf_uni_lower(cmd, tok, arg1, arg2)
 		uvp->uv_lstate = UVL_IDLE;
 
 		STACK_CALL(SSCOP_INIT, uvp->uv_lower, uvp->uv_tokl, cvp, 
-			(int)vers, (int)&sscf_uni_sscop_parms, err);
+			(int)vers, (size_t)&sscf_uni_sscop_parms, err);
 		if (err) {
 			/*
 			 * Should never happen
diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c
index c23a905..a10cf55 100644
--- a/sys/netatm/uni/uniarp.c
+++ b/sys/netatm/uni/uniarp.c
@@ -776,7 +776,7 @@ uniarp_iftimeout(tip)
 	 * Back-off to uniip control block
 	 */
 	uip = (struct uniip *)
-		((caddr_t)tip - (int)(&((struct uniip *)0)->uip_arptime));
+		((caddr_t)tip - offsetof(struct uniip, uip_arptime));
 
 	ATM_DEBUG2("uniarp_iftimeout: uip=%p, state=%d\n", uip, 
 		uip->uip_arpstate);
diff --git a/sys/netatm/uni/uniarp_timer.c b/sys/netatm/uni/uniarp_timer.c
index a5c384d..e60665f 100644
--- a/sys/netatm/uni/uniarp_timer.c
+++ b/sys/netatm/uni/uniarp_timer.c
@@ -90,7 +90,7 @@ uniarp_timeout(tip)
 	 * Back-off to uniarp control block
 	 */
 	uap = (struct uniarp *)
-			((caddr_t)tip - (int)(&((struct uniarp *)0)->ua_time));
+		((caddr_t)tip - offsetof(struct uniarp, ua_time));
 	uip = uap->ua_intf;
 
 
diff --git a/sys/netatm/uni/unisig_decode.h b/sys/netatm/uni/unisig_decode.h
index 9e80d43..c2253a6 100644
--- a/sys/netatm/uni/unisig_decode.h
+++ b/sys/netatm/uni/unisig_decode.h
@@ -58,19 +58,8 @@ struct ie_ent {
 				(struct usfmt *, struct ie_generic *);
 };
 
-/*
- * Macro to give the offset of a field in a generic IE structure
- */
-#define	IE_OFFSET(f) \
-	((int)&((struct ie_generic *) 0)->f)
-
-/*
- * Macro to give the size of a field in a generic IE structure
- */
-#define IE_FSIZE(f) \
-	(sizeof(((struct ie_generic *) 0)->f))
-
-#define IE_OFF_SIZE(f)   IE_OFFSET(f),IE_FSIZE(f)
+#define IE_OFF_SIZE(f)   \
+	offsetof(struct ie_generic, f), (sizeof(((struct ie_generic *) 0)->f))
 
 
 /*
diff --git a/sys/netatm/uni/unisig_proto.c b/sys/netatm/uni/unisig_proto.c
index 08fe235..0e3cee1 100644
--- a/sys/netatm/uni/unisig_proto.c
+++ b/sys/netatm/uni/unisig_proto.c
@@ -88,7 +88,7 @@ unisig_timer(tip)
 	 * Back-off to UNISIG control block
 	 */
 	usp = (struct unisig *)
-		((caddr_t)tip - (int)(&((struct unisig *)0)->us_time));
+		((caddr_t)tip - offsetof(struct unisig, us_time));
 
 	ATM_DEBUG2("unisig_timer: usp=%p,state=%d\n",
 			usp, usp->us_state);
@@ -127,8 +127,8 @@ unisig_vctimer(tip)
 	/*
 	 * Get VCCB and UNISIG control block addresses
 	 */
-	uvp = (struct unisig_vccb *) ((caddr_t)tip -
-			(int)(&((struct vccb *)0)->vc_time));
+	uvp = (struct unisig_vccb *)
+		((caddr_t)tip - offsetof(struct vccb, vc_time));
 	usp = (struct unisig *)uvp->uv_pif->pif_siginst;
 
 	ATM_DEBUG3("unisig_vctimer: uvp=%p, sstate=%d, ustate=%d\n",