From: John Kohl Date: Tue, 19 Feb 1991 10:13:47 +0000 (+0000) Subject: update copyright notices X-Git-Tag: krb5-1.0-alpha4~246 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a7aeb1c0a9e0c73f7125757bc8dd263e1a248b6c;p=krb5.git update copyright notices use xfree(x) rather than free((char *)x) git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1726 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/krb425/mk_req.c b/src/lib/krb425/mk_req.c index 30ec9daf2..188f6b641 100644 --- a/src/lib/krb425/mk_req.c +++ b/src/lib/krb425/mk_req.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 * . @@ -15,7 +16,6 @@ static char rcsid_mk_req_c[] = "$Id$"; #endif /* !lint & !SABER */ -#include #include "krb425.h" int @@ -68,12 +68,12 @@ u_long checksum; EPRINT "Return to long (%d > %d)\n", outbuf.length, MAX_KTXT_LEN); #endif - free((char *)outbuf.data); + xfree(outbuf.data); return(KFAILURE); } authent->length = outbuf.length; memcpy((char *)authent->dat, (char *)outbuf.data, outbuf.length); - free((char *)outbuf.data); + xfree(outbuf.data); } return(krb425error(r)); } diff --git a/src/lib/krb425/set_key.c b/src/lib/krb425/set_key.c index a25d1a035..4e8964cc4 100644 --- a/src/lib/krb425/set_key.c +++ b/src/lib/krb425/set_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 * . @@ -15,7 +16,6 @@ static char rcsid_set_key_c[] = "$Id$"; #endif /* !lint & !SABER */ -#include #include "krb425.h" int @@ -27,7 +27,7 @@ int cvt; if (cvt) { if (keyblock.contents) - free((char *)keyblock.contents); + xfree(keyblock.contents); mit_des_string_to_key(KEYTYPE_DES, &keyblock, 0, 0); } else { if (!keyblock.contents && diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c index 78b9ed6dc..412be2489 100644 --- a/src/lib/krb5/krb/in_tkt_pwd.c +++ b/src/lib/krb5/krb/in_tkt_pwd.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 * . @@ -15,7 +16,6 @@ static char rcsid_in_tkt_pwd_c[] = "$Id$"; #endif /* !lint & !SABER */ -#include #include #include #include @@ -97,7 +97,7 @@ OLDDECLARG(krb5_pa_data **,padata) *key, &arg->password, &salt)) { - free((char *) *key); + xfree(*key); if (f_salt) xfree(salt.data); return(retval); } diff --git a/src/lib/krb5/krb/mk_error.c b/src/lib/krb5/krb/mk_error.c index 8fae668c1..f33b40271 100644 --- a/src/lib/krb5/krb/mk_error.c +++ b/src/lib/krb5/krb/mk_error.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 * . @@ -15,8 +16,6 @@ static char rcsid_mk_error_c [] = "$Id$"; #endif /* !lint & !SABER */ -#include - #include #include @@ -41,6 +40,6 @@ krb5_data *enc_err; if (retval = encode_krb5_error(dec_err, &new_enc_err)) return(retval); *enc_err = *new_enc_err; - (void)free((char *)new_enc_err); + xfree(new_enc_err); return 0; } diff --git a/src/lib/krb5/krb/mk_priv.c b/src/lib/krb5/krb/mk_priv.c index 483b1007b..d4c1e0b33 100644 --- a/src/lib/krb5/krb/mk_priv.c +++ b/src/lib/krb5/krb/mk_priv.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 * . @@ -15,7 +16,6 @@ static char rcsid_mk_priv_c[] = "$Id$"; #endif /* !lint & !SABER */ -#include #include #include #include @@ -158,7 +158,7 @@ privmsg.enc_part.ciphertext.length = 0; privmsg.enc_part.ciphertext.data = 0;} cleanup_encpart(); *outbuf = *scratch; - free((char *)scratch); + xfree(scratch); return 0; clean_prockey: diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c index 12fb9638e..5fe61d610 100644 --- a/src/lib/krb5/krb/mk_safe.c +++ b/src/lib/krb5/krb/mk_safe.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 * . @@ -15,9 +16,7 @@ static char rcsid_mk_safe_c[] = "$Id$"; #endif /* !lint & !SABER */ -#include #include - #include #include #include @@ -122,7 +121,7 @@ OLDDECLARG(krb5_data *, outbuf) } xfree(safe_checksum.contents); *outbuf = *scratch; - free((char *)scratch); + xfree(scratch); return 0; } diff --git a/src/lib/krb5/os/free_krbhs.c b/src/lib/krb5/os/free_krbhs.c index 04317babc..1e998cf61 100644 --- a/src/lib/krb5/os/free_krbhs.c +++ b/src/lib/krb5/os/free_krbhs.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 * . @@ -15,8 +16,6 @@ static char rcsid_free_krbhs_c[] = "$Id$"; #endif /* !lint & !SABER */ -#include - #include #include @@ -33,6 +32,6 @@ char * const *hostlist; for (cp = hostlist; *cp; cp++) free(*cp); - free((char *)hostlist); + xfree(hostlist); return 0; } diff --git a/src/lib/krb5/os/get_krbhst.c b/src/lib/krb5/os/get_krbhst.c index 6845e9136..6660708ca 100644 --- a/src/lib/krb5/os/get_krbhst.c +++ b/src/lib/krb5/os/get_krbhst.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 * . @@ -15,8 +16,6 @@ static char rcsid_get_krbhst_c [] = "$Id$"; #endif /* !lint & !SABER */ -#include - #include #include #include @@ -99,7 +98,7 @@ char ***hostlist; if (!rethlist[hlindex]) { for (--hlindex; hlindex >= 0; hlindex--) free(rethlist[hlindex]); - free((char *) rethlist); + xfree(rethlist); rethlist = 0; retval = ENOMEM; break; @@ -129,7 +128,7 @@ char ***hostlist; (void) fclose(config_file); if (hlindex == 0) { - free((char *)rethlist); + xfree(rethlist); rethlist = 0; retval = KRB5_REALM_UNKNOWN; } diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c index d5fe6ee6c..335788a32 100644 --- a/src/lib/krb5/os/localaddr.c +++ b/src/lib/krb5/os/localaddr.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 * . @@ -17,7 +18,6 @@ static char rcsid_getaddr_c[] = "$Id$"; #endif /* !lint & !SABER */ -#include #include #include @@ -138,7 +138,7 @@ krb5_error_code krb5_os_localaddr(addr) address->length = sizeof(struct in_addr); address->contents = (unsigned char *)malloc(address->length); if (!address->contents) { - free((char *)address); + xfree(address); address = 0; mem_err++; } else { @@ -165,7 +165,7 @@ krb5_error_code krb5_os_localaddr(addr) address->length = sizeof(struct ns_addr); address->contents = (unsigned char *)malloc(address->length); if (!address->contents) { - free((char *)address); + xfree(address); address = 0; mem_err++; } else { @@ -196,7 +196,7 @@ krb5_error_code krb5_os_localaddr(addr) if (mem_err) { for (i=0; i. @@ -15,8 +16,6 @@ static char rcsid_read_pwd_c[] = "$Id$"; #endif /* lint */ -#include - #include #include @@ -99,7 +98,7 @@ int *size_return; /* interrupted */ if (readin_string) { (void) memset((char *)readin_string, 0, *size_return); - free((char *)readin_string); + xfree(readin_string); } (void) memset(return_pwd, 0, *size_return); cleanup(KRB5_LIBOS_PWDINTR); @@ -144,7 +143,7 @@ int *size_return; (void) putchar('\n'); (void) memset((char *)readin_string, 0, *size_return); (void) memset(return_pwd, 0, *size_return); - free((char *)readin_string); + xfree(readin_string); cleanup(KRB5_LIBOS_CANTREADPWD); } (void) putchar('\n'); @@ -160,11 +159,11 @@ int *size_return; if (strncmp(return_pwd, (char *)readin_string, *size_return)) { (void) memset((char *)readin_string, 0, *size_return); (void) memset(return_pwd, 0, *size_return); - free((char *)readin_string); + xfree(readin_string); cleanup(KRB5_LIBOS_BADPWDMATCH); } (void) memset((char *)readin_string, 0, *size_return); - free((char *)readin_string); + xfree(readin_string); } /* reset intrfunc */ diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c index bdb756407..b7e19d19d 100644 --- a/src/lib/krb5/os/sendto_kdc.c +++ b/src/lib/krb5/os/sendto_kdc.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 * . @@ -16,8 +17,6 @@ static char rcsid_sendto_kdc_c[] = "$Id$"; #endif /* !lint & !SABER */ -#include - #include #include @@ -78,7 +77,7 @@ OLDDECLARG(krb5_data *, reply) socklist[i] = -1; if (!(reply->data = malloc(krb5_max_dgram_size))) { - free((char *)addr); + xfree(addr); return ENOMEM; } reply->length = krb5_max_dgram_size; @@ -170,7 +169,7 @@ OLDDECLARG(krb5_data *, reply) for (i = 0; i < AF_MAX; i++) if (socklist[i] != -1) (void) close(socklist[i]); - free((char *)addr); + xfree(addr); if (retval) { free(reply->data); reply->data = 0;