Avoid assignments to cast expressions.

Reviewed by:	md5
Approved by:	das (mentor)

4 files changed, 8 insertions, 8 deletions

diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index 8f9c5b3..44a9e8c 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -347,7 +347,7 @@ kvm_read(kd, kva, buf, len)
 	size_t len;
 {
 	int cc;
-	void *cp;
+	char *cp;
 
 	if (ISALIVE(kd)) {
 		/*
@@ -394,11 +394,11 @@ kvm_read(kd, kva, buf, len)
 			 */
 			if (cc == 0)
 				break;
-			(char *)cp += cc;
+			cp += cc;
 			kva += cc;
 			len -= cc;
 		}
-		return ((char *)cp - (char *)buf);
+		return (cp - (char *)buf);
 	}
 	/* NOTREACHED */
 }
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index efbfaf0..690c28a 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1748,7 +1748,7 @@ soopt_mcopyin(struct sockopt *sopt, struct mbuf *m)
 		} else
 			bcopy(sopt->sopt_val, mtod(m, char *), m->m_len);
 		sopt->sopt_valsize -= m->m_len;
-		(caddr_t)sopt->sopt_val += m->m_len;
+		sopt->sopt_val = (char *)sopt->sopt_val + m->m_len;
 		m = m->m_next;
 	}
 	if (m != NULL) /* should be allocated enoughly at ip6_sooptmcopyin() */
@@ -1778,7 +1778,7 @@ soopt_mcopyout(struct sockopt *sopt, struct mbuf *m)
 		} else
 			bcopy(mtod(m, char *), sopt->sopt_val, m->m_len);
 	       sopt->sopt_valsize -= m->m_len;
-	       (caddr_t)sopt->sopt_val += m->m_len;
+	       sopt->sopt_val = (char *)sopt->sopt_val + m->m_len;
 	       valsize += m->m_len;
 	       m = m->m_next;
 	}
diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c
index c91b492..b11b867 100644
--- a/sys/ufs/ffs/ffs_snapshot.c
+++ b/sys/ufs/ffs/ffs_snapshot.c
@@ -367,7 +367,7 @@ restart:
 	space = malloc((u_long)size, M_UFSMNT, M_WAITOK);
 	copy_fs->fs_csp = space;
 	bcopy(fs->fs_csp, copy_fs->fs_csp, fs->fs_cssize);
-	(char *)space += fs->fs_cssize;
+	space = (char *)space + fs->fs_cssize;
 	loc = howmany(fs->fs_cssize, fs->fs_fsize);
 	i = fs->fs_frag - loc % fs->fs_frag;
 	len = (i == fs->fs_frag) ? 0 : i * fs->fs_fsize;
@@ -381,7 +381,7 @@ restart:
 			goto out1;
 		}
 		bcopy(bp->b_data, space, (u_int)len);
-		(char *)space += len;
+		space = (char *)space + len;
 		bp->b_flags |= B_INVAL | B_NOCACHE;
 		brelse(bp);
 	}
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index 3a3f029..cd35cb0 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -485,7 +485,7 @@ search(u_long addr, action_fn *action)
 	for (next = buf; next < lim; next += rtm->rtm_msglen) {
 		rtm = (struct rt_msghdr *)next;
 		sin2 = (struct sockaddr_inarp *)(rtm + 1);
-		(char *)sdl = (char *)sin2 + SA_SIZE(sin2);
+		sdl = (struct sockaddr_dl *)((char *)sin2 + SA_SIZE(sin2));
 		if (rifname && if_indextoname(sdl->sdl_index, ifname) &&
 		    strcmp(ifname, rifname))
 			continue;