From 36c3380f3473e3f62a80e6b15a14ccc1d53b1675 Mon Sep 17 00:00:00 2001 From: Mark Eichin Date: Wed, 15 Jun 1994 23:17:56 +0000 Subject: [PATCH] step 3: bcopy->memcpy or memmove (chose by hand), twiddle args git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3817 dc483132-0cff-0310-8789-dd5450dbe970 --- src/isode/h/acpkt.h | 19 +++---------------- src/isode/h/fpkt.h | 9 ++++++--- src/isode/h/internet.h | 5 ++++- src/isode/h/ppkt.h | 9 ++++++--- src/isode/h/psap.h | 6 +++--- src/isode/h/ronot.h | 9 ++++++--- src/isode/h/ropkt.h | 9 ++++++--- src/isode/h/rtpkt.h | 9 ++++++--- src/isode/h/spkt.h | 11 +++++++---- src/isode/h/tpkt.h | 9 ++++++--- 10 files changed, 53 insertions(+), 42 deletions(-) diff --git a/src/isode/h/acpkt.h b/src/isode/h/acpkt.h index 35ff43b41..1ca33b06b 100644 --- a/src/isode/h/acpkt.h +++ b/src/isode/h/acpkt.h @@ -4,19 +4,6 @@ * $Header$ * * - * $Log$ - * Revision 1.1 1994/06/10 03:28:59 eichin - * autoconfed isode for kerberos work - * - * Revision 1.1 94/06/10 03:17:23 eichin - * autoconfed isode for kerberos work - * - * Revision 1.1 1994/05/31 20:37:41 eichin - * reduced-isode release from /mit/isode/isode-subset/src - * - * Revision 8.0 91/07/17 12:33:41 isode - * Release 7.0 - * * */ @@ -130,18 +117,18 @@ { \ register int i = len; \ if ((d -> d/* */_cc = min (i, sizeof d -> d/* */_data)) > 0) \ - bcopy (base, d -> d/* */_data, d -> d/* */_cc); \ + memcpy (d -> d/* */_data, base, d -> d/* */_cc); \ } #else #define copyAcSAPdata(base,len,d) \ { \ register int i = len; \ if ((d -> d##_cc = min (i, sizeof d -> d##_data)) > 0) \ - bcopy (base, d -> d##_data, d -> d##_cc); \ + memcpy (d -> d##_data, base, d -> d##_cc); \ } #endif #else -#define copyAcSAPdata(base,len,d) bcopy (base, (char *) d, len) +#define copyAcSAPdata(base,len,d) memcpy ((char *) d, base, len) #endif diff --git a/src/isode/h/fpkt.h b/src/isode/h/fpkt.h index 1e042094a..e2b0ca6ca 100644 --- a/src/isode/h/fpkt.h +++ b/src/isode/h/fpkt.h @@ -5,6 +5,9 @@ * * * $Log$ + * Revision 1.2 1994/06/15 23:16:22 eichin + * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args + * * Revision 1.1 1994/06/10 03:29:13 eichin * autoconfed isode for kerberos work * @@ -114,18 +117,18 @@ { \ register int i = len; \ if ((d -> d/* */_cc = min (i, sizeof d -> d/* */_data)) > 0) \ - bcopy (base, d -> d/* */_data, d -> d/* */_cc); \ + memcpy (d -> d/* */_data, base, d -> d/* */_cc); \ } #else #define copyFTAMdata(base,len,d) \ { \ register int i = len; \ if ((d -> d##_cc = min (i, sizeof d -> d##_data)) > 0) \ - bcopy (base, d -> d##_data, d -> d##_cc); \ + memcpy (d -> d##_data, base, d -> d##_cc); \ } #endif #else -#define copyFTAMdata(base,len,d) bcopy (base, (char *) d, len) +#define copyFTAMdata(base,len,d) memcpy ((char *) d, base, len) #endif diff --git a/src/isode/h/internet.h b/src/isode/h/internet.h index 6d9947bc2..e0f96ca56 100644 --- a/src/isode/h/internet.h +++ b/src/isode/h/internet.h @@ -5,6 +5,9 @@ * * * $Log$ + * Revision 1.2 1994/06/15 23:16:23 eichin + * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args + * * Revision 1.1 1994/06/10 03:29:19 eichin * autoconfed isode for kerberos work * @@ -139,7 +142,7 @@ int start_udp_server (); #endif #define inaddr_copy(hp,sin) \ - bcopy ((hp) -> h_addr, (char *) &((sin) -> sin_addr), (hp) -> h_length) + memcpy ((char *) &((sin) -> sin_addr), (hp) -> h_addr, (hp) -> h_length) #ifdef EXOS diff --git a/src/isode/h/ppkt.h b/src/isode/h/ppkt.h index edd7336c5..6d9a09475 100644 --- a/src/isode/h/ppkt.h +++ b/src/isode/h/ppkt.h @@ -7,6 +7,9 @@ * * * $Log$ + * Revision 1.2 1994/06/15 23:17:56 eichin + * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args + * * Revision 1.1 1994/06/10 03:29:33 eichin * autoconfed isode for kerberos work * @@ -121,18 +124,18 @@ { \ register int i = len; \ if ((d -> d/* */_cc = min (i, sizeof d -> d/* */_data)) > 0) \ - bcopy (base, d -> d/* */_data, d -> d/* */_cc); \ + memcpy (d -> d/* */_data, base, d -> d/* */_cc); \ } #else #define copyPSAPdata(base,len,d) \ { \ register int i = len; \ if ((d -> d##_cc = min (i, sizeof d -> d##_data)) > 0) \ - bcopy (base, d -> d##_data, d -> d##_cc); \ + memcpy (d -> d##_data, base, d -> d##_cc); \ } #endif #else -#define copyPSAPdata(base,len,d) bcopy (base, (char *) d, len) +#define copyPSAPdata(base,len,d) memcpy ((char *) d, base, len) #endif diff --git a/src/isode/h/psap.h b/src/isode/h/psap.h index ff64580ee..6781793aa 100644 --- a/src/isode/h/psap.h +++ b/src/isode/h/psap.h @@ -5,8 +5,8 @@ * * * $Log$ - * Revision 1.2 1994/06/15 21:14:53 eichin - * step 2: bcmp->memcmp + * Revision 1.3 1994/06/15 23:16:25 eichin + * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args * * Revision 1.1 1994/06/10 03:29:36 eichin * autoconfed isode for kerberos work @@ -97,7 +97,7 @@ typedef u_char byte, *PElementData; memcmp ((char *) (b1), (char *) (b2), (int) (length)) #define PEDcpy(b1, b2, length) \ - bcopy ((char *) (b1), (char *) (b2), (int) (length)) + memcpy ((char *) (b2), (char *) (b1), (int) (length)) /* */ diff --git a/src/isode/h/ronot.h b/src/isode/h/ronot.h index 4174ebc9e..4ac1429e1 100644 --- a/src/isode/h/ronot.h +++ b/src/isode/h/ronot.h @@ -5,6 +5,9 @@ * * * $Log$ + * Revision 1.2 1994/06/15 23:16:26 eichin + * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args + * * Revision 1.1 1994/06/10 03:29:40 eichin * autoconfed isode for kerberos work * @@ -81,18 +84,18 @@ struct RoNOTindication { { \ register int i = len; \ if ((d -> d/* */_cc = min (i, sizeof d -> d/* */_data)) > 0) \ - bcopy (base, d -> d/* */_data, d -> d/* */_cc); \ + memcpy (d -> d/* */_data, base, d -> d/* */_cc); \ } #else #define copyRoNOTdata(base,len,d) \ { \ register int i = len; \ if ((d -> d##_cc = min (i, sizeof d -> d##_data)) > 0) \ - bcopy (base, d -> d##_data, d -> d##_cc); \ + memcpy (d -> d##_data, base, d -> d##_cc); \ } #endif #else -#define copyRoNOTdata(base,len,d) bcopy (base, (char *) d, len) +#define copyRoNOTdata(base,len,d) memcpy ((char *) d, base, len) #endif #endif diff --git a/src/isode/h/ropkt.h b/src/isode/h/ropkt.h index f1682d5eb..851f78c20 100644 --- a/src/isode/h/ropkt.h +++ b/src/isode/h/ropkt.h @@ -8,6 +8,9 @@ * * * $Log$ + * Revision 1.2 1994/06/15 23:16:28 eichin + * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args + * * Revision 1.1 1994/06/10 03:29:42 eichin * autoconfed isode for kerberos work * @@ -158,18 +161,18 @@ { \ register int i = len; \ if ((d -> d/* */_cc = min (i, sizeof d -> d/* */_data)) > 0) \ - bcopy (base, d -> d/* */_data, d -> d/* */_cc); \ + memcpy (d -> d/* */_data, base, d -> d/* */_cc); \ } #else #define copyRoSAPdata(base,len,d) \ { \ register int i = len; \ if ((d -> d##_cc = min (i, sizeof d -> d##_data)) > 0) \ - bcopy (base, d -> d##_data, d -> d##_cc); \ + memcpy (d -> d##_data, base, d -> d##_cc); \ } #endif #else -#define copyRoSAPdata(base,len,d) bcopy (base, (char *) d, len) +#define copyRoSAPdata(base,len,d) memcpy ( (char *) d, base, len) #endif diff --git a/src/isode/h/rtpkt.h b/src/isode/h/rtpkt.h index e120ef22e..7cf5bda39 100644 --- a/src/isode/h/rtpkt.h +++ b/src/isode/h/rtpkt.h @@ -5,6 +5,9 @@ * * * $Log$ + * Revision 1.2 1994/06/15 23:16:29 eichin + * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args + * * Revision 1.1 1994/06/10 03:29:47 eichin * autoconfed isode for kerberos work * @@ -114,18 +117,18 @@ { \ register int i = len; \ if ((d -> d/* */_cc = min (i, sizeof d -> d/* */_data)) > 0) \ - bcopy (base, d -> d/* */_data, d -> d/* */_cc); \ + memcpy (d -> d/* */_data, base, d -> d/* */_cc); \ } #else #define copyRtSAPdata(base,len,d) \ { \ register int i = len; \ if ((d -> d##_cc = min (i, sizeof d -> d##_data)) > 0) \ - bcopy (base, d -> d##_data, d -> d##_cc); \ + memcpy (d -> d##_data, base, d -> d##_cc); \ } #endif #else -#define copyRtSAPdata(base,len,d) bcopy (base, (char *) d, len) +#define copyRtSAPdata(base,len,d) memcpy ((char *) d, base, len) #endif diff --git a/src/isode/h/spkt.h b/src/isode/h/spkt.h index 3f0a23fa3..41c368a86 100644 --- a/src/isode/h/spkt.h +++ b/src/isode/h/spkt.h @@ -5,6 +5,9 @@ * * * $Log$ + * Revision 1.2 1994/06/15 23:16:31 eichin + * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args + * * Revision 1.1 1994/06/10 03:29:52 eichin * autoconfed isode for kerberos work * @@ -347,7 +350,7 @@ { \ register int i = len; \ if ((d -> d/* */_cc = min (i, sizeof d -> d/* */_data)) > 0) \ - bcopy (base, d -> d/* */_data, d -> d/* */_cc); \ + memcpy (d -> d/* */_data, base, d -> d/* */_cc); \ } #define copySPKTdata(s,d) \ @@ -360,7 +363,7 @@ { \ register int i = len; \ if ((d -> d##_cc = min (i, sizeof d -> d##_data)) > 0) \ - bcopy (base, d -> d##_data, d -> d##_cc); \ + memcpy (d -> d##_data, base, d -> d##_cc); \ } #define copySPKTdata(s, d) \ @@ -370,9 +373,9 @@ } #endif #else -#define copySSAPdata(base,len,d) bcopy (base, (char *) d, len) +#define copySSAPdata(base,len,d) memcpy ((char *) d, base, len) -#define copySPKTdata(s,d) bcopy (s -> s_udata, (char *) d, s -> s_ulen) +#define copySPKTdata(s,d) memcpy ((char *) d, s -> s_udata, s -> s_ulen) #endif diff --git a/src/isode/h/tpkt.h b/src/isode/h/tpkt.h index f905abcbf..44620091c 100644 --- a/src/isode/h/tpkt.h +++ b/src/isode/h/tpkt.h @@ -5,6 +5,9 @@ * * * $Log$ + * Revision 1.2 1994/06/15 23:16:33 eichin + * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args + * * Revision 1.1 1994/06/10 03:30:07 eichin * autoconfed isode for kerberos work * @@ -90,18 +93,18 @@ { \ register int i = len; \ if ((d -> d/* */_cc = min (i, sizeof d -> d/* */_data)) > 0) \ - bcopy (base, d -> d/* */_data, d -> d/* */_cc); \ + memcpy (d -> d/* */_data, base, d -> d/* */_cc); \ } #else #define copyTSAPdata(base,len,d) \ { \ register int i = len; \ if ((d -> d##_cc = min (i, sizeof d -> d##_data)) > 0) \ - bcopy (base, d -> d##_data, d -> d##_cc); \ + memcpy (d -> d##_data, base, d -> d##_cc); \ } #endif #else -#define copyTSAPdata(base,len,d) bcopy (base, (char *) d, len) +#define copyTSAPdata(base,len,d) memcpy ((char *) d, base, len) #endif -- 2.26.2