bcopy -> memcpy, bzero -> memset

diff --git a/etc/papd/lp.c b/etc/papd/lp.c
index 37c194041ff1005fbf851701e3dd68c1cb578871..b912242f90ab385d736d15a7d75cd762bf069ca4 100644 (file)
--- a/etc/papd/lp.c
+++ b/etc/papd/lp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: lp.c,v 1.9 2001-06-25 20:13:45 rufustfirefly Exp $
+ * $Id: lp.c,v 1.10 2001-08-03 22:13:28 srittau Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -553,7 +553,7 @@ int lp_conn_unix()
        syslog( LOG_ERR, "lp_conn_unix socket: %m" );
        return( -1 );
     }
-    bzero( &saun, sizeof( struct sockaddr_un ));
+    memset( &saun, 0, sizeof( struct sockaddr_un ));
     saun.sun_family = AF_UNIX;
     strcpy( saun.sun_path, _PATH_DEVPRINTER );
     if ( connect( s, (struct sockaddr *)&saun,
@@ -599,10 +599,10 @@ int lp_conn_inet()
        return( -1 );
     }
 
-    bzero( &sin, sizeof( struct sockaddr_in ));
+    memset( &sin, 0, sizeof( struct sockaddr_in ));
     sin.sin_family = AF_INET;
 /*    sin.sin_addr.s_addr = htonl( INADDR_LOOPBACK ); */
-    bcopy( hp->h_addr, &sin.sin_addr, hp->h_length );
+    memcpy( &sin.sin_addr, hp->h_addr, hp->h_length );
     sin.sin_port = sp->s_port;
 
     if ( connect( privfd, (struct sockaddr *)&sin,

diff --git a/etc/papd/main.c b/etc/papd/main.c
index 03b088c2c9aaa8a4ac79acf5f92e56ba82e0038e..e60ca5888656a8a7acf4f81b9e11dc2c853911e4 100644 (file)
--- a/etc/papd/main.c
+++ b/etc/papd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.8 2001-07-31 19:50:14 srittau Exp $
+ * $Id: main.c,v 1.9 2001-08-03 22:13:28 srittau Exp $
  *
  * Copyright (c) 1990,1995 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -313,7 +313,7 @@ int main( ac, av )
            if ( FD_ISSET( atp_fileno( pr->p_atp ), &fdset )) {
                int             err = 0;
 
-               bzero( &sat, sizeof( struct sockaddr_at ));
+               memset( &sat, 0, sizeof( struct sockaddr_at ));
 #ifdef BSD4_4
                sat.sat_len = sizeof( struct sockaddr_at );
 #endif /* BSD4_4 */
@@ -531,7 +531,7 @@ void getprinters( cf )
            perror( "malloc" );
            exit( 1 );
        }
-       bzero( pr, sizeof( struct printer ));
+       memset( pr, 0, sizeof( struct printer ));
 
        name = defprinter.p_name;
        type = defprinter.p_type;

diff --git a/etc/papd/session.c b/etc/papd/session.c
index 928ffca2efa7829b40ea5f97cb1edbc471e73b0a..7c19aebecc5f78fd8a2e135d5f2e888d1cdcf830 100644 (file)
--- a/etc/papd/session.c
+++ b/etc/papd/session.c
@@ -1,5 +1,5 @@
 /*
- * $Id: session.c,v 1.7 2001-06-25 20:13:45 rufustfirefly Exp $
+ * $Id: session.c,v 1.8 2001-08-03 22:13:28 srittau Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -88,7 +88,7 @@ int session( atp, sat )
     cbuf[ 1 ] = PAP_READ;
     if (++seq == 0) seq = 1;
     netseq = htons( seq );
-    bcopy( &netseq, &cbuf[ 2 ], sizeof( netseq ));
+    memcpy( &cbuf[ 2 ], &netseq, sizeof( netseq ));
     atpb.atp_saddr = sat;
     atpb.atp_sreqdata = cbuf;
     atpb.atp_sreqdlen = 4;             /* bytes in SendData request */
@@ -164,7 +164,7 @@ int session( atp, sat )
                /*
                 * Other side is ready for some data.
                 */
-               bcopy( &cbuf[ 2 ], &netseq, sizeof( netseq ));
+               memcpy( &netseq, &cbuf[ 2 ], sizeof( netseq ));
                if ( netseq != 0 ) {
                    if ( rseq != ntohs( netseq )) {
                        break;