Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/alpha/stand bcopy -> memcpy, bzero -> memset



details:   https://anonhg.NetBSD.org/src/rev/4228eaa1fe27
branches:  trunk
changeset: 513044:4228eaa1fe27
user:      wiz <wiz%NetBSD.org@localhost>
date:      Sun Jul 22 15:17:30 2001 +0000

description:
bcopy -> memcpy, bzero -> memset

diffstat:

 sys/arch/alpha/stand/common/OSFpal.c                 |  4 ++--
 sys/arch/alpha/stand/common/boot.c                   |  8 ++++----
 sys/arch/alpha/stand/netboot/if_prom.c               |  8 ++++----
 sys/arch/alpha/stand/setnetbootinfo/setnetbootinfo.c |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diffs (97 lines):

diff -r 758c2c63cd97 -r 4228eaa1fe27 sys/arch/alpha/stand/common/OSFpal.c
--- a/sys/arch/alpha/stand/common/OSFpal.c      Sun Jul 22 15:16:18 2001 +0000
+++ b/sys/arch/alpha/stand/common/OSFpal.c      Sun Jul 22 15:17:30 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: OSFpal.c,v 1.7 1998/09/28 21:21:55 thorpej Exp $ */
+/* $NetBSD: OSFpal.c,v 1.8 2001/07/22 15:17:30 wiz Exp $ */
 
 /*
  * Copyright (c) 1994, 1996 Carnegie-Mellon University.
@@ -63,7 +63,7 @@
                return;
        }
        switch_palcode();
-       bcopy(&p->pcs_palrevisions[PALvar_OSF1], &p->pcs_pal_rev,
+       memcpy(&p->pcs_pal_rev, &p->pcs_palrevisions[PALvar_OSF1],
            sizeof(p->pcs_pal_rev));
        printf("Switch to OSF PAL code succeeded.\n");
 }
diff -r 758c2c63cd97 -r 4228eaa1fe27 sys/arch/alpha/stand/common/boot.c
--- a/sys/arch/alpha/stand/common/boot.c        Sun Jul 22 15:16:18 2001 +0000
+++ b/sys/arch/alpha/stand/common/boot.c        Sun Jul 22 15:17:30 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.25 2000/06/12 23:38:03 matt Exp $ */
+/* $NetBSD: boot.c,v 1.26 2001/07/22 15:17:31 wiz Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -143,12 +143,12 @@
        /*
         * Fill in the bootinfo for the kernel.
         */
-       bzero(&bootinfo_v1, sizeof(bootinfo_v1));
+       memset(&bootinfo_v1, 0, sizeof(bootinfo_v1));
        bootinfo_v1.ssym = marks[MARK_SYM];
        bootinfo_v1.esym = marks[MARK_END];
-       bcopy(name, bootinfo_v1.booted_kernel,
+       memcpy(bootinfo_v1.booted_kernel, name,
            sizeof(bootinfo_v1.booted_kernel));
-       bcopy(boot_flags, bootinfo_v1.boot_flags,
+       memcpy(bootinfo_v1.boot_flags, boot_flags,
            sizeof(bootinfo_v1.boot_flags));
        bootinfo_v1.hwrpb = (void *)HWRPB_ADDR;
        bootinfo_v1.hwrpbsize = ((struct rpb *)HWRPB_ADDR)->rpb_size;
diff -r 758c2c63cd97 -r 4228eaa1fe27 sys/arch/alpha/stand/netboot/if_prom.c
--- a/sys/arch/alpha/stand/netboot/if_prom.c    Sun Jul 22 15:16:18 2001 +0000
+++ b/sys/arch/alpha/stand/netboot/if_prom.c    Sun Jul 22 15:17:30 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_prom.c,v 1.15 1999/11/13 21:38:21 thorpej Exp $ */
+/* $NetBSD: if_prom.c,v 1.16 2001/07/22 15:17:31 wiz Exp $ */
 
 /*
  * Copyright (c) 1997 Christopher G. Demetriou.  All rights reserved.
@@ -144,7 +144,7 @@
                cc = min(cc, len);
        else
                cc = len;
-       bcopy(hate, pkt, cc);
+       memcpy(pkt, hate, cc);
 
        return cc;
 }
@@ -213,7 +213,7 @@
 
        if (netbbinfovalid && netbbinfo.force) {
                printf("boot: using hard-coded ethernet address (forced).\n");
-               bcopy(netbbinfo.ether_addr, desc->myea, sizeof desc->myea);
+               memcpy(desc->myea, netbbinfo.ether_addr, sizeof desc->myea);
        }
 
 gotit:
@@ -224,7 +224,7 @@
        broken_firmware = 1;
         if (netbbinfovalid) {
                 printf("boot: using hard-coded ethernet address.\n");
-                bcopy(netbbinfo.ether_addr, desc->myea, sizeof desc->myea);
+                memcpy(desc->myea, netbbinfo.ether_addr, sizeof desc->myea);
                 goto gotit;
         }
 
diff -r 758c2c63cd97 -r 4228eaa1fe27 sys/arch/alpha/stand/setnetbootinfo/setnetbootinfo.c
--- a/sys/arch/alpha/stand/setnetbootinfo/setnetbootinfo.c      Sun Jul 22 15:16:18 2001 +0000
+++ b/sys/arch/alpha/stand/setnetbootinfo/setnetbootinfo.c      Sun Jul 22 15:17:30 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: setnetbootinfo.c,v 1.10 1999/04/05 02:55:38 cgd Exp $ */
+/* $NetBSD: setnetbootinfo.c,v 1.11 2001/07/22 15:17:32 wiz Exp $ */
 
 /*
  * Copyright (c) 1997 Christopher G. Demetriou
@@ -208,7 +208,7 @@
 
        if (verbose)
                printf("setting netbbinfo structure...\n");
-       bzero(netbbinfop, sizeof *netbbinfop);
+       memset(netbbinfop, 0, sizeof *netbbinfop);
        netbbinfop->magic1 = 0xfeedbabedeadbeefLL;
        netbbinfop->magic2 = 0xfeedbeefdeadbabeLL;
        netbbinfop->set = unset ? 0 : 1;



Home | Main Index | Thread Index | Old Index