Replace all ovbcopy with memmove; swap the src and dst arguments too

ok otto

9 files changed, 29 insertions, 29 deletions

diff --git a/sys/dev/ic/acx100.c b/sys/dev/ic/acx100.c
index ebf156781ab..bfa52bda446 100644
--- a/sys/dev/ic/acx100.c
+++ b/sys/dev/ic/acx100.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx100.c,v 1.22 2012/10/27 16:13:28 claudio Exp $ */
+/*	$OpenBSD: acx100.c,v 1.23 2013/06/11 18:15:53 deraadt Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -732,7 +732,7 @@ acx100_proc_wep_rxbuf(struct acx_softc *sc, struct mbuf *m, int *len)
 	*len = *len - IEEEWEP_EXLEN;
 
 	/* Move MAC header toward frame body */
-	ovbcopy(f, (uint8_t *)f + IEEEWEP_IVLEN, mac_hdrlen);
+	memmove((uint8_t *)f + IEEEWEP_IVLEN, f, mac_hdrlen);
 	m_adj(m, IEEEWEP_IVLEN);
 
 #undef IEEEWEP_EXLEN
diff --git a/sys/dev/ic/ar5008.c b/sys/dev/ic/ar5008.c
index 83fb33e18e3..ac6a7d39f3a 100644
--- a/sys/dev/ic/ar5008.c
+++ b/sys/dev/ic/ar5008.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5008.c,v 1.21 2012/08/25 12:14:31 kettenis Exp $	*/
+/*	$OpenBSD: ar5008.c,v 1.22 2013/06/11 18:15:53 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -907,7 +907,7 @@ ar5008_rx_process(struct athn_softc *sc)
 	if (!(wh->i_fc[0] & IEEE80211_FC0_TYPE_CTL)) {
 		u_int hdrlen = ieee80211_get_hdrlen(wh);
 		if (hdrlen & 3) {
-			ovbcopy(wh, (caddr_t)wh + 2, hdrlen);
+			memmove((caddr_t)wh + 2, wh, hdrlen);
 			m_adj(m, 2);
 		}
 	}
diff --git a/sys/dev/ic/ar9003.c b/sys/dev/ic/ar9003.c
index 7ad600d0bc9..86d19cb263e 100644
--- a/sys/dev/ic/ar9003.c
+++ b/sys/dev/ic/ar9003.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9003.c,v 1.25 2012/10/20 09:53:32 stsp Exp $	*/
+/*	$OpenBSD: ar9003.c,v 1.26 2013/06/11 18:15:53 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1024,7 +1024,7 @@ ar9003_rx_process(struct athn_softc *sc, int qid)
 	if (!(wh->i_fc[0] & IEEE80211_FC0_TYPE_CTL)) {
 		u_int hdrlen = ieee80211_get_hdrlen(wh);
 		if (hdrlen & 3) {
-			ovbcopy(wh, (caddr_t)wh + 2, hdrlen);
+			memmove((caddr_t)wh + 2, wh, hdrlen);
 			m_adj(m, 2);
 		}
 	}
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index d420a95a306..0fad289564d 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2860.c,v 1.67 2012/10/12 19:53:24 haesbaert Exp $	*/
+/*	$OpenBSD: rt2860.c,v 1.68 2013/06/11 18:15:53 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1312,7 +1312,7 @@ rt2860_rx_intr(struct rt2860_softc *sc)
 		/* HW may insert 2 padding bytes after 802.11 header */
 		if (rxd->flags & htole32(RT2860_RX_L2PAD)) {
 			u_int hdrlen = ieee80211_get_hdrlen(wh);
-			ovbcopy(wh, (caddr_t)wh + 2, hdrlen);
+			memmove((caddr_t)wh + 2, wh, hdrlen);
 			m->m_data += 2;
 			wh = mtod(m, struct ieee80211_frame *);
 		}
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index de58cd008a1..1b4eee7daaa 100644
--- a/sys/dev/pci/if_iwn.c
+++ b/sys/dev/pci/if_iwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwn.c,v 1.119 2013/05/29 23:16:52 yuo Exp $	*/
+/*	$OpenBSD: if_iwn.c,v 1.120 2013/06/11 18:15:52 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1826,7 +1826,7 @@ iwn_ccmp_decap(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_key *k)
 
 	/* Clear Protected bit and strip IV. */
 	wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
