update copyright notices

use xfree rather than free((char *))

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

3 files changed, 15 insertions, 15 deletions

diff --git a/src/lib/kdb/decrypt_key.c b/src/lib/kdb/decrypt_key.c
index e942941f1..fb35dd1d0 100644
--- a/src/lib/kdb/decrypt_key.c
+++ b/src/lib/kdb/decrypt_key.c
@@ -2,7 +2,8 @@
  * $Source$
  * $Author$
  *
- * Copyright 1990 by the Massachusetts Institute of Technology.
+ * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -15,7 +16,6 @@ static char rcsid_decrypt_key_c [] =
 "$Id$";
 #endif	/* !lint & !SABER */
 
-#include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
 #include <krb5/kdb.h>
@@ -57,13 +57,13 @@ krb5_keyblock *out;
 					      sizeof(in->length)),
 			      (krb5_pointer) out->contents,
 			      in->length-sizeof(in->length), eblock, 0)) {
-	free((char *)out->contents);
+	xfree(out->contents);
 	out->contents = 0;
 	out->length = 0;
 	return retval;
     }
     if (out->length < 0) {
-	free((char *)out->contents);
+	xfree(out->contents);
 	out->contents = 0;
 	out->length = 0;
 	return KRB5_KDB_INVALIDKEYSIZE;
diff --git a/src/lib/kdb/encrypt_key.c b/src/lib/kdb/encrypt_key.c
index 22000ec31..6d9724f23 100644
--- a/src/lib/kdb/encrypt_key.c
+++ b/src/lib/kdb/encrypt_key.c
@@ -2,7 +2,8 @@
  * $Source$
  * $Author$
  *
- * Copyright 1990 by the Massachusetts Institute of Technology.
+ * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -15,7 +16,6 @@ static char rcsid_encrypt_key_c [] =
 "$Id$";
 #endif	/* !lint & !SABER */
 
-#include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
 #include <krb5/kdb.h>
@@ -54,7 +54,7 @@ krb5_encrypted_keyblock *out;
     out->length += sizeof(out->length);
     out->contents = (krb5_octet *)malloc(out->length);
     if (!out->contents) {
-	free((char *)tmpin.contents);
+	xfree(tmpin.contents);
 	out->contents = 0;
 	out->length = 0;
 	return ENOMEM;
@@ -67,9 +67,9 @@ krb5_encrypted_keyblock *out;
 			  (krb5_pointer) (((char *) out->contents) +
 					  sizeof(out->length)),
 			  tmpin.length, eblock, 0);
-    free((char *)tmpin.contents);
+    xfree(tmpin.contents);
     if (retval) {
-	free((char *)out->contents);
+	xfree(out->contents);
 	out->contents = 0;
 	out->length = 0;
     }
diff --git a/src/lib/kdb/kdb_dbm.c b/src/lib/kdb/kdb_dbm.c
index 95a92d90d..f29dac649 100644
--- a/src/lib/kdb/kdb_dbm.c
+++ b/src/lib/kdb/kdb_dbm.c
@@ -2,7 +2,8 @@
  * $Source$
  * $Author$ 
  *
- * Copyright 1988,1989,1990 by the Massachusetts Institute of Technology. 
+ * Copyright 1988,1989,1990,1991 by the Massachusetts Institute of Technology. 
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>. 
@@ -13,7 +14,6 @@ static char rcsid_krb_dbm_c[] =
 "$Id$";
 #endif	/* lint */
 
-#include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/dbm.h>
 #include <krb5/kdb.h>
@@ -522,7 +522,7 @@ krb5_db_entry *entry;
     if (keysize != entry->key.length) {
 	krb5_free_principal(princ);
 	krb5_free_principal(mod_princ);
-	free((char *)entry->key.contents);
+	xfree(entry->key.contents);
 	(void) memset((char *) entry, 0, sizeof(*entry));
 	return KRB5_KDB_TRUNCATED_RECORD;
     }
@@ -534,7 +534,7 @@ krb5_db_entry *entry;
 	if (!(entry->salt = (krb5_octet *)malloc(entry->salt_length))) {
 	    krb5_free_principal(princ);
 	    krb5_free_principal(mod_princ);
-	    free((char *)entry->key.contents);
+	    xfree(entry->key.contents);
 	    (void) memset((char *) entry, 0, sizeof(*entry));
 	    return KRB5_KDB_TRUNCATED_RECORD;
 	}
@@ -549,9 +549,9 @@ krb5_db_entry *entry;
 {
     /* erase the key */
     memset((char *)entry->key.contents, 0, entry->key.length);
-    free((char *)entry->key.contents);
+    xfree(entry->key.contents);
     if (entry->salt_length)
-	free((char *)entry->salt);
+	xfree(entry->salt);
 
     krb5_free_principal(entry->principal);
     krb5_free_principal(entry->mod_name);