diff options
| author | Mark Eichin <eichin@mit.edu> | 1994-06-15 21:15:07 +0000 |
|---|---|---|
| committer | Mark Eichin <eichin@mit.edu> | 1994-06-15 21:15:07 +0000 |
| commit | 8ac237f4aefa37d5b86076cc41baa0861d92ea4a (patch) | |
| tree | 103e5227c9761e07044cbce8203ad20dfbc22919 /src/isode | |
| parent | 459fbde88db222f22c33366cd864ff6a9b1b57b7 (diff) | |
step 2: bcmp->memcmp
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3810 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/isode')
| -rw-r--r-- | src/isode/compat/dgram.c | 24 | ||||
| -rw-r--r-- | src/isode/compat/isoaddrs.c | 31 | ||||
| -rw-r--r-- | src/isode/compat/norm2na.c | 5 | ||||
| -rw-r--r-- | src/isode/compat/servbysel.c | 5 | ||||
| -rw-r--r-- | src/isode/compat/tailor.c | 7 | ||||
| -rw-r--r-- | src/isode/h/psap.h | 5 | ||||
| -rw-r--r-- | src/isode/pepsy/main.c | 19 | ||||
| -rw-r--r-- | src/isode/pepsy/util.c | 9 |
8 files changed, 42 insertions, 63 deletions
diff --git a/src/isode/compat/dgram.c b/src/isode/compat/dgram.c index a4e02576b..cb2f0f765 100644 --- a/src/isode/compat/dgram.c +++ b/src/isode/compat/dgram.c @@ -7,24 +7,6 @@ static char *rcsid = "$Header$"; /* * $Header$ * - * - * $Log$ - * Revision 1.2 1994/06/15 20:59:12 eichin - * step 1: bzero->memset(,0,) - * - * Revision 1.1 1994/06/10 03:27:11 eichin - * autoconfed isode for kerberos work - * - * Revision 1.1 94/06/10 03:15:37 eichin - * autoconfed isode for kerberos work - * - * Revision 1.1 1994/05/31 20:33:42 eichin - * reduced-isode release from /mit/isode/isode-subset/src - * - * Revision 8.0 91/07/17 12:17:52 isode - * Release 7.0 - * - * */ /* @@ -600,7 +582,7 @@ int secs; #ifdef BSD44 len != up -> dgram_addrlen || #endif - bcmp (data, up -> dgram_peer.sa.sa_data, (int) len) + memcmp (data, up -> dgram_peer.sa.sa_data, (int) len) != 0) { for (wp = (vp = peers) + maxpeers; vp < wp; vp++) if (vp != up @@ -608,8 +590,8 @@ int secs; #ifdef BSD44 && len == vp -> dgram_addrlen #endif - && bcmp (data, vp -> dgram_peer.sa.sa_data, - (int) len) == 0) + && memcmp (data, vp -> dgram_peer.sa.sa_data, + (int) len) == 0) break; if (vp >= wp && (vp = &peers[up -> dgram_parent]) diff --git a/src/isode/compat/isoaddrs.c b/src/isode/compat/isoaddrs.c index 8f30f7e0b..696250e72 100644 --- a/src/isode/compat/isoaddrs.c +++ b/src/isode/compat/isoaddrs.c @@ -6,27 +6,6 @@ static char *rcsid = "$Header$"; /* * $Header$ - * - * - * $Log$ - * Revision 1.2 1994/06/15 20:59:18 eichin - * step 1: bzero->memset(,0,) - * - * Revision 1.1 1994/06/10 03:27:26 eichin - * autoconfed isode for kerberos work - * - * Revision 1.1 94/06/10 03:15:54 eichin - * autoconfed isode for kerberos work - * - * Revision 1.2 1994/06/06 19:51:28 eichin - * NULL is not a char - * - * Revision 1.1 1994/05/31 20:33:55 eichin - * reduced-isode release from /mit/isode/isode-subset/src - * - * Revision 8.0 91/07/17 12:17:57 isode - * Release 7.0 - * * */ @@ -1107,15 +1086,15 @@ bad_pa: ; char buf[BUFSIZ]; char *dsp; - if (a->p_dec0 && bcmp(a->p_dec0, cp, 2) == 0) + if (a->p_dec0 && memcmp(a->p_dec0, cp, 2) == 0) (pad = a->p_dec1 ? '0' : '\0'), dspmark = 'd'; - else if (a->p_dec1 && bcmp(a->p_dec1, cp, 2) == 0) + else if (a->p_dec1 && memcmp(a->p_dec1, cp, 2) == 0) pad = '1', dspmark = 'd'; - else if (a->p_hex0 && bcmp(a->p_hex0, cp, 2) == 0) + else if (a->p_hex0 && memcmp(a->p_hex0, cp, 2) == 0) (pad = a->p_hex1 ? '0' : '\0'), dspmark = 'x'; - else if (a->p_hex1 && bcmp(a->p_hex1, cp, 2) == 0) + else if (a->p_hex1 && memcmp(a->p_hex1, cp, 2) == 0) pad = '1', dspmark = 'x'; - else if (a->p_ia5 && bcmp(a->p_ia5, cp, 2) == 0) + else if (a->p_ia5 && memcmp(a->p_ia5, cp, 2) == 0) pad = '\0', dspmark = 'l'; else continue; diff --git a/src/isode/compat/norm2na.c b/src/isode/compat/norm2na.c index 7a872ab0a..3ce9abb8d 100644 --- a/src/isode/compat/norm2na.c +++ b/src/isode/compat/norm2na.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 21:14:45 eichin + * step 2: bcmp->memcmp + * * Revision 1.1 1994/06/10 03:27:52 eichin * autoconfed isode for kerberos work * @@ -103,7 +106,7 @@ struct NSAPaddr *na; for (ts = ts_interim; ts -> ts_name; ts++) if (len > ts -> ts_length && (tp == NULL || ts -> ts_length > tp -> ts_length) - && bcmp (p, ts -> ts_prefix, ts -> ts_length) == 0) + && memcmp (p, ts -> ts_prefix, ts -> ts_length) == 0) tp = ts; if (tp) { int i, diff --git a/src/isode/compat/servbysel.c b/src/isode/compat/servbysel.c index bda1f15eb..c1e959674 100644 --- a/src/isode/compat/servbysel.c +++ b/src/isode/compat/servbysel.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 21:14:47 eichin + * step 2: bcmp->memcmp + * * Revision 1.1 1994/06/10 03:28:12 eichin * autoconfed isode for kerberos work * @@ -60,7 +63,7 @@ int selectlen; (void) setisoservent (0); while (is = getisoservent ()) if (selectlen == is -> is_selectlen - && bcmp (selector, is -> is_selector, is -> is_selectlen) == 0 + && memcmp (selector, is -> is_selector, is -> is_selectlen) == 0 && strcmp (provider, is -> is_provider) == 0) break; (void) endisoservent (); diff --git a/src/isode/compat/tailor.c b/src/isode/compat/tailor.c index cef583b63..52ba9e48e 100644 --- a/src/isode/compat/tailor.c +++ b/src/isode/compat/tailor.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 21:14:48 eichin + * step 2: bcmp->memcmp + * * Revision 1.1 1994/06/10 03:28:43 eichin * autoconfed isode for kerberos work * @@ -643,8 +646,8 @@ char *myname; } for (tp = ts_interim; tp < ts; tp++) if (tp -> ts_length == ts -> ts_length - && bcmp (tp -> ts_prefix, ts -> ts_prefix, - tp -> ts_length) == 0) { + && memcmp (tp -> ts_prefix, ts -> ts_prefix, + tp -> ts_length) == 0) { (void) fprintf (stderr, "duplicate prefixes for communities \"%s\" and \"%s\"\n", tp -> ts_name, cp); diff --git a/src/isode/h/psap.h b/src/isode/h/psap.h index 2a1ac51bf..ff64580ee 100644 --- a/src/isode/h/psap.h +++ b/src/isode/h/psap.h @@ -5,6 +5,9 @@ * * * $Log$ + * Revision 1.2 1994/06/15 21:14:53 eichin + * step 2: bcmp->memcmp + * * Revision 1.1 1994/06/10 03:29:36 eichin * autoconfed isode for kerberos work * @@ -91,7 +94,7 @@ typedef u_char byte, *PElementData; #define PEDfree(p) free ((char *) (p)) #define PEDcmp(b1, b2, length) \ - bcmp ((char *) (b1), (char *) (b2), (int) (length)) + memcmp ((char *) (b1), (char *) (b2), (int) (length)) #define PEDcpy(b1, b2, length) \ bcopy ((char *) (b1), (char *) (b2), (int) (length)) diff --git a/src/isode/pepsy/main.c b/src/isode/pepsy/main.c index 1b5360e6a..9c5288c96 100644 --- a/src/isode/pepsy/main.c +++ b/src/isode/pepsy/main.c @@ -9,6 +9,9 @@ static char *rcsid = "$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 * @@ -2601,7 +2604,7 @@ char *parm1, *parm2; (void) printf("%s:t_olen string different\n", t_case[tynum].tst_name); d++; - } else if (bcmp(Xparm1->t_ostring, Xparm2->t_ostring, + } else if (memcmp(Xparm1->t_ostring, Xparm2->t_ostring, Xparm1->t_olen)) { (void) printf("%s:t_ostring string different\n", t_case[tynum].tst_name); @@ -2811,7 +2814,7 @@ char *parm1, *parm2; (void) printf("%s:t_olen string different\n", t_case[tynum].tst_name); d++; - } else if (bcmp(Xparm1->t_ostring, Xparm2->t_ostring, + } else if (memcmp(Xparm1->t_ostring, Xparm2->t_ostring, Xparm1->t_olen)) { (void) printf("%s:t_ostring string different\n", t_case[tynum].tst_name); @@ -2827,7 +2830,7 @@ char *parm1, *parm2; (void) printf("%s:t_olen1 string different\n", t_case[tynum].tst_name); d++; - } else if (bcmp(Xparm1->t_ostring1, Xparm2->t_ostring1, + } else if (memcmp(Xparm1->t_ostring1, Xparm2->t_ostring1, Xparm1->t_olen1)) { (void) printf("%s:t_ostring string different\n", t_case[tynum].tst_name); @@ -3118,7 +3121,7 @@ char *parm1, *parm2; (void) printf("%s:t_olen string different\n", t_case[tynum].tst_name); d++; - } else if (bcmp(Xparm1->t_ostring, Xparm2->t_ostring, + } else if (memcmp(Xparm1->t_ostring, Xparm2->t_ostring, Xparm1->t_olen)) { (void) printf("%s:t_ostring string different\n", t_case[tynum].tst_name); @@ -3477,7 +3480,7 @@ struct qbuf *qb1, *qb2; while (qp1 != qb1 && qp2 != qb2) { if (len1 < len2) { - if (bcmp(po1, po2, len1)) + if (memcmp(po1, po2, len1)) return (1); len2 -= len1; po2 += len1; @@ -3485,7 +3488,7 @@ struct qbuf *qb1, *qb2; po1 = qp1->qb_data; len1 = qp1->qb_len; } else { - if (bcmp(po1, po2, len1)) + if (memcmp(po1, po2, len1)) return (1); len1 -= len2; po1 += len2; @@ -3531,7 +3534,7 @@ PE b1, b2; goto fail; } - if (len1 != len2 || bcmp(cp1, cp2, len1/8)) { + if (len1 != len2 || memcmp(cp1, cp2, len1/8)) { free(cp1); free(cp2); goto fail; @@ -3569,7 +3572,7 @@ int len1, len2; int i; int mask; - if (len1 != len2 || bcmp(cp1, cp2, len1/8)) + if (len1 != len2 || memcmp(cp1, cp2, len1/8)) return (1); if (len1 % 8) { diff --git a/src/isode/pepsy/util.c b/src/isode/pepsy/util.c index 5682985af..2e498ad03 100644 --- a/src/isode/pepsy/util.c +++ b/src/isode/pepsy/util.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 21:15:07 eichin + * step 2: bcmp->memcmp + * * Revision 1.1 1994/06/10 03:31:50 eichin * autoconfed isode for kerberos work * @@ -324,7 +327,7 @@ int len; register int i; register unsigned int mask; - if (len >= 8 && bcmp(p1, p2, len / 8)) + if (len >= 8 && memcmp(p1, p2, len / 8)) return (1); if (len % 8 == 0) @@ -359,7 +362,7 @@ register struct qbuf *qb; ferrd(1, "ostrcmp:qb_len %d < 0", qp->qb_len); if (qp->qb_len > len) return (1); - if (bcmp(qp->qb_data, p, qp->qb_len)) + if (memcmp(qp->qb_data, p, qp->qb_len)) return (1); if ((len -= qp->qb_len) == 0) return (0); @@ -542,7 +545,7 @@ o1string: val = 0; break; } - if (bcmp(PVAL(mod, dflt), p1, len)) + if (memcmp(PVAL(mod, dflt), p1, len)) val = 0; else val = 1; |
