step 2: bcmp->memcmp

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

diff --git a/src/admin/convert/kdb5_convert.c b/src/admin/convert/kdb5_convert.c
index 02e9fb082f82c8741ef3e0c32b20769143dfbc89..b25ee9223f61e8d994e951b1f49286a4776e30e8 100644 (file)
--- a/src/admin/convert/kdb5_convert.c
+++ b/src/admin/convert/kdb5_convert.c
@@ -489,8 +489,8 @@ Principal *princ;
        memcpy(((long *) key_from_db) + 1, (char *)&princ->key_high, 4);
        kdb_encrypt_key (key_from_db, key_from_db, 
                         master_key, master_key_schedule, DECRYPT);
-       val = bcmp((char *) master_key, (char *) key_from_db,
-                  sizeof(master_key));
+       val = memcmp((char *) master_key, (char *) key_from_db,
+                    sizeof(master_key));
        memset((char *)key_from_db, 0, sizeof(key_from_db));
        if (val) {
            return KRB5_KDB_BADMASTERKEY;

diff --git a/src/appl/movemail/movemail.c b/src/appl/movemail/movemail.c
index 38647f006ef6726cb7517851c0fc6e132c694029..61509c0fc195e47931a7baa05c6d54a8a0c402dd 100644 (file)
--- a/src/appl/movemail/movemail.c
+++ b/src/appl/movemail/movemail.c
@@ -139,7 +139,7 @@ main (argc, argv)
   }
 
 #ifdef MAIL_USE_POP
