step 3: bcopy->memcpy or memmove (chose by hand), twiddle args

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3818 dc483132-0cff-0310-8789-dd5450dbe970

15 files changed, 67 insertions, 62 deletions

diff --git a/src/isode/pepsy/dec.c b/src/isode/pepsy/dec.c
index 85845ce7ac..4f4a416d4a 100644
--- a/src/isode/pepsy/dec.c
+++ b/src/isode/pepsy/dec.c
@@ -9,6 +9,9 @@ static char *rcsid = "$Header$";
  *
  *
  * $Log$
+ * Revision 1.2  1994/06/15 23:28:59  eichin
+ * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args
+ *
  * Revision 1.1  1994/06/10 03:30:23  eichin
  * autoconfed isode for kerberos work
  *
@@ -2064,7 +2067,7 @@ again:
 	    return pepsylose (mod, typ, NULLPE, "setdval:missing OCTET_LEN");
 	i = IVAL(mod, dflt);
 	p = smalloc((int )i + 1);
-	bcopy(PVAL(mod, dflt), p, (int )i);
+	memcpy(p, PVAL(mod, dflt), (int )i);
 	p[i] = '\0';
 	*(char **) (*parm + typ->pe_ucode) = p;
 	*(int *) (*parm + (typ + 1)->pe_ucode) = i;
@@ -2076,7 +2079,7 @@ again:
 	i = IVAL(mod, dflt);
 	no = (i + 7)/8;	/* round up */
 	p = smalloc(no + 1);
-	bcopy(PVAL(mod, dflt), p, no);
+	memcpy(p, PVAL(mod, dflt), no);
 	p[no] = '\0';
 	*(char **) (*parm + typ->pe_ucode) = p;
 	*(int *) (*parm + (typ + 1)->pe_ucode) = i;
diff --git a/src/isode/pepsy/main.c b/src/isode/pepsy/main.c
index 9c5288c963..bf0af1f616 100644
--- a/src/isode/pepsy/main.c
+++ b/src/isode/pepsy/main.c
@@ -7,23 +7,6 @@ static char *rcsid = "$Header$";
 /* 
  * $Header$
  *
- *
- * $Log$
- * Revision 1.2  1994/06/15 21:14:59  eichin
- * step 2: bcmp->memcmp
- *
- * Revision 1.1  1994/06/10 03:30:46  eichin
- * autoconfed isode for kerberos work
- *
- * Revision 1.1  94/06/10  03:19:12  eichin
- * autoconfed isode for kerberos work
- * 
- * Revision 1.1  1994/05/31 20:39:33  eichin
- * reduced-isode release from /mit/isode/isode-subset/src
- *
- * Revision 8.0  91/07/17  12:42:59  isode
- * Release 7.0
- * 
  * 
  */
 
@@ -882,11 +865,11 @@ int	tynum;
         Xparm->t_string = strdup("hello, world\n");
         Xparm->t_string1 = strdup("hello, world\n");
 	p = malloc(30);
-	bcopy("\0001234567890", p, 30);
+	memcpy(p, "\0001234567890", 30);
         Xparm->t_ostring = p;
         Xparm->t_olen = t_test + 4;
 	p = malloc(30);
-	bcopy("\0001234567890", p, 30);
+	memcpy(p, "\0001234567890", 30);
         Xparm->t_ostring1 = p;
         Xparm->t_olen1 = t_test + 4;
         Xparm->t_bool = t_test % 2;
@@ -900,7 +883,7 @@ int	tynum;
 	Xparm->t_pe1 = strb2bitstr("\0221\0327\052\211\0237\200", 41, 0, 0);
         Xparm->t_any = mkpe(t_test*8 + 3);
 	p = malloc(30);
-	bcopy("\0001234567890", p, 30);
+	memcpy(p, "\0001234567890", 30);
         Xparm->t_bstring = p;
         Xparm->t_blen = t_test*8 + 8;
 	break;
