diff options
Diffstat (limited to 'sys/arch/sgi')
| -rw-r--r-- | sys/arch/sgi/dev/impact.c | 10 | ||||
| -rw-r--r-- | sys/arch/sgi/gio/grtwo.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/sgi/dev/impact.c b/sys/arch/sgi/dev/impact.c index 023ddd88913..6084a52e272 100644 --- a/sys/arch/sgi/dev/impact.c +++ b/sys/arch/sgi/dev/impact.c @@ -1,4 +1,4 @@ -/* $OpenBSD: impact.c,v 1.2 2012/04/19 21:02:27 miod Exp $ */ +/* $OpenBSD: impact.c,v 1.3 2013/06/11 18:15:55 deraadt Exp $ */ /* * Copyright (c) 2010, 2012 Miodrag Vallat. @@ -633,7 +633,7 @@ impact_copycols(void *cookie, int row, int src, int dst, int num) /* Copy columns in backing store. */ cell = scr->bs + row * ri->ri_cols; - ovbcopy(cell + src, cell + dst, + memmove(cell + dst, cell + src, num * sizeof(struct wsdisplay_charcell)); /* Repaint affected area */ @@ -681,7 +681,7 @@ impact_copyrows(void *cookie, int src, int dst, int num) /* Copy rows in backing store. */ cell = scr->bs + dst * ri->ri_cols; - ovbcopy(scr->bs + src * ri->ri_cols, cell, + memmove(cell, scr->bs + src * ri->ri_cols, num * ri->ri_cols * sizeof(struct wsdisplay_charcell)); /* Repaint affected area */ @@ -708,8 +708,8 @@ impact_eraserows(void *cookie, int row, int num, long attr) cell->attr = attr; } for (y = 1; y < num; y++) - ovbcopy(scr->bs + row * ri->ri_cols, - scr->bs + (row + y) * ri->ri_cols, + memmove(scr->bs + (row + y) * ri->ri_cols, + scr->bs + row * ri->ri_cols, ri->ri_cols * sizeof(struct wsdisplay_charcell)); ri->ri_ops.unpack_attr(cookie, attr, &fg, &bg, NULL); diff --git a/sys/arch/sgi/gio/grtwo.c b/sys/arch/sgi/gio/grtwo.c index 6951262436e..34c890d1abb 100644 --- a/sys/arch/sgi/gio/grtwo.c +++ b/sys/arch/sgi/gio/grtwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grtwo.c,v 1.5 2012/05/10 21:29:28 miod Exp $ */ +/* $OpenBSD: grtwo.c,v 1.6 2013/06/11 18:15:55 deraadt Exp $ */ /* $NetBSD: grtwo.c,v 1.11 2009/11/22 19:09:15 mbalmer Exp $ */ /* @@ -661,7 +661,7 @@ grtwo_copycols(void *c, int row, int src, int dst, int ncol) /* Copy columns in backing store. */ cell = dc->dc_bs + row * ri->ri_cols; - ovbcopy(cell + src, cell + dst, ncol * sizeof(*cell)); + memmove(cell + dst, cell + src, ncol * sizeof(*cell)); if (src > dst) { /* may overlap, copy cell by cell */ @@ -717,7 +717,7 @@ grtwo_copyrows(void *c, int src, int dst, int nrow) /* Copy rows in backing store. */ cell = dc->dc_bs + dst * ri->ri_cols; - ovbcopy(dc->dc_bs + src * ri->ri_cols, cell, + memmove(cell, dc->dc_bs + src * ri->ri_cols, nrow * ri->ri_cols * sizeof(*cell)); if (src > dst) { @@ -754,8 +754,8 @@ grtwo_eraserows(void *c, int startrow, int nrow, long attr) cell->attr = attr; } for (i = 1; i < nrow; i++) - ovbcopy(dc->dc_bs + startrow * ri->ri_cols, - dc->dc_bs + (startrow + i) * ri->ri_cols, + memmove(dc->dc_bs + (startrow + i) * ri->ri_cols, + dc->dc_bs + startrow * ri->ri_cols, ri->ri_cols * sizeof(*cell)); ri->ri_ops.unpack_attr(ri, attr, &fg, &bg, NULL); |