-  if (!bcmp (inname, "po:", 3))
+  if (!memcmp (inname, "po:", 3))
     {
       int status; char *user;
 

diff --git a/src/appl/popper/pop_init.c b/src/appl/popper/pop_init.c
index efa98ba554cf14c5893858530d2431123f20bc4c..5eba83cd2b485935db7dbdb66d516bc964cdb8ed 100644 (file)
--- a/src/appl/popper/pop_init.c
+++ b/src/appl/popper/pop_init.c
@@ -219,7 +219,7 @@ char    **      argmessage;
             /*  Look for the client's IP address in the list returned 
                 for its name */
             for (addrp=ch_again->h_addr_list; *addrp; ++addrp)
-                if (bcmp(*addrp,&(cs.sin_addr),sizeof(cs.sin_addr)) == 0) break;
+                if (memcmp(*addrp,&(cs.sin_addr),sizeof(cs.sin_addr)) == 0) break;
 
             if (!*addrp) {
                 pop_log (p,POP_PRIORITY,

diff --git a/src/appl/telnet/libtelnet/encrypt.c b/src/appl/telnet/libtelnet/encrypt.c
index b03d2a86f2054fdbd55f4dc99c445d2d1f6d97c4..8f637b693d36c1b6bf8e7d4ae6243886bfe4b672 100644 (file)
--- a/src/appl/telnet/libtelnet/encrypt.c
+++ b/src/appl/telnet/libtelnet/encrypt.c
@@ -763,7 +763,7 @@ encrypt_keyid(kp, keyid, len)
                if (ep->keyid)
                        (void)(*ep->keyid)(dir, kp->keyid, &kp->keylen);
 
-       } else if ((len != kp->keylen) || (bcmp(keyid, kp->keyid, len) != 0)) {
+       } else if ((len != kp->keylen) || (memcmp(keyid, kp->keyid, len) != 0)) {
                /*
                 * Length or contents are different
                 */

diff --git a/src/appl/telnet/libtelnet/encrypt.h b/src/appl/telnet/libtelnet/encrypt.h
index 79ab0f41e961c5614850bb72282850b299c44fb5..6eec238a227e93eb3da76d360a2bc012a52d783d 100644 (file)
--- a/src/appl/telnet/libtelnet/encrypt.h
+++ b/src/appl/telnet/libtelnet/encrypt.h
@@ -67,7 +67,7 @@ typedef struct { Block _; } Schedule[16];
 #define        VALIDKEY(key)   ( key[0] | key[1] | key[2] | key[3] | \
                          key[4] | key[5] | key[6] | key[7])
 
-#define        SAMEKEY(k1, k2) (!bcmp((void *)k1, (void *)k2, sizeof(Block)))
+#define        SAMEKEY(k1, k2) (!memcmp((void *)k1, (void *)k2, sizeof(Block)))
 
 typedef        struct {
        short           type;

diff --git a/src/appl/telnet/telnet/sys_bsd.c b/src/appl/telnet/telnet/sys_bsd.c
index 1e40c81d092e193ead3df681eedee06cc41d71ae..8442e145c9c485730ff4f872c74f7b9de6d6540f 100644 (file)
--- a/src/appl/telnet/telnet/sys_bsd.c
+++ b/src/appl/telnet/telnet/sys_bsd.c
@@ -1085,7 +1085,7 @@ process_rings(netin, netout, netex, ttyin, ttyout, poll)
                    int i;
                    i = recv(net, netiring.supply + c, canread - c, MSG_OOB);
                    if (i == c &&
-                         bcmp(netiring.supply, netiring.supply + c, i) == 0) {
+                       memcmp(netiring.supply, netiring.supply + c, i) == 0) {
                        bogus_oob = 1;
                        first = 0;
                    } else if (i < 0) {

diff --git a/src/appl/telnet/telnetd/sys_term.c b/src/appl/telnet/telnetd/sys_term.c
index 5e727aff85143dd664694189923c46f00811e30a..750568ce01e982cb9b4463d7bacdb7830288edc9 100644 (file)
--- a/src/appl/telnet/telnetd/sys_term.c
+++ b/src/appl/telnet/telnetd/sys_term.c
@@ -235,17 +235,17 @@ set_termbuf()
         * Only make the necessary changes.
         */
 #ifndef        USE_TERMIO
-       if (bcmp((char *)&termbuf.sg, (char *)&termbuf2.sg, sizeof(termbuf.sg)))
+       if (memcmp((char *)&termbuf.sg, (char *)&termbuf2.sg, sizeof(termbuf.sg)))
                (void) ioctl(pty, TIOCSETN, (char *)&termbuf.sg);
-       if (bcmp((char *)&termbuf.tc, (char *)&termbuf2.tc, sizeof(termbuf.tc)))
+       if (memcmp((char *)&termbuf.tc, (char *)&termbuf2.tc, sizeof(termbuf.tc)))
                (void) ioctl(pty, TIOCSETC, (char *)&termbuf.tc);
-       if (bcmp((char *)&termbuf.ltc, (char *)&termbuf2.ltc,
+       if (memcmp((char *)&termbuf.ltc, (char *)&termbuf2.ltc,
                                                        sizeof(termbuf.ltc)))
                (void) ioctl(pty, TIOCSLTC, (char *)&termbuf.ltc);
        if (termbuf.lflags != termbuf2.lflags)
                (void) ioctl(pty, TIOCLSET, (char *)&termbuf.lflags);
 #else  /* USE_TERMIO */
-       if (bcmp((char *)&termbuf, (char *)&termbuf2, sizeof(termbuf)))
+       if (memcmp((char *)&termbuf, (char *)&termbuf2, sizeof(termbuf)))
 # ifdef  STREAMSPTY
                (void) tcsetattr(ttyfd, TCSANOW, &termbuf);
 # else

diff --git a/src/isode/compat/dgram.c b/src/isode/compat/dgram.c
index a4e02576b01e5737aa06c73b1dcb0bf8ba72c3b0..cb2f0f76565254ad3bd6e12de360203e98b32765 100644 (file)
--- 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 8f30f7e0b5c4db702697d0f40038a53775413e31..696250e72fb0f6d9b8ae7d50b677a1eaebe98d93 100644 (file)
--- 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 7a872ab0a7a04a24ccc7a7d27e275265755c8801..3ce9abb8ddc9fefbbe4a5119fd882e207e3ebcf4 100644 (file)
--- 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 bda1f15eb5c4e7ebe42681ad25aea338cf79d2a0..c1e959674248283ed35d3d2531d8277a44281e77 100644 (file)
--- 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 cef583b634e51beb477e68d248effabda3ea629e..52ba9e48eb57fe9ae92988c8c9e7df5d535e70bd 100644 (file)
--- 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 2a1ac51bf9ec1a6831cf3f2c0698326d8d284e5a..ff64580eef6ac9b24b02f332d1999e74176890f1 100644 (file)
--- 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 1b5360e6a442a5efd325c3783d91a5556ebcfc17..9c5288c963f7cd27543c392ba5643a7c7e71ec1b 100644 (file)
--- 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 5682985afbf92fcbd88eff8b445c2d23e42b4d9c..2e498ad035d7da227599f81407b28d7db14bb3ce 100644 (file)
--- 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;