@@ -913,11 +896,11 @@ int	tynum;
         Xparm->t_qbuf = str2qb("Some is out there!", 18, 1);
         Xparm->t_string = strdup("hello, world\n");
 	p = malloc(30);
-	bcopy("\0001234567890", p, 30);
+	memcpy(p, "\0001234567890", 30);
         Xparm->t_ostring = p;
         Xparm->t_olen = t_test + 4;
 	p = malloc(30);
-	bcopy("\0001234567890", p, 30);
+	memcpy(p, "\0001234567890", 30);
         Xparm->t_bstring = p;
         Xparm->t_blen = t_test*8 + 4;
         Xparm->t_bool = t_test % 2;
@@ -993,11 +976,11 @@ int	tynum;
         Xparm->t_qbuf = str2qb("Some one is out there!", 22, 1);
         Xparm->t_string = strdup("hello there, world\n");
 	p = malloc(30);
-	bcopy("\0001234567890", p, 30);
+	memcpy(p, "\0001234567890", 30);
         Xparm->t_ostring = p;
         Xparm->t_olen = t_test + 4;
 	p = malloc(30);
-	bcopy("\0001234567890", p, 30);
+	memcpy(p, "\0001234567890", 30);
         Xparm->t_bstring = p;
         Xparm->t_blen = t_test*8 + 4;
 	Xparm->t_pe = strb2bitstr("\0221\0327\052\211\0237\200", t_test + 33, 0, 0);
diff --git a/src/isode/pepsy/pepsy_misc.c b/src/isode/pepsy/pepsy_misc.c
index 98edbdc61d..e9fd5b6e5a 100644
--- a/src/isode/pepsy/pepsy_misc.c
+++ b/src/isode/pepsy/pepsy_misc.c
@@ -9,6 +9,9 @@ static char *rcsid = "$Header$";
  *
  *
  * $Log$
+ * Revision 1.2  1994/06/15 23:29:09  eichin
+ * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args
+ *
  * Revision 1.1  1994/06/10 03:31:22  eichin
  * autoconfed isode for kerberos work
  *
@@ -77,11 +80,11 @@ OID	o1, o2;
     if (noid -> oid_elements == NULL)
 	myyerror ("out of memory (%d needed)", noid->oid_nelem);
 
-    bcopy ((char *)o1->oid_elements, (char *)noid->oid_elements,
-	   o1->oid_nelem * sizeof(unsigned int));
-    bcopy ((char *)o2 -> oid_elements,
-	   (char *) &noid -> oid_elements[o1->oid_nelem],
-	   o2 -> oid_nelem * sizeof(unsigned int));
+    memcpy ((char *)noid->oid_elements, (char *)o1->oid_elements,
+	    o1->oid_nelem * sizeof(unsigned int));
+    memcpy ((char *) &noid -> oid_elements[o1->oid_nelem],
+	    (char *)o2 -> oid_elements,
+	    o2 -> oid_nelem * sizeof(unsigned int));
     return noid;
 }
 
diff --git a/src/isode/psap/addr2ref.c b/src/isode/psap/addr2ref.c
index 3144117547..76bf313777 100644
--- a/src/isode/psap/addr2ref.c
+++ b/src/isode/psap/addr2ref.c
@@ -7,20 +7,6 @@ static char *rcsid = "$Header$";
 /* 
  * $Header$
  *
- *
- * $Log$
- * Revision 1.2  1994/06/15 20:59:52  eichin
- * step 1: bzero->memset(,0,)
- *
- * Revision 1.1  1994/06/10 03:32:22  eichin
- * autoconfed isode for kerberos work
- *
- * Revision 1.1  1994/06/01 00:36:51  eichin
- * add psap too
- *
- * Revision 8.0  91/07/17  12:46:39  isode
- * Release 7.0
- * 
  * 
  */
 
@@ -92,7 +78,7 @@ register u_char *dlen;
     if (pe2ssdu (pe, &base, &len) == NOTOK)
 	return NOTOK;
 
