Remove unnecessary pointer casts in args to free,memcpy,memset,memchr except unicode, windows code

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

26 files changed, 41 insertions, 45 deletions

diff --git a/src/lib/krb5/asn.1/asn1glue.h b/src/lib/krb5/asn.1/asn1glue.h
index 48cdc7429..9ec10ebc8 100644
--- a/src/lib/krb5/asn.1/asn1glue.h
+++ b/src/lib/krb5/asn.1/asn1glue.h
@@ -40,7 +40,6 @@
 #define KRB5_APOptions2krb5_apoptions(val, err) KRB5_TicketFlags2krb5_flags((struct type_KRB5_APOptions *) (val), err)
 
 /* to keep lint happy */
-#define xbcopy(src,dst,size) memcpy((char *)(dst), (char *)(src), size)
 #define xmalloc(n) malloc((unsigned) (n))
 #define xcalloc(n,s) calloc((unsigned)(n), (unsigned)(s))
 
diff --git a/src/lib/krb5/ccache/cc_file.c b/src/lib/krb5/ccache/cc_file.c
index d8257a231..9b7280b48 100644
--- a/src/lib/krb5/ccache/cc_file.c
+++ b/src/lib/krb5/ccache/cc_file.c
@@ -1891,7 +1891,7 @@ krb5_fcc_next_cred(krb5_context context, krb5_ccache id, krb5_cc_cursor *cursor,
      if (kret)
 	 return kret;
 
-     memset((char *)creds, 0, sizeof(*creds));
+     memset(creds, 0, sizeof(*creds));
      MAYBE_OPEN(context, id, FCC_OPEN_RDONLY);
      fcursor = (krb5_fcc_cursor *) *cursor;
 
diff --git a/src/lib/krb5/krb/auth_con.c b/src/lib/krb5/krb/auth_con.c
index 40b3d95d0..ea4ef3a0c 100644
--- a/src/lib/krb5/krb/auth_con.c
+++ b/src/lib/krb5/krb/auth_con.c
@@ -15,7 +15,7 @@ actx_copy_addr(krb5_context context, const krb5_address *inad, krb5_address **ou
 	free(tmpad);
 	return ENOMEM;
     }
-    memcpy((char *)tmpad->contents, (char *)inad->contents, inad->length);
+    memcpy(tmpad->contents, inad->contents, inad->length);
     *outad = tmpad;
     return 0;
 }
diff --git a/src/lib/krb5/krb/copy_addrs.c b/src/lib/krb5/krb/copy_addrs.c
index f3f75c33b..c3dcd57d0 100644
--- a/src/lib/krb5/krb/copy_addrs.c
+++ b/src/lib/krb5/krb/copy_addrs.c
@@ -41,7 +41,7 @@ krb5_copy_addr(krb5_context context, const krb5_address *inad, krb5_address **ou
 	free(tmpad);
 	return ENOMEM;
     }
-    memcpy((char *)tmpad->contents, (char *)inad->contents, inad->length);
+    memcpy(tmpad->contents, inad->contents, inad->length);
     *outad = tmpad;
     return 0;
 }
diff --git a/src/lib/krb5/krb/copy_auth.c b/src/lib/krb5/krb/copy_auth.c
index 9a94cdded..e9472eec8 100644
--- a/src/lib/krb5/krb/copy_auth.c
+++ b/src/lib/krb5/krb/copy_auth.c
@@ -68,7 +68,7 @@ krb5_copy_authdatum(krb5_context context, const krb5_authdata *inad, krb5_authda
 	free(tmpad);
 	return ENOMEM;
     }
-    memcpy((char *)tmpad->contents, (char *)inad->contents, inad->length);
+    memcpy(tmpad->contents, inad->contents, inad->length);
     *outad = tmpad;
     return 0;
 }
