bcopy -> memcpy

diff --git a/bin/aecho/aecho.c b/bin/aecho/aecho.c
index 0bf9d4d5ec281811c762194c2314319b80c2c5a0..3ce4fbfd0838e040751783b896ec23721c594d7e 100644 (file)
--- a/bin/aecho/aecho.c
+++ b/bin/aecho/aecho.c
@@ -1,5 +1,5 @@
 /*
- * $Id: aecho.c,v 1.4 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: aecho.c,v 1.5 2001-08-03 22:07:22 srittau Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -90,7 +90,7 @@ void aep_send()
     p = buf;
     *p++ = DDPTYPE_AEP;
     *p++ = AEPOP_REQUEST;
-    bcopy( &seq, p, sizeof( unsigned int ));
+    memcpy( p, &seq, sizeof( unsigned int ));
     p += sizeof( unsigned int );
     seq++;
 
@@ -98,7 +98,7 @@ void aep_send()
        perror( "gettimeofday" );
        exit( 1 );
     }
-    bcopy( &tv, p, sizeof( struct timeval ));
+    memcpy( p, &tv, sizeof( struct timeval ));
     p += sizeof( struct timeval );
 
     if ( netddp_sendto( s, buf, p - buf, 0, (struct sockaddr *) &target,
@@ -236,9 +236,9 @@ int main( ac, av )
            perror( "gettimeofday" );
            exit( 1 );
        }
-       bcopy( p, &seq, sizeof( unsigned int ));
+       memcpy( &seq, p, sizeof( unsigned int ));
        p += sizeof( unsigned int );
-       bcopy( p, &atv, sizeof( struct timeval ));
+       memcpy( &atv, p, sizeof( struct timeval ));
        nrecv++;
        ms = ( tv.tv_sec - atv.tv_sec ) * 1000 +
                ( tv.tv_usec - atv.tv_usec ) / 1000;

diff --git a/etc/atalkd/nbp.c b/etc/atalkd/nbp.c
index cdd4cec4e8f68d724faba7ea88c021d4e82e366c..7adcd98261eb247c870d85c1b29b72a84a5e12e4 100644 (file)
--- a/etc/atalkd/nbp.c
+++ b/etc/atalkd/nbp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nbp.c,v 1.3 2001-06-25 20:13:45 rufustfirefly Exp $
+ * $Id: nbp.c,v 1.4 2001-08-03 22:11:54 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -55,7 +55,7 @@ void nbp_ack( fd, nh_op, nh_id, to )
     nh.nh_id = nh_id;
     data = packet;
     *data++ = DDPTYPE_NBP;
-    bcopy( &nh, data, SZ_NBPHDR );
+    memcpy( data, &nh, SZ_NBPHDR );
     data += SZ_NBPHDR;
     if ( sendto( fd, packet, data - packet, 0, (struct sockaddr *)to,
            sizeof( struct sockaddr_at )) < 0 ) {
@@ -443,19 +443,19 @@ Can't find route's interface!" );
                        locallkup = 1;
                    }
                    nh.nh_op = NBPOP_LKUP;
-                   bcopy( &nh, nbpop, SZ_NBPHDR );
+                   memcpy( nbpop, &nh, SZ_NBPHDR );
                    sat.sat_addr.s_net = rtmp->rt_firstnet;
                    sat.sat_addr.s_node = ATADDR_BCAST;
                } else {
                    if ( rtmp->rt_gate == 0 ) {
                        nh.nh_op = NBPOP_LKUP;
-                       bcopy( &nh, nbpop, SZ_NBPHDR );
+                       memcpy( nbpop, &nh, SZ_NBPHDR );
                        sat.sat_addr.s_net = 0;
                        sat.sat_addr.s_node = ATADDR_BCAST;
                        locallkup = 1;
                    } else {
                        nh.nh_op = NBPOP_FWD;
-                       bcopy( &nh, nbpop, SZ_NBPHDR );
+                       memcpy( nbpop, &nh, SZ_NBPHDR );
                        sat.sat_addr.s_net = rtmp->rt_firstnet;
                        sat.sat_addr.s_node = 0;
                    }
@@ -480,7 +480,7 @@ Can't find route's interface!" );
         /* send lkup on net. we need to make sure we're a router. */
         if ( !locallkup && (ap->ap_iface->i_flags & IFACE_ISROUTER)) {
            nh.nh_op = NBPOP_LKUP;
-           bcopy( &nh, nbpop, SZ_NBPHDR );
+           memcpy( nbpop, &nh, SZ_NBPHDR );
            from->sat_addr.s_net = 0;
            from->sat_addr.s_node = ATADDR_BCAST;
            if ( sendto( ap->ap_fd, data - len, len, 0, (struct sockaddr *)from,
@@ -555,7 +555,7 @@ Can't find route's interface!" );
                cc = data - packet;
                data = packet;
                *data++ = DDPTYPE_NBP;
-               bcopy( &nh, data, SZ_NBPHDR );
+               memcpy( data, &nh, SZ_NBPHDR );
 
                if ( sendto( ap->ap_fd, packet, cc, 0,
                        (struct sockaddr *)&nn.nn_sat,
@@ -601,7 +601,7 @@ Can't find route's interface!" );
             */
            if ( ntab->nt_nve.nn_zonelen ) {
                *data++ = ntab->nt_nve.nn_zonelen;
-               bcopy( ntab->nt_nve.nn_zone, data, ntab->nt_nve.nn_zonelen );
+               memcpy( data, ntab->nt_nve.nn_zone, ntab->nt_nve.nn_zonelen );
                data += ntab->nt_nve.nn_zonelen;
            } else {
                *data++ = 1;
@@ -617,7 +617,7 @@ Can't find route's interface!" );
            cc = data - packet;
            data = packet;
            *data++ = DDPTYPE_NBP;
-           bcopy( &nh, data, SZ_NBPHDR );
+           memcpy( data, &nh, SZ_NBPHDR );
 
            if ( sendto( ap->ap_fd, packet, cc, 0,
                    (struct sockaddr *)&nn.nn_sat,