change bcopy to memcpy

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

diff --git a/src/lib/kdb/decrypt_key.c b/src/lib/kdb/decrypt_key.c
index 2e466526cbe43f8480e12c1979d5bdf317009cf4..26c42add493cf19ac7dedef64ba77c850c87d20c 100644 (file)
--- a/src/lib/kdb/decrypt_key.c
+++ b/src/lib/kdb/decrypt_key.c
@@ -47,8 +47,7 @@ krb5_keyblock *out;
        return ENOMEM;
     }
     /* copy out the real length count */
-    bcopy((char *)in->contents, (char *)&out->length,
-         sizeof(out->length));
+    memcpy((char *)&out->length, (char *)in->contents, sizeof(out->length));
 
     /* remember the contents of the encrypted version has a sizeof(in->length)
        integer length of the real embedded key, followed by the

diff --git a/src/lib/kdb/kdb_dbm.c b/src/lib/kdb/kdb_dbm.c
index a89339b83c58e492b661195a2d3dc879fc827dc5..5f6621f1e19f14c788efc4eef72bef1db465f002 100644 (file)
--- a/src/lib/kdb/kdb_dbm.c
+++ b/src/lib/kdb/kdb_dbm.c
@@ -440,14 +440,14 @@ krb5_db_entry *entry;
        contents->dptr = 0;
        return(ENOMEM);
     }
-    (void) bcopy((char *)&copy_princ, contents->dptr, sizeof(copy_princ));
+    (void) memcpy(contents->dptr, (char *)&copy_princ, sizeof(copy_princ));
     nextloc = contents->dptr + sizeof(copy_princ);
 
-    (void) bcopy(unparse_princ, nextloc, princ_size);
+    (void) memcpy(nextloc, unparse_princ, princ_size);
     nextloc += princ_size;
-    (void) bcopy(unparse_mod_princ, nextloc, mod_size);
+    (void) memcpy(nextloc, unparse_mod_princ, mod_size);
     nextloc += mod_size;
-    (void) bcopy((char *)entry->key.contents, nextloc, entry->key.length);
+    (void) memcpy(nextloc, (char *)entry->key.contents, entry->key.length);
     free(unparse_princ);
     free(unparse_mod_princ);
     return 0;
@@ -480,7 +480,7 @@ krb5_db_entry *entry;
     if (nextloc >= contents->dptr + contents->dsize)
        return KRB5_KDB_TRUNCATED_RECORD;
 
-    bcopy(contents->dptr, (char *) entry, sizeof(*entry));
+    memcpy((char *) entry, contents->dptr, sizeof(*entry));
 
     if (nextloc + strlen(nextloc)+1 >= contents->dptr + contents->dsize)
        return KRB5_KDB_TRUNCATED_RECORD;
@@ -511,7 +511,7 @@ krb5_db_entry *entry;
        (void) bzero((char *) entry, sizeof(*entry));
        return ENOMEM;
     }
-    (void) bcopy(nextloc, (char *)entry->key.contents, keysize);
+    (void) memcpy((char *)entry->key.contents, nextloc, keysize);
     if (keysize != entry->key.length) {
        krb5_free_principal(princ);
        krb5_free_principal(mod_princ);