diff --git a/src/lib/krb5/krb/copy_cksum.c b/src/lib/krb5/krb/copy_cksum.c
index 2bff2c36e..c7c1b161c 100644
--- a/src/lib/krb5/krb/copy_cksum.c
+++ b/src/lib/krb5/krb/copy_cksum.c
@@ -38,13 +38,11 @@ krb5_copy_checksum(krb5_context context, const krb5_checksum *ckfrom, krb5_check
 	return ENOMEM;
     *tempto = *ckfrom;
 
-    if (!(tempto->contents =
-	  (krb5_octet *)malloc(tempto->length))) {
+    if (!(tempto->contents = (krb5_octet *)malloc(tempto->length))) {
 	free(tempto);
 	return ENOMEM;
     }
-    memcpy((char *) tempto->contents, (char *) ckfrom->contents,
-	   ckfrom->length);
+    memcpy(tempto->contents, ckfrom->contents, ckfrom->length);
 
     *ckto = tempto;
     return 0;
diff --git a/src/lib/krb5/krb/copy_data.c b/src/lib/krb5/krb/copy_data.c
index 5ba90c6b9..41032cca5 100644
--- a/src/lib/krb5/krb/copy_data.c
+++ b/src/lib/krb5/krb/copy_data.c
@@ -68,7 +68,7 @@ krb5int_copy_data_contents(krb5_context context, const krb5_data *indata, krb5_d
 	if (!(outdata->data = malloc(outdata->length))) {
 	    return ENOMEM;
 	}
-	memcpy((char *)outdata->data, (char *)indata->data, outdata->length);
+	memcpy(outdata->data, indata->data, outdata->length);
     } else
 	outdata->data = 0;
     outdata->magic = KV5M_DATA;
diff --git a/src/lib/krb5/krb/copy_key.c b/src/lib/krb5/krb/copy_key.c
index e7fc2772a..f926b4f36 100644
--- a/src/lib/krb5/krb/copy_key.c
+++ b/src/lib/krb5/krb/copy_key.c
@@ -44,8 +44,7 @@ krb5_copy_keyblock(krb5_context context, const krb5_keyblock *from, krb5_keybloc
 		free(new_key);
 		return(ENOMEM);
 	}
-	memcpy((char *)new_key->contents, (char *)from->contents,
-	       new_key->length);
+	memcpy(new_key->contents, from->contents, new_key->length);
 	*to = new_key;
 	return 0;
 }
diff --git a/src/lib/krb5/krb/copy_tick.c b/src/lib/krb5/krb/copy_tick.c
index 76d8bcfac..1dc3362d0 100644
--- a/src/lib/krb5/krb/copy_tick.c
+++ b/src/lib/krb5/krb/copy_tick.c
@@ -62,7 +62,7 @@ krb5_copy_enc_tkt_part(krb5_context context, const krb5_enc_tkt_part *partfrom,
 	    free(tempto);
 	    return ENOMEM;
 	}
-	memcpy((char *)tempto->transited.tr_contents.data,
+	memcpy(tempto->transited.tr_contents.data,
 	       (char *)partfrom->transited.tr_contents.data,
 	       partfrom->transited.tr_contents.length);
     }
diff --git a/src/lib/krb5/krb/cp_key_cnt.c b/src/lib/krb5/krb/cp_key_cnt.c
index 150be0a57..fb90bfac1 100644
--- a/src/lib/krb5/krb/cp_key_cnt.c
+++ b/src/lib/krb5/krb/cp_key_cnt.c
@@ -40,7 +40,7 @@ krb5_copy_keyblock_contents(krb5_context context, const krb5_keyblock *from, krb
         to->contents = (krb5_octet *)malloc(to->length);
         if (!to->contents)
             return ENOMEM;
-        memcpy((char *)to->contents, (char *)from->contents, to->length);
+        memcpy(to->contents, from->contents, to->length);
     } else 
         to->contents = 0;
     return 0;
diff --git a/src/lib/krb5/krb/fwd_tgt.c b/src/lib/krb5/krb/fwd_tgt.c
index ccaef4d88..08646da6e 100644
--- a/src/lib/krb5/krb/fwd_tgt.c
+++ b/src/lib/krb5/krb/fwd_tgt.c
@@ -57,8 +57,8 @@ krb5_fwd_tgt_creds(krb5_context context, krb5_auth_context auth_context, char *r
     krb5_keyblock *session_key;
     krb5_boolean old_use_conf_ktypes = context->use_conf_ktypes;
 
-    memset((char *)&creds, 0, sizeof(creds));
-    memset((char *)&tgt, 0, sizeof(creds));
+    memset(&creds, 0, sizeof(creds));
+    memset(&tgt, 0, sizeof(creds));
 
     if (cc == 0) {
       if ((retval = krb5int_cc_default(context, &cc)))
diff --git a/src/lib/krb5/krb/get_creds.c b/src/lib/krb5/krb/get_creds.c
index fff8b903b..c02ddedc6 100644
--- a/src/lib/krb5/krb/get_creds.c
+++ b/src/lib/krb5/krb/get_creds.c
@@ -54,7 +54,7 @@ krb5_get_credentials_core(krb5_context context, krb5_flags options,
     if (!in_creds || !in_creds->server || !in_creds->client)
         return EINVAL;
 
-    memset((char *)mcreds, 0, sizeof(krb5_creds));
+    memset(mcreds, 0, sizeof(krb5_creds));
     mcreds->magic = KV5M_CREDS;
     if (in_creds->times.endtime != 0) {
 	mcreds->times.endtime = in_creds->times.endtime;
@@ -122,7 +122,7 @@ krb5_get_credentials(krb5_context context, krb5_flags options,
     if ((ncreds = (krb5_creds *)malloc(sizeof(krb5_creds))) == NULL)
 	return ENOMEM;
 
-    memset((char *)ncreds, 0, sizeof(krb5_creds));
+    memset(ncreds, 0, sizeof(krb5_creds));
     ncreds->magic = KV5M_CREDS;
 
     /* The caller is now responsible for cleaning up in_creds */
@@ -261,7 +261,7 @@ krb5_validate_or_renew_creds(krb5_context context, krb5_creds *creds,
     krb5_creds *out_creds = 0; /* for check before dereferencing below */
     krb5_creds **tgts;
 
-    memset((char *)&in_creds, 0, sizeof(krb5_creds));
+    memset(&in_creds, 0, sizeof(krb5_creds));
 
     in_creds.server = NULL;
     tgts = NULL;
diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index 52d17e0bb..5db253d71 100644
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -428,7 +428,7 @@ cleanup:
 	if (server)
 	    krb5_free_principal(context, server);
 	if (creds->keyblock.contents) {
-	    memset((char *)creds->keyblock.contents, 0,
+	    memset(creds->keyblock.contents, 0,
 		   creds->keyblock.length);
 	    free(creds->keyblock.contents);
 	    creds->keyblock.contents = 0;
diff --git a/src/lib/krb5/krb/kfree.c b/src/lib/krb5/krb/kfree.c
index 6bf20c5a9..1774e6e6c 100644
--- a/src/lib/krb5/krb/kfree.c
+++ b/src/lib/krb5/krb/kfree.c
@@ -187,7 +187,7 @@ krb5_free_cred_contents(krb5_context context, krb5_creds *val)
 	val->server = 0;
     }
     if (val->keyblock.contents) {
-	memset((char *)val->keyblock.contents, 0, val->keyblock.length);
+	memset(val->keyblock.contents, 0, val->keyblock.length);
 	free(val->keyblock.contents);
 	val->keyblock.contents = 0;
     }
diff --git a/src/lib/krb5/krb/mk_priv.c b/src/lib/krb5/krb/mk_priv.c
index e626872a0..1acffd5b4 100644
--- a/src/lib/krb5/krb/mk_priv.c
+++ b/src/lib/krb5/krb/mk_priv.c
@@ -119,7 +119,7 @@ krb5_mk_priv(krb5_context context, krb5_auth_context auth_context,
     krb5_replay_data      replaydata;
 
     /* Clear replaydata block */
-    memset((char *) &replaydata, 0, sizeof(krb5_replay_data));
+    memset(&replaydata, 0, sizeof(krb5_replay_data));
 
     /* Get keyblock */
     if ((keyblock = auth_context->send_subkey) == NULL)
diff --git a/src/lib/krb5/krb/mk_req.c b/src/lib/krb5/krb/mk_req.c
index 2935e41b3..0fc1e7213 100644
--- a/src/lib/krb5/krb/mk_req.c
+++ b/src/lib/krb5/krb/mk_req.c
@@ -65,7 +65,7 @@ krb5_mk_req(krb5_context context, krb5_auth_context *auth_context,
       return retval;
 
     /* obtain ticket & session key */
-    memset((char *)&creds, 0, sizeof(creds));
+    memset(&creds, 0, sizeof(creds));
     if ((retval = krb5_copy_principal(context, server, &creds.server)))
 	goto cleanup_princ;
 
diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c
index c2937ea03..d99b1a3d7 100644
--- a/src/lib/krb5/krb/mk_safe.c
+++ b/src/lib/krb5/krb/mk_safe.c
@@ -104,7 +104,7 @@ krb5_mk_safe_basic(krb5_context context, const krb5_data *userdata,
 cleanup_checksum:
     free(safe_checksum.contents);
 
-    memset((char *)scratch1->data, 0, scratch1->length); 
+    memset(scratch1->data, 0, scratch1->length); 
     krb5_free_data(context, scratch1);
     return retval;
 }
@@ -119,7 +119,7 @@ krb5_mk_safe(krb5_context context, krb5_auth_context auth_context,
     krb5_replay_data      replaydata;
 
     /* Clear replaydata block */
-    memset((char *) &replaydata, 0, sizeof(krb5_replay_data));
+    memset(&replaydata, 0, sizeof(krb5_replay_data));
 
     /* Get keyblock */
     if ((keyblock = auth_context->send_subkey) == NULL)
diff --git a/src/lib/krb5/krb/rd_safe.c b/src/lib/krb5/krb/rd_safe.c
index 938b4483d..a79ef7fdf 100644
--- a/src/lib/krb5/krb/rd_safe.c
+++ b/src/lib/krb5/krb/rd_safe.c
@@ -128,7 +128,7 @@ krb5_rd_safe_basic(krb5_context context, const krb5_data *inbuf,
 				    KRB5_KEYUSAGE_KRB_SAFE_CKSUM,
 				    scratch, his_cksum, &valid);
 
-    (void) memset((char *)scratch->data, 0, scratch->length);
+    (void) memset(scratch->data, 0, scratch->length);
     krb5_free_data(context, scratch);
     
     if (!valid) {
diff --git a/src/lib/krb5/krb/recvauth.c b/src/lib/krb5/krb/recvauth.c
index ab3e1e48a..ce9da1272 100644
--- a/src/lib/krb5/krb/recvauth.c
+++ b/src/lib/krb5/krb/recvauth.c
@@ -177,7 +177,7 @@ recvauth_common(krb5_context context,
 	krb5_error	error;
 	const	char *message;
 
-	memset((char *)&error, 0, sizeof(error));
+	memset(&error, 0, sizeof(error));
 	krb5_us_timeofday(context, &error.stime, &error.susec);
 	if(server) 
 		error.server = server;
diff --git a/src/lib/krb5/krb/send_tgs.c b/src/lib/krb5/krb/send_tgs.c
index ab136abb7..83914c498 100644
--- a/src/lib/krb5/krb/send_tgs.c
+++ b/src/lib/krb5/krb/send_tgs.c
@@ -147,7 +147,7 @@ krb5_send_tgs(krb5_context context, krb5_flags kdcoptions,
     if (!in_cred->ticket.length)
         return(KRB5_NO_TKT_SUPPLIED);
 
-    memset((char *)&tgsreq, 0, sizeof(tgsreq));
+    memset(&tgsreq, 0, sizeof(tgsreq));
 
     tgsreq.kdc_options = kdcoptions;
     tgsreq.server = (krb5_principal) sname;
diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c
index a082b8258..67b9adde0 100644
--- a/src/lib/krb5/krb/sendauth.c
+++ b/src/lib/krb5/krb/sendauth.c
@@ -91,7 +91,7 @@ krb5_sendauth(krb5_context context, krb5_auth_context *auth_context,
      * If no credentials were provided, try getting it from the
      * credentials cache.
      */
-    memset((char *)&creds, 0, sizeof(creds));
+    memset(&creds, 0, sizeof(creds));
 
     /*
      * See if we need to access the credentials cache
diff --git a/src/lib/krb5/krb/t_ser.c b/src/lib/krb5/krb/t_ser.c
index 1776a3f21..c92ce50c6 100644
--- a/src/lib/krb5/krb/t_ser.c
+++ b/src/lib/krb5/krb/t_ser.c
@@ -562,7 +562,7 @@ ser_cksum_test(krb5_context kcontext, int verbose)
 	checksum.checksum_type = 123;
 	checksum.length = sizeof(ckdata);
 	checksum.contents = ckdata;
-	memcpy(ckdata, (char *) &stuff, sizeof(ckdata)); 
+	memcpy(ckdata, &stuff, sizeof(ckdata)); 
 	if (!(kret = ser_data(verbose, "> checksum with data",
 			      (krb5_pointer) &checksum, KV5M_CHECKSUM))) {
 	    if (verbose)
diff --git a/src/lib/krb5/os/full_ipadr.c b/src/lib/krb5/os/full_ipadr.c
index 309c3b57f..795ce1e01 100644
--- a/src/lib/krb5/os/full_ipadr.c
+++ b/src/lib/krb5/os/full_ipadr.c
@@ -59,25 +59,25 @@ krb5_make_full_ipaddr(krb5_context context, krb5_int32 adr,
     marshal = retaddr->contents;
 
     temptype = htons(ADDRTYPE_INET);
-    (void) memcpy((char *)marshal, (char *)&temptype, sizeof(temptype));
+    (void) memcpy(marshal, &temptype, sizeof(temptype));
     marshal += sizeof(temptype);
 
     templength = htonl(sizeof(smushaddr));
-    (void) memcpy((char *)marshal, (char *)&templength, sizeof(templength));
+    (void) memcpy(marshal, &templength, sizeof(templength));
     marshal += sizeof(templength);
 
-    (void) memcpy((char *)marshal, (char *)&smushaddr, sizeof(smushaddr));
+    (void) memcpy(marshal, &smushaddr, sizeof(smushaddr));
     marshal += sizeof(smushaddr);
 
     temptype = htons(ADDRTYPE_IPPORT);
-    (void) memcpy((char *)marshal, (char *)&temptype, sizeof(temptype));
+    (void) memcpy(marshal, &temptype, sizeof(temptype));
     marshal += sizeof(temptype);
 
     templength = htonl(sizeof(smushport));
-    (void) memcpy((char *)marshal, (char *)&templength, sizeof(templength));
+    (void) memcpy(marshal, &templength, sizeof(templength));
     marshal += sizeof(templength);
 
-    (void) memcpy((char *)marshal, (char *)&smushport, sizeof(smushport));
+    (void) memcpy(marshal, &smushport, sizeof(smushport));
     marshal += sizeof(smushport);
 
     *outaddr = retaddr;
diff --git a/src/lib/krb5/os/gen_port.c b/src/lib/krb5/os/gen_port.c
index 4832cec19..681928aa5 100644
--- a/src/lib/krb5/os/gen_port.c
+++ b/src/lib/krb5/os/gen_port.c
@@ -41,7 +41,7 @@ krb5_gen_portaddr(krb5_context context, const krb5_address *addr, krb5_const_poi
 	return KRB5_PROG_ATYPE_NOSUPP;
     port = *(const krb5_int16 *)ptr;
     
-    memcpy((char *)&adr, (char *)addr->contents, sizeof(adr));
+    memcpy(&adr, addr->contents, sizeof(adr));
     return krb5_make_full_ipaddr(context, adr, port, outaddr);
 #else
     return KRB5_PROG_ATYPE_NOSUPP;
diff --git a/src/lib/krb5/os/mk_faddr.c b/src/lib/krb5/os/mk_faddr.c
index a5cc99a65..d084ded67 100644
--- a/src/lib/krb5/os/mk_faddr.c
+++ b/src/lib/krb5/os/mk_faddr.c
@@ -64,7 +64,7 @@ krb5_make_fulladdr(krb5_context context, krb5_address *kaddr, krb5_address *kpor
     store_32_le(tmp32, marshal);
     marshal += 4;
 
-    (void) memcpy((char *)marshal, (char *)(kaddr->contents), kaddr->length);
+    (void) memcpy(marshal, kaddr->contents, kaddr->length);
     marshal += kaddr->length;
 
     tmp16 = kport->addrtype;
@@ -77,7 +77,7 @@ krb5_make_fulladdr(krb5_context context, krb5_address *kaddr, krb5_address *kpor
     store_32_le(tmp32, marshal);
     marshal += 4;
 
-    (void) memcpy((char *)marshal, (char *)(kport->contents), kport->length);
+    (void) memcpy(marshal, kport->contents, kport->length);
     marshal += kport->length;
     return 0;
 }
diff --git a/src/lib/krb5/os/port2ip.c b/src/lib/krb5/os/port2ip.c
index 6b5838b85..984e65fa3 100644
--- a/src/lib/krb5/os/port2ip.c
+++ b/src/lib/krb5/os/port2ip.c
@@ -50,31 +50,31 @@ krb5_unpack_full_ipaddr(krb5_context context, const krb5_address *inaddr, krb5_i
 
     marshal = inaddr->contents;
 
-    (void) memcpy((char *)&temptype, (char *)marshal, sizeof(temptype));
+    (void) memcpy(&temptype, marshal, sizeof(temptype));
     marshal += sizeof(temptype);
     if (temptype != htons(ADDRTYPE_INET))
 	return KRB5_PROG_ATYPE_NOSUPP;
 
-    (void) memcpy((char *)&templength, (char *)marshal, sizeof(templength));
+    (void) memcpy(&templength, marshal, sizeof(templength));
     marshal += sizeof(templength);
     if (templength != htonl(sizeof(smushaddr)))
 	return KRB5_PROG_ATYPE_NOSUPP;
 
-    (void) memcpy((char *)&smushaddr, (char *)marshal, sizeof(smushaddr));
+    (void) memcpy(&smushaddr, marshal, sizeof(smushaddr));
     /* leave in net order */
     marshal += sizeof(smushaddr);
 
-    (void) memcpy((char *)&temptype, (char *)marshal, sizeof(temptype));
+    (void) memcpy(&temptype, marshal, sizeof(temptype));
     marshal += sizeof(temptype);
     if (temptype != htons(ADDRTYPE_IPPORT))
 	return KRB5_PROG_ATYPE_NOSUPP;
 
-    (void) memcpy((char *)&templength, (char *)marshal, sizeof(templength));
+    (void) memcpy(&templength, marshal, sizeof(templength));
     marshal += sizeof(templength);
     if (templength != htonl(sizeof(smushport)))
 	return KRB5_PROG_ATYPE_NOSUPP;
 
-    (void) memcpy((char *)&smushport, (char *)marshal, sizeof(smushport));
+    (void) memcpy(&smushport, marshal, sizeof(smushport));
     /* leave in net order */
 
     *adr = (krb5_int32) smushaddr;