-	ovbcopy(wh, mtod(m, caddr_t) + IEEE80211_CCMP_HDRLEN, hdrlen);
+	memmove(mtod(m, caddr_t) + IEEE80211_CCMP_HDRLEN, wh, hdrlen);
 	m_adj(m, IEEE80211_CCMP_HDRLEN);
 	/* Strip MIC. */
 	m_adj(m, -IEEE80211_CCMP_MICLEN);
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index f4f93b357b2..693bfb9c32d 100644
--- a/sys/dev/pci/if_wpi.c
+++ b/sys/dev/pci/if_wpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wpi.c,v 1.110 2011/06/02 18:36:53 mk Exp $	*/
+/*	$OpenBSD: if_wpi.c,v 1.111 2013/06/11 18:15:52 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2006-2008
@@ -1155,7 +1155,7 @@ wpi_ccmp_decap(struct wpi_softc *sc, struct mbuf *m, struct ieee80211_key *k)
 
 	/* Clear Protected bit and strip IV. */
 	wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
-	ovbcopy(wh, mtod(m, caddr_t) + IEEE80211_CCMP_HDRLEN, hdrlen);
+	memmove(mtod(m, caddr_t) + IEEE80211_CCMP_HDRLEN, wh, hdrlen);
 	m_adj(m, IEEE80211_CCMP_HDRLEN);
 	/* Strip MIC. */
 	m_adj(m, -IEEE80211_CCMP_MICLEN);
diff --git a/sys/dev/pcmcia/cfxga.c b/sys/dev/pcmcia/cfxga.c
index 952ae0fec38..efbe02bf046 100644
--- a/sys/dev/pcmcia/cfxga.c
+++ b/sys/dev/pcmcia/cfxga.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cfxga.c,v 1.22 2013/05/30 16:15:02 deraadt Exp $	*/
+/*	$OpenBSD: cfxga.c,v 1.23 2013/06/11 18:15:55 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, Matthieu Herrb and Miodrag Vallat
@@ -1050,8 +1050,8 @@ cfxga_copycols(void *cookie, int row, int src, int dst, int num)
 	int sx, dx, y, cx, cy;
 
 	/* Copy columns in backing store. */