-    bcopy (base, dbase, (int) (*dlen = len));
+    memcpy (dbase, base, (int) (*dlen = len));
     free (base);
 
     return OK;
diff --git a/src/isode/psap/dg2ps.c b/src/isode/psap/dg2ps.c
index 5a34abee28..db91761a7e 100644
--- a/src/isode/psap/dg2ps.c
+++ b/src/isode/psap/dg2ps.c
@@ -9,6 +9,9 @@ static char *rcsid = "$Header$";
  *
  *
  * $Log$
+ * Revision 1.2  1994/06/15 23:24:29  eichin
+ * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args
+ *
  * Revision 1.1  1994/06/10 03:32:33  eichin
  * autoconfed isode for kerberos work
  *
@@ -121,7 +124,7 @@ int	in_line;
     if (cc > n)
 	cc = n;
 
-    bcopy (pi -> pio_ptr, (char *) data, cc);
+    memcpy ((char *) data, pi -> pio_ptr, cc);
     pi -> pio_ptr += cc, pi -> pio_cnt -= cc;
 
     return cc;
@@ -142,7 +145,7 @@ int	in_line;
     if (po -> pio_cnt < n)
 	return 0;
 
-    bcopy ((char *) data, po -> pio_ptr, n);
+    memcpy (po -> pio_ptr, (char *) data, n);
     po -> pio_ptr += n, po -> pio_cnt -= n;
 
     return n;
diff --git a/src/isode/psap/fdx2ps.c b/src/isode/psap/fdx2ps.c
index ead80ab665..f190c313be 100644
--- a/src/isode/psap/fdx2ps.c
+++ b/src/isode/psap/fdx2ps.c
@@ -9,6 +9,9 @@ static char *rcsid = "$Header$";
  *
  *
  * $Log$
+ * Revision 1.2  1994/06/15 23:24:31  eichin
+ * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args
+ *
  * Revision 1.1  1994/06/10 03:32:35  eichin
  * autoconfed isode for kerberos work
  *
@@ -101,7 +104,7 @@ int	in_line;
     if (cc > n)
 	cc = n;
 
-    bcopy (pi -> pio_ptr, (char *) data, cc);
+    memcpy ((char *) data, pi -> pio_ptr, cc);
     pi -> pio_ptr += cc, pi -> pio_cnt -= cc;
 
     return cc;
@@ -136,7 +139,7 @@ int	in_line;
     if (n > po -> pio_cnt)
 	n = po -> pio_cnt;
 
-    bcopy ((char *) data, po -> pio_ptr, n);
+    memcpy (po -> pio_ptr, (char *) data, n);
     po -> pio_ptr += n, po -> pio_cnt -= n;
 
     if (po -> pio_cnt <= 0 && fdx_flush (ps) == NOTOK)
diff --git a/src/isode/psap/pe2qb_f.c b/src/isode/psap/pe2qb_f.c
index 85135be082..8ba504959b 100644
--- a/src/isode/psap/pe2qb_f.c
+++ b/src/isode/psap/pe2qb_f.c
@@ -27,7 +27,7 @@
 				Len++; \
 			    }  \
 			    else { \
-				    bcopy((char *)c, Qcp, l); \
+				    memcpy(Qcp, (char *)c, l); \
 				    Qcp += l; \
 				    Len  += l; \
 			    }
diff --git a/src/isode/psap/prim2str.c b/src/isode/psap/prim2str.c
index 9d3152f354..7ae184c800 100644
--- a/src/isode/psap/prim2str.c
+++ b/src/isode/psap/prim2str.c
@@ -9,6 +9,9 @@ static char *rcsid = "$Header$";
  *
  *
  * $Log$
+ * Revision 1.2  1994/06/15 23:24:33  eichin
+ * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args
+ *
  * Revision 1.1  1994/06/10 03:33:54  eichin
  * autoconfed isode for kerberos work
  *
@@ -63,7 +66,7 @@ register int   *len;
 	case PE_FORM_PRIM: 
 	    if ((dp = malloc ((unsigned) ((i = pe -> pe_len) + 1))) == NULLCP)
 		return pe_seterr (pe, PE_ERR_NMEM, NULLCP);
-	    bcopy ((char *) pe -> pe_prim, dp, i);
+	    memcpy (dp, (char *) pe -> pe_prim, i);
 	    break;
 
 	case PE_FORM_CONS: 
@@ -94,7 +97,7 @@ register int   *len;
 			free (dp);
 			return pe_seterr (pe, PE_ERR_NMEM, NULLCP);
 		    }
-		    bcopy (ep, fp + i, j);
+		    memcpy (fp + i, ep, j);
 		    dp = fp, i = k;
 		}
 		else
diff --git a/src/isode/psap/qb2str.c b/src/isode/psap/qb2str.c
index ed2e206e0e..d251c487de 100644
--- a/src/isode/psap/qb2str.c
+++ b/src/isode/psap/qb2str.c
@@ -9,6 +9,9 @@ static char *rcsid = "$Header$";
  *
  *
  * $Log$
+ * Revision 1.2  1994/06/15 23:24:35  eichin
+ * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args
+ *
  * Revision 1.1  1994/06/10 03:34:22  eichin
  * autoconfed isode for kerberos work
  *