-	ovbcopy(scr->scr_mem + row * ri->ri_cols + src,
-	    scr->scr_mem + row * ri->ri_cols + dst,
+	memmove(scr->scr_mem + row * ri->ri_cols + dst,
+	    scr->scr_mem + row * ri->ri_cols + src,
 	    num * sizeof(struct wsdisplay_charcell));
 
 	if (scr != scr->scr_sc->sc_active)
@@ -1073,8 +1073,8 @@ cfxga_copyrows(void *cookie, int src, int dst, int num)
 	int x, sy, dy, cx, cy;
 
 	/* Copy rows in backing store. */
-	ovbcopy(scr->scr_mem + src * ri->ri_cols,
-	    scr->scr_mem + dst * ri->ri_cols,
+	memmove(scr->scr_mem + dst * ri->ri_cols,
+	    scr->scr_mem + src * ri->ri_cols,
 	    num * ri->ri_cols * sizeof(struct wsdisplay_charcell));
 
 	if (scr != scr->scr_sc->sc_active)
@@ -1144,8 +1144,8 @@ cfxga_eraserows(void *cookie, int row, int num, long attr)
 		scr->scr_mem[row * ri->ri_cols + x].attr = attr;
 	}
 	for (y = 1; y < num; y++)
-		ovbcopy(scr->scr_mem + row * ri->ri_cols,
-		    scr->scr_mem + (row + y) * ri->ri_cols,
+		memmove(scr->scr_mem + (row + y) * ri->ri_cols,
+		    scr->scr_mem + row * ri->ri_cols,
 		    ri->ri_cols * sizeof(struct wsdisplay_charcell));
 
 	if (scr != scr->scr_sc->sc_active)
diff --git a/sys/dev/rasops/rasops.c b/sys/dev/rasops/rasops.c
index 7d89e8f6737..37f85b7d523 100644
--- a/sys/dev/rasops/rasops.c
+++ b/sys/dev/rasops/rasops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rasops.c,v 1.24 2013/05/17 12:03:11 kettenis Exp $	*/
+/*	$OpenBSD: rasops.c,v 1.25 2013/06/11 18:15:55 deraadt Exp $	*/
 /*	$NetBSD: rasops.c,v 1.35 2001/02/02 06:01:01 marcus Exp $	*/
 
 /*-
@@ -698,7 +698,7 @@ rasops_copycols(void *cookie, int row, int src, int dst, int num)
 #endif
 	{
 		while (height--) {
-			ovbcopy(sp, dp, num);
+			memmove(dp, sp, num);
 			dp += ri->ri_stride;
 			sp += ri->ri_stride;
 		}
@@ -1205,7 +1205,7 @@ rasops_copychar(void *cookie, int srcrow, int dstrow, int srccol, int dstcol)
 #endif
 	{
 		while (height--) {
-			ovbcopy(sp, dp, ri->ri_xscale);
+			memmove(dp, sp, ri->ri_xscale);
 			dp += ri->ri_stride;
 			sp += ri->ri_stride;
 		}
@@ -1517,7 +1517,7 @@ rasops_vcons_copycols(void *cookie, int row, int src, int dst, int num)
 	struct rasops_screen *scr = cookie;
 	int cols = scr->rs_ri->ri_cols;
 
-	ovbcopy(&scr->rs_bs[row * cols + src], &scr->rs_bs[row * cols + dst],
+	memmove(&scr->rs_bs[row * cols + dst], &scr->rs_bs[row * cols + src],
 	    num * sizeof(struct wsdisplay_charcell));
 
 	if (!scr->rs_visible)
@@ -1550,7 +1550,7 @@ rasops_vcons_copyrows(void *cookie, int src, int dst, int num)
 	struct rasops_screen *scr = cookie;
 	int cols = scr->rs_ri->ri_cols;
 
-	ovbcopy(&scr->rs_bs[src * cols], &scr->rs_bs[dst * cols],
+	memmove(&scr->rs_bs[dst * cols], &scr->rs_bs[src * cols],
 	    num * cols * sizeof(struct wsdisplay_charcell));
 
 	if (!scr->rs_visible)
diff --git a/sys/dev/wscons/wsemul_vt100_subr.c b/sys/dev/wscons/wsemul_vt100_subr.c
index f34c9b28651..ecb03a0549d 100644
--- a/sys/dev/wscons/wsemul_vt100_subr.c
+++ b/sys/dev/wscons/wsemul_vt100_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemul_vt100_subr.c,v 1.17 2009/09/05 14:49:20 miod Exp $ */
+/* $OpenBSD: wsemul_vt100_subr.c,v 1.18 2013/06/11 18:15:55 deraadt Exp $ */
 /* $NetBSD: wsemul_vt100_subr.c,v 1.7 2000/04/28 21:56:16 mycroft Exp $ */
 
 /*
@@ -70,8 +70,8 @@ wsemul_vt100_scrollup(struct wsemul_vt100_emuldata *edp, int n)
 		return rc;
 	if (edp->dblwid) {
 		if (help > 0)
-			ovbcopy(&edp->dblwid[edp->scrreg_startrow + n],
-			    &edp->dblwid[edp->scrreg_startrow], help);
+			memmove(&edp->dblwid[edp->scrreg_startrow],
+			    &edp->dblwid[edp->scrreg_startrow + n], help);
 		memset(&edp->dblwid[edp->scrreg_startrow + help], 0, n);
 	}
 	CHECK_DW;
@@ -105,8 +105,8 @@ wsemul_vt100_scrolldown(struct wsemul_vt100_emuldata *edp, int n)
 		return rc;
 	if (edp->dblwid) {
 		if (help > 0)
-			ovbcopy(&edp->dblwid[edp->scrreg_startrow],
-			    &edp->dblwid[edp->scrreg_startrow + n], help);
+			memmove(&edp->dblwid[edp->scrreg_startrow + n],
+			    &edp->dblwid[edp->scrreg_startrow], help);
 		memset(&edp->dblwid[edp->scrreg_startrow], 0, n);
 	}
 	CHECK_DW;