@@ -61,7 +64,7 @@ register struct qbuf *q;
 
     p = q -> qb_forw;
     do {
-	bcopy (p -> qb_data, d, p -> qb_len);
+	memcpy (d, p -> qb_data, p -> qb_len);
 	d += p -> qb_len;
 
 	p = p -> qb_forw;
diff --git a/src/isode/psap/qb_pullup.c b/src/isode/psap/qb_pullup.c
index bc29995b72..04eb8ff470 100644
--- a/src/isode/psap/qb_pullup.c
+++ b/src/isode/psap/qb_pullup.c
@@ -9,6 +9,9 @@ static char *rcsid = "$Header$";
  *
  *
  * $Log$
+ * Revision 1.2  1994/06/15 23:24:36  eichin
+ * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args
+ *
  * Revision 1.1  1994/06/10 03:34:26  eichin
  * autoconfed isode for kerberos work
  *
@@ -67,7 +70,7 @@ register struct qbuf *qb;
 
 	remque (qp);
 
-	bcopy (qp -> qb_data, d, qp -> qb_len);
+	memcpy (d, qp -> qb_data, qp -> qb_len);
 	d += qp -> qb_len;
 
 	free ((char *) qp);
diff --git a/src/isode/psap/qbuf2pe_f.c b/src/isode/psap/qbuf2pe_f.c
index 2cfaec7ec2..bdef86d6a2 100644
--- a/src/isode/psap/qbuf2pe_f.c
+++ b/src/isode/psap/qbuf2pe_f.c
@@ -9,6 +9,9 @@ static char *rcsid = "$Header$";
  *
  *
  * $Log$
+ * Revision 1.2  1994/06/15 23:24:37  eichin
+ * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args
+ *
  * Revision 1.1  1994/06/10 03:34:30  eichin
  * autoconfed isode for kerberos work
  *
@@ -309,7 +312,7 @@ PElementLen len;
 			goto leave;
 
 		i = min (qp -> qb_len, len);
-		bcopy (qp -> qb_data, (char *) data, i);
+		memcpy ((char *) data, qp -> qb_data, i);
 
 		qp -> qb_len -= i;
 		if (qp -> qb_len <= 0) {
diff --git a/src/isode/psap/qbuf2ps.c b/src/isode/psap/qbuf2ps.c
index 7581c6457c..b42e619256 100644
--- a/src/isode/psap/qbuf2ps.c
+++ b/src/isode/psap/qbuf2ps.c
@@ -9,6 +9,9 @@ static char *rcsid = "$Header$";
  *
  *
  * $Log$
+ * Revision 1.2  1994/06/15 23:24:39  eichin
+ * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args
+ *
  * Revision 1.1  1994/06/10 03:34:32  eichin
  * autoconfed isode for kerberos work
  *
@@ -60,7 +63,7 @@ int	in_line;
 	    return cc;
 
 	i = min (qp -> qb_len, n);
-	bcopy (qp -> qb_data, (char *) data, i);
+	memcpy ((char *) data, qp -> qb_data, i);
 
 	qp -> qb_data += i, qp -> qb_len -= i;
 	if (qp -> qb_len <= 0) {
diff --git a/src/isode/psap/str2ps.c b/src/isode/psap/str2ps.c
index 9218e30384..01adc7fcae 100644
--- a/src/isode/psap/str2ps.c
+++ b/src/isode/psap/str2ps.c
@@ -9,6 +9,9 @@ static char *rcsid = "$Header$";
  *
  *
  * $Log$
+ * Revision 1.2  1994/06/15 23:24:40  eichin
+ * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args
+ *
  * Revision 1.1  1994/06/10 03:35:06  eichin
  * autoconfed isode for kerberos work
  *
@@ -54,7 +57,7 @@ int	in_line;
     if (cc > n)
 	cc = n;
 
-    bcopy (ps -> ps_ptr, (char *) data, cc);
+    memcpy ((char *) data, ps -> ps_ptr, cc);
     ps -> ps_ptr += cc, ps -> ps_cnt -= cc;
 
     return cc;
@@ -97,7 +100,7 @@ int	in_line;
 	}
 partial: ;
 
-    bcopy ((char *) data, ps -> ps_ptr, n);
+    memcpy (ps -> ps_ptr, (char *) data, n);
     ps -> ps_ptr += n, ps -> ps_cnt -= n;
 
     return n;
@@ -145,7 +148,7 @@ int	in_line;
 		return ps_seterr (ps, PS_ERR_NMEM, NOTOK);
 	    ps -> ps_base = ps -> ps_ptr = dp;
 	    if (cp != NULLCP)
-		bcopy (cp, dp, cc);
+		memcpy (dp, cp, cc);
 	    ps -> ps_bufsiz = ps -> ps_cnt = cc;
 	}
 
diff --git a/src/isode/psap/str2qb.c b/src/isode/psap/str2qb.c
index 51b1dd6b70..cb83f64ec5 100644
--- a/src/isode/psap/str2qb.c
+++ b/src/isode/psap/str2qb.c
@@ -9,6 +9,9 @@ static char *rcsid = "$Header$";
  *
  *
  * $Log$
+ * Revision 1.2  1994/06/15 23:24:41  eichin
+ * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args
+ *
  * Revision 1.1  1994/06/10 03:35:09  eichin
  * autoconfed isode for kerberos work
  *
@@ -66,7 +69,7 @@ int	len,
 
     pb -> qb_data = pb -> qb_base;
     if ((pb -> qb_len = len) > 0 && s)
-	bcopy (s, pb -> qb_data, len);
+	memcpy (pb -> qb_data, s, len);
 
     return qb;
 }
diff --git a/src/isode/psap/uvec2ps.c b/src/isode/psap/uvec2ps.c
index 01667fb92a..41fa618a17 100644
--- a/src/isode/psap/uvec2ps.c
+++ b/src/isode/psap/uvec2ps.c
@@ -9,6 +9,9 @@ static char *rcsid = "$Header$";
  *
  *
  * $Log$
+ * Revision 1.2  1994/06/15 23:24:43  eichin
+ * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args
+ *
  * Revision 1.1  1994/06/10 03:35:26  eichin
  * autoconfed isode for kerberos work
  *
@@ -99,7 +102,7 @@ int	in_line;
 	}
 
 	uv -> uv_len += n;
-	bcopy ((char *) data, ps -> ps_extra, n);
+	memcpy (ps -> ps_extra, (char *) data, n);
 	ps -> ps_extra += n, ps -> ps_slop -= n;
     }
     ps -> ps_cc += n;