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

48 files changed, 107 insertions, 112 deletions

diff --git a/src/lib/crypto/des/afsstring2key.c b/src/lib/crypto/des/afsstring2key.c
index 571dab0070..eb6c37f33a 100644
--- a/src/lib/crypto/des/afsstring2key.c
+++ b/src/lib/crypto/des/afsstring2key.c
@@ -142,7 +142,7 @@ mit_afs_string_to_key (krb5_keyblock *keyblock, const krb5_data *data,
       (void) mit_des_cbc_cksum (password, key, i, key_sked, ikey);
 	
       /* erase key_sked */
-      memset((char *)key_sked, 0,sizeof(key_sked));
+      memset(key_sked, 0,sizeof(key_sked));
 
       /* now fix up key parity again */
       mit_des_fixup_key_parity(key);
diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index b684055c49..cb2340a4bc 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -75,7 +75,7 @@ typedef UINT64_TYPE gssint_uint64;
    (ptr) += 2;
 
 #define TWRITE_STR(ptr, str, len)               \
-   memcpy((ptr), (char *) (str), (len));        \
+   memcpy((ptr), (str), (len));                 \
    (ptr) += (len);
 
 #define TREAD_STR(ptr, str, len)                \
diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c
index f91c7525ee..631cbe0808 100644
--- a/src/lib/gssapi/krb5/init_sec_context.c
+++ b/src/lib/gssapi/krb5/init_sec_context.c
@@ -131,7 +131,7 @@ static krb5_error_code get_credentials(context, cred, server, now,
     krb5_creds          in_creds;
 
     k5_mutex_assert_locked(&cred->lock);
-    memset((char *) &in_creds, 0, sizeof(krb5_creds));
+    memset(&in_creds, 0, sizeof(krb5_creds));
     in_creds.client = in_creds.server = NULL;
 
     if ((code = krb5_copy_principal(context, cred->princ, &in_creds.client)))
diff --git a/src/lib/gssapi/krb5/util_crypt.c b/src/lib/gssapi/krb5/util_crypt.c
index a8558a5944..a800c1582e 100644
--- a/src/lib/gssapi/krb5/util_crypt.c
+++ b/src/lib/gssapi/krb5/util_crypt.c
@@ -345,10 +345,10 @@ kg_arcfour_docrypt (const krb5_keyblock *longterm_key , int ms_usage,
                  &seq_enc_key, 0,
                  &input, &output));
 cleanup_arcfour:
-    memset ((void *) seq_enc_key.contents, 0, seq_enc_key.length);
-    memset ((void *) usage_key.contents, 0, usage_key.length);
-    free ((void *) usage_key.contents);
-    free ((void *) seq_enc_key.contents);
+    memset (seq_enc_key.contents, 0, seq_enc_key.length);
+    memset (usage_key.contents, 0, usage_key.length);
+    free (usage_key.contents);
+    free (seq_enc_key.contents);
     return (code);
 }
 
@@ -713,10 +713,10 @@ kg_arcfour_docrypt_iov (krb5_context context,
                  &seq_enc_key, 0,
                  kiov, kiov_count));
 cleanup_arcfour:
-    memset ((void *) seq_enc_key.contents, 0, seq_enc_key.length);
-    memset ((void *) usage_key.contents, 0, usage_key.length);
-    free ((void *) usage_key.contents);
-    free ((void *) seq_enc_key.contents);
+    memset (seq_enc_key.contents, 0, seq_enc_key.length);
+    memset (usage_key.contents, 0, usage_key.length);
+    free (usage_key.contents);
+    free (seq_enc_key.contents);
     if (kiov != NULL)
         free(kiov);
     return (code);
diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index 5321de0bef..3a6653caf0 100644
--- a/src/lib/gssapi/spnego/spnego_mech.c
+++ b/src/lib/gssapi/spnego/spnego_mech.c
@@ -2374,7 +2374,7 @@ put_mech_oid(unsigned char **buf_out, gss_OID_const mech, unsigned int buflen)
 		return (-1);
 	*(*buf_out)++ = MECH_OID;
 	*(*buf_out)++ = (unsigned char) mech->length;
-	memcpy((void *)(*buf_out), mech->elements, mech->length);
+	memcpy(*buf_out, mech->elements, mech->length);
 	*buf_out += mech->length;
 	return (0);
 }
diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c
index 7ad59ab4d0..497eb66367 100644
--- a/src/lib/kadm5/alt_prof.c
+++ b/src/lib/kadm5/alt_prof.c
@@ -525,8 +525,8 @@ krb5_error_code kadm5_get_config_params(context, use_kdc_config,
 
     krb5_error_code        kret = 0;
 
-    memset((char *) &params, 0, sizeof(params));
-    memset((char *) &empty_params, 0, sizeof(empty_params));
+    memset(&params, 0, sizeof(params));
+    memset(&empty_params, 0, sizeof(empty_params));
 
     if (params_in == NULL) params_in = &empty_params;
 
@@ -952,7 +952,7 @@ krb5_read_realm_params(kcontext, realm, rparamp)
     }
 
     /* Initialize realm parameters */
-    memset((char *) rparams, 0, sizeof(krb5_realm_params));
+    memset(rparams, 0, sizeof(krb5_realm_params));
 
     /* Get the value for the database */
     hierarchy[0] = "realms";
diff --git a/src/lib/kadm5/clnt/client_init.c b/src/lib/kadm5/clnt/client_init.c
index 82bec3c4ef..4395453b7b 100644
--- a/src/lib/kadm5/clnt/client_init.c
+++ b/src/lib/kadm5/clnt/client_init.c
@@ -230,7 +230,7 @@ static kadm5_ret_t _kadm5_init_any(char *client_name,
       * of params_in.  So use that realm, make params_in contain an
       * empty mask, and behave like version 2.
       */
-     memset((char *) &params_local, 0, sizeof(params_local));
+     memset(&params_local, 0, sizeof(params_local));
      if (api_version == KADM5_API_VERSION_1) {
 	  realm = params_local.realm = (char *) params_in;
 	  if (params_in)
@@ -319,8 +319,7 @@ static kadm5_ret_t _kadm5_init_any(char *client_name,
 
      memset(&addr, 0, sizeof(addr));
      addr.sin_family = hp->h_addrtype;
-     (void) memcpy((char *) &addr.sin_addr, (char *) hp->h_addr,
-		   sizeof(addr.sin_addr));
+     (void) memcpy(&addr.sin_addr, hp->h_addr, sizeof(addr.sin_addr));
      if (iprop_enable)
 	 addr.sin_port = htons((u_short) handle->params.iprop_port);
      else
diff --git a/src/lib/kadm5/clnt/client_rpc.c b/src/lib/kadm5/clnt/client_rpc.c
index 28d9b6b7ce..19c8b4703a 100644
--- a/src/lib/kadm5/clnt/client_rpc.c
+++ b/src/lib/kadm5/clnt/client_rpc.c
@@ -16,7 +16,7 @@ create_principal_2(cprinc_arg *argp, CLIENT *clnt)
 {
 	static generic_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, CREATE_PRINCIPAL,
 		      (xdrproc_t) xdr_cprinc_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
@@ -31,7 +31,7 @@ create_principal3_2(cprinc3_arg *argp, CLIENT *clnt)
 {
 	static generic_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, CREATE_PRINCIPAL3,
 		      (xdrproc_t) xdr_cprinc3_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
@@ -46,7 +46,7 @@ delete_principal_2(dprinc_arg *argp, CLIENT *clnt)
 {
 	static generic_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, DELETE_PRINCIPAL,
 		      (xdrproc_t) xdr_dprinc_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
@@ -61,7 +61,7 @@ modify_principal_2(mprinc_arg *argp, CLIENT *clnt)
 {
 	static generic_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, MODIFY_PRINCIPAL,
 		      (xdrproc_t) xdr_mprinc_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
@@ -76,7 +76,7 @@ rename_principal_2(rprinc_arg *argp, CLIENT *clnt)
 {
 	static generic_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, RENAME_PRINCIPAL,
 		      (xdrproc_t) xdr_rprinc_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
@@ -91,7 +91,7 @@ get_principal_2(gprinc_arg *argp, CLIENT *clnt)
 {
 	static gprinc_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, GET_PRINCIPAL,
 		      (xdrproc_t) xdr_gprinc_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_gprinc_ret, (caddr_t) &clnt_res,
@@ -106,7 +106,7 @@ get_princs_2(gprincs_arg *argp, CLIENT *clnt)
 {
 	static gprincs_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, GET_PRINCS,
 		      (xdrproc_t) xdr_gprincs_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_gprincs_ret, (caddr_t) &clnt_res,
@@ -121,7 +121,7 @@ chpass_principal_2(chpass_arg *argp, CLIENT *clnt)
 {
 	static generic_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, CHPASS_PRINCIPAL,
 		      (xdrproc_t) xdr_chpass_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
@@ -136,7 +136,7 @@ chpass_principal3_2(chpass3_arg *argp, CLIENT *clnt)
 {
 	static generic_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, CHPASS_PRINCIPAL3,
 		      (xdrproc_t) xdr_chpass3_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
@@ -151,7 +151,7 @@ setv4key_principal_2(setv4key_arg *argp, CLIENT *clnt)
 {
 	static generic_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, SETV4KEY_PRINCIPAL,
 		      (xdrproc_t) xdr_setv4key_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
@@ -166,7 +166,7 @@ setkey_principal_2(setkey_arg *argp, CLIENT *clnt)
 {
 	static generic_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, SETKEY_PRINCIPAL,
 		      (xdrproc_t) xdr_setkey_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
@@ -181,7 +181,7 @@ setkey_principal3_2(setkey3_arg *argp, CLIENT *clnt)
 {
 	static generic_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, SETKEY_PRINCIPAL3,
 		      (xdrproc_t) xdr_setkey3_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
@@ -196,7 +196,7 @@ chrand_principal_2(chrand_arg *argp, CLIENT *clnt)
 {
 	static chrand_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, CHRAND_PRINCIPAL,
 		      (xdrproc_t) xdr_chrand_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_chrand_ret, (caddr_t) &clnt_res,
@@ -211,7 +211,7 @@ chrand_principal3_2(chrand3_arg *argp, CLIENT *clnt)
 {
 	static chrand_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, CHRAND_PRINCIPAL3,
 		      (xdrproc_t) xdr_chrand3_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_chrand_ret, (caddr_t) &clnt_res,
@@ -226,7 +226,7 @@ create_policy_2(cpol_arg *argp, CLIENT *clnt)
 {
 	static generic_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, CREATE_POLICY,
 		      (xdrproc_t) xdr_cpol_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
@@ -241,7 +241,7 @@ delete_policy_2(dpol_arg *argp, CLIENT *clnt)
 {
 	static generic_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, DELETE_POLICY,
 		      (xdrproc_t) xdr_dpol_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
@@ -256,7 +256,7 @@ modify_policy_2(mpol_arg *argp, CLIENT *clnt)
 {
 	static generic_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, MODIFY_POLICY,
 		      (xdrproc_t) xdr_mpol_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
@@ -271,7 +271,7 @@ get_policy_2(gpol_arg *argp, CLIENT *clnt)
 {
 	static gpol_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, GET_POLICY,
 		      (xdrproc_t) xdr_gpol_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_gpol_ret, (caddr_t) &clnt_res,
@@ -286,7 +286,7 @@ get_pols_2(gpols_arg *argp, CLIENT *clnt)
 {
 	static gpols_ret clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call(clnt, GET_POLS,
 		      (xdrproc_t) xdr_gpols_arg, (caddr_t) argp,
 		      (xdrproc_t) xdr_gpols_ret, (caddr_t) &clnt_res,
@@ -301,7 +301,7 @@ get_privs_2(void *argp, CLIENT *clnt)
 {
      static getprivs_ret clnt_res;
 
-     memset((char *)&clnt_res, 0, sizeof(clnt_res));
+     memset(&clnt_res, 0, sizeof(clnt_res));
      if (clnt_call(clnt, GET_PRIVS,
 		   (xdrproc_t) xdr_u_int32, (caddr_t) argp,
 		   (xdrproc_t) xdr_getprivs_ret, (caddr_t) &clnt_res,
@@ -316,7 +316,7 @@ init_2(void *argp, CLIENT *clnt)
 {
      static generic_ret clnt_res;
 
-     memset((char *)&clnt_res, 0, sizeof(clnt_res));
+     memset(&clnt_res, 0, sizeof(clnt_res));
      if (clnt_call(clnt, INIT,
 		   (xdrproc_t) xdr_u_int32, (caddr_t) argp,
 		   (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
diff --git a/src/lib/kadm5/kadm_rpc_xdr.c b/src/lib/kadm5/kadm_rpc_xdr.c
index d760ff14d1..7f283f2d0f 100644
--- a/src/lib/kadm5/kadm_rpc_xdr.c
+++ b/src/lib/kadm5/kadm_rpc_xdr.c
@@ -230,7 +230,7 @@ bool_t xdr_krb5_key_data_nocontents(XDR *xdrs, krb5_key_data *objp)
      unsigned int tmp;
 
      if (xdrs->x_op == XDR_DECODE)
-	  memset((char *) objp, 0, sizeof(krb5_key_data));
+	  memset(objp, 0, sizeof(krb5_key_data));
 
      if (!xdr_krb5_int16(xdrs, &objp->key_data_ver)) {
 	  return (FALSE);
@@ -322,7 +322,7 @@ bool_t xdr_krb5_tl_data(XDR *xdrs, krb5_tl_data **tl_data_head)
 	       tl2 = (krb5_tl_data *) malloc(sizeof(krb5_tl_data));
 	       if (tl2 == NULL)
 		    return FALSE;
-	       memset((char *) tl2, 0, sizeof(krb5_tl_data));
+	       memset(tl2, 0, sizeof(krb5_tl_data));
 	       if (!xdr_krb5_int16(xdrs, &tl2->tl_data_type))
 		    return FALSE;
 	       if (!xdr_bytes(xdrs, (char **)&tl2->tl_data_contents, &len, ~0))
diff --git a/src/lib/kadm5/srv/server_acl.c b/src/lib/kadm5/srv/server_acl.c
index 9471d0ac01..88a517a00d 100644
--- a/src/lib/kadm5/srv/server_acl.c
+++ b/src/lib/kadm5/srv/server_acl.c
@@ -607,7 +607,7 @@ kadm5int_acl_find_entry(kcontext, principal, dest_princ)
     wildstate_t		state;
 
     DPRINT(DEBUG_CALLS, acl_debug_level, ("* kadm5int_acl_find_entry()\n"));
-    memset((char *)&state, 0, sizeof state);
+    memset(&state, 0, sizeof state);
     for (entry=acl_list_head; entry; entry = entry->ae_next) {
 	if (entry->ae_name_bad)
 	    continue;
diff --git a/src/lib/kadm5/srv/server_init.c b/src/lib/kadm5/srv/server_init.c
index febf79bdf8..77a83ba604 100644
--- a/src/lib/kadm5/srv/server_init.c
+++ b/src/lib/kadm5/srv/server_init.c
@@ -210,7 +210,7 @@ kadm5_ret_t kadm5_init(char *client_name, char *pass,
       * of params_in.  So use that realm, make params_in contain an
       * empty mask, and behave like version 2.
       */
-     memset((char *) &params_local, 0, sizeof(params_local));
+     memset(&params_local, 0, sizeof(params_local));
      if (api_version == KADM5_API_VERSION_1) {
 	  params_local.realm = (char *) params_in;
 	  if (params_in)
diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c
index 207143710e..c44463bf72 100644
--- a/src/lib/kadm5/srv/svr_principal.c
+++ b/src/lib/kadm5/srv/svr_principal.c
@@ -764,7 +764,7 @@ kadm5_get_principal(void *server_handle, krb5_principal principal,
 	 mask = in_mask;
     }
 
-    memset((char *) entry, 0, sizeof(*entry));
+    memset(entry, 0, sizeof(*entry));
 
     if (principal == NULL)
 	return EINVAL;
@@ -1184,7 +1184,7 @@ static kadm5_ret_t add_to_history(krb5_context context,
 	     }
 	     free(histp->key_data);
 	 }
-	 free((void *)adb->old_keys);
+	 free(adb->old_keys);
 	 adb->old_keys = tmp;
 	 nkeys = adb->old_key_len = nhist - 1;
 	 knext = adb->old_key_next = 0;
@@ -2155,7 +2155,7 @@ static int decrypt_key_data(krb5_context context, krb5_keyblock *mkey,
      keys = (krb5_keyblock *) malloc(n_key_data*sizeof(krb5_keyblock));
      if (keys == NULL)
 	  return ENOMEM;
-     memset((char *) keys, 0, n_key_data*sizeof(krb5_keyblock));
+     memset(keys, 0, n_key_data*sizeof(krb5_keyblock));
 
      for (i = 0; i < n_key_data; i++) {
           ret = krb5_dbekd_decrypt_key_data(context, mkey,
@@ -2169,7 +2169,7 @@ static int decrypt_key_data(krb5_context context, krb5_keyblock *mkey,
 		   }
 	       }
 
-	       memset((char *) keys, 0, n_key_data*sizeof(krb5_keyblock));
+	       memset(keys, 0, n_key_data*sizeof(krb5_keyblock));
 	       free(keys);
 	       return ret;
 	  }
diff --git a/src/lib/kadm5/unit-test/setkey-test.c b/src/lib/kadm5/unit-test/setkey-test.c
index 865fc14b78..b0dcd0e7e2 100644
--- a/src/lib/kadm5/unit-test/setkey-test.c
+++ b/src/lib/kadm5/unit-test/setkey-test.c
@@ -84,7 +84,7 @@ main(int argc, char **argv)
    * to kadm5 server.
    */
 
-  memset((char *) &context, 0, sizeof(context));
+  memset(&context, 0, sizeof(context));
   kadm5_init_krb5_context(&context);
 
   ret = krb5_parse_name(context, principal, &princ);
@@ -174,7 +174,7 @@ main(int argc, char **argv)
        for (encnum = 0; testp[encnum].magic != -1; encnum++) {
 	    printf("+   enctype %d\n", testp[encnum].enctype);
 		   
-	    memset((char *) &ktent, 0, sizeof(ktent));
+	    memset(&ktent, 0, sizeof(ktent));
 	    ktent.principal = princ;
 	    ktent.key = testp[encnum];
 	    ktent.vno = princ_ent.kvno;
@@ -185,7 +185,7 @@ main(int argc, char **argv)
 		 exit(1);
 	    }
 
-	    memset((char *)&my_creds, 0, sizeof(my_creds));
+	    memset(&my_creds, 0, sizeof(my_creds));
 	    my_creds.client = princ;
 	    my_creds.server = server;
 	    
diff --git a/src/lib/kdb/kdb_cpw.c b/src/lib/kdb/kdb_cpw.c
index 2062055d03..9f1f2b14e4 100644
--- a/src/lib/kdb/kdb_cpw.c
+++ b/src/lib/kdb/kdb_cpw.c
@@ -449,8 +449,8 @@ add_key_pwd(context, master_key, ks_tuple, ks_tuple_count, passwd,
 	    if(!(key_salt.data.data = (char *) malloc(slen+1)))
 	        return ENOMEM;
 	    key_salt.data.data[slen] = 0;
-	    memcpy((char *)key_salt.data.data,
-		   (char *)(*krb5_princ_realm(context,db_entry->princ)).data,
+	    memcpy(key_salt.data.data,
+		   (*krb5_princ_realm(context,db_entry->princ)).data,
 		   slen);
 	    key_salt.data.length = SALT_TYPE_AFS_LENGTH; /*length actually used below...*/
 #endif
diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c
index df87916242..098879d93e 100644
--- a/src/lib/kdb/kdb_default.c
+++ b/src/lib/kdb/kdb_default.c
@@ -204,7 +204,7 @@ krb5_def_store_mkey_list(krb5_context       context,
         goto out;
 
     while (keylist && !retval) {
-        memset((char *) &new_entry, 0, sizeof(new_entry));
+        memset(&new_entry, 0, sizeof(new_entry));
         new_entry.principal = mname;
         new_entry.key = keylist->keyblock;
         new_entry.vno = keylist->kvno;
diff --git a/src/lib/krb5/asn.1/asn1glue.h b/src/lib/krb5/asn.1/asn1glue.h
index 48cdc74290..9ec10ebc8e 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 d8257a231d..9b7280b489 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 40b3d95d04..ea4ef3a0cf 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 f3f75c33b8..c3dcd57d03 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 9a94cddedd..e9472eec80 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 2bff2c36eb..c7c1b161c8 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 5ba90c6b90..41032cca56 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 e7fc2772a1..f926b4f369 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 76d8bcface..1dc3362d0c 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 150be0a57e..fb90bfac13 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 ccaef4d881..08646da6e5 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 fff8b903b8..c02ddedc6b 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 52d17e0bb0..5db253d714 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 6bf20c5a94..1774e6e6ca 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 e626872a0d..1acffd5b4c 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 2935e41b39..0fc1e7213e 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 c2937ea039..d99b1a3d7f 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 938b4483d4..a79ef7fdf5 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 ab3e1e48ae..ce9da12727 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 ab136abb78..83914c4989 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 a082b82587..67b9adde06 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 1776a3f214..c92ce50c67 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 309c3b57f4..795ce1e011 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 4832cec197..681928aa59 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 a5cc99a654..d084ded67f 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 6b5838b850..984e65fa34 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;
diff --git a/src/lib/rpc/auth_gssapi.c b/src/lib/rpc/auth_gssapi.c
index 7211156708..69a4fd1a4f 100644
--- a/src/lib/rpc/auth_gssapi.c
+++ b/src/lib/rpc/auth_gssapi.c
@@ -176,8 +176,8 @@ AUTH *auth_gssapi_create(
 	  rpc_createerr.cf_error.re_errno = ENOMEM;
 	  goto cleanup;
      }
-     memset((char *) auth, 0, sizeof(*auth));
-     memset((char *) pdata, 0, sizeof(*pdata));
+     memset(auth, 0, sizeof(*auth));
+     memset(pdata, 0, sizeof(*pdata));
      
      auth->ah_ops = &auth_gssapi_ops;
      auth->ah_private = (caddr_t) pdata;
@@ -246,7 +246,7 @@ try_new_version:
 	  bindp = NULL;
      }
      
-     memset((char *) &call_res, 0, sizeof(call_res));
+     memset(&call_res, 0, sizeof(call_res));
      
 next_token:
      *gssstat = gss_init_sec_context(minor_stat,
@@ -283,7 +283,7 @@ next_token:
 	  
 	  PRINTF(("gssapi_create: calling GSSAPI_INIT (%d)\n", init_func));
 	  
-	  memset((char *) &call_res, 0, sizeof(call_res));
+	  memset(&call_res, 0, sizeof(call_res));
 	  callstat = clnt_call(clnt, init_func,
 			       xdr_authgssapi_init_arg, &call_arg,
 			       xdr_authgssapi_init_res, &call_res,
diff --git a/src/lib/rpc/get_myaddress.c b/src/lib/rpc/get_myaddress.c
index 884a19b701..6ec0170631 100644
--- a/src/lib/rpc/get_myaddress.c
+++ b/src/lib/rpc/get_myaddress.c
@@ -52,7 +52,7 @@ static char sccsid[] = "@(#)get_myaddress.c 1.4 87/08/11 Copyr 1984 Sun Micro";
 int
 get_myaddress(struct sockaddr_in *addr)
 {
-	memset((void *) addr, 0, sizeof(*addr));
+	memset(addr, 0, sizeof(*addr));
 	addr->sin_family = AF_INET;
 	addr->sin_port = htons(PMAPPORT);
 	addr->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
diff --git a/src/lib/rpc/svc_auth_gssapi.c b/src/lib/rpc/svc_auth_gssapi.c
index e374f006ba..e14a581a6a 100644
--- a/src/lib/rpc/svc_auth_gssapi.c
+++ b/src/lib/rpc/svc_auth_gssapi.c
@@ -169,7 +169,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
      /* use AUTH_NONE until there is a client_handle */
      rqst->rq_xprt->xp_auth = &svc_auth_none;
      
-     memset((char *) &call_res, 0, sizeof(call_res));
+     memset(&call_res, 0, sizeof(call_res));
      creds.client_handle.length = 0;
      creds.client_handle.value = NULL;
      
@@ -185,7 +185,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
 
      PRINTF(("svcauth_gssapi: decoding credentials\n"));
      xdrmem_create(&xdrs, cred->oa_base, cred->oa_length, XDR_DECODE); 
-     memset((char *) &creds, 0, sizeof(creds));
+     memset(&creds, 0, sizeof(creds));
      if (! xdr_authgssapi_creds(&xdrs, &creds)) {
 	  PRINTF(("svcauth_gssapi: failed decoding creds\n"));
 	  LOG_MISCERR("protocol error in client credentials");
@@ -691,7 +691,7 @@ static svc_auth_gssapi_data *create_client(void)
      client_data = (svc_auth_gssapi_data *) malloc(sizeof(*client_data));
      if (client_data == NULL)
 	  return NULL;
-     memset((char *) client_data, 0, sizeof(*client_data));
+     memset(client_data, 0, sizeof(*client_data));
      L_PRINTF(2, ("create_client: new client_data = %p\n", 
 		  (void *) client_data));
      
diff --git a/src/lib/rpc/svc_tcp.c b/src/lib/rpc/svc_tcp.c
index 595723f043..46c207adb9 100644
--- a/src/lib/rpc/svc_tcp.c
+++ b/src/lib/rpc/svc_tcp.c
@@ -156,7 +156,7 @@ svctcp_create(
 		set_cloexec_fd(sock);
 		madesock = TRUE;
 	}
-	memset((char *)&addr, 0, sizeof (addr));
+	memset(&addr, 0, sizeof (addr));
 #if HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
 	addr.sin_len = sizeof(addr);
 #endif
diff --git a/src/lib/rpc/svc_udp.c b/src/lib/rpc/svc_udp.c
index f4cbddd561..232872dd8e 100644
--- a/src/lib/rpc/svc_udp.c
+++ b/src/lib/rpc/svc_udp.c
@@ -123,7 +123,7 @@ svcudp_bufcreate(
 		set_cloexec_fd(sock);
 		madesock = TRUE;
 	}
-	memset((char *)&addr, 0, sizeof (addr));
+	memset(&addr, 0, sizeof (addr));
 #if HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
 	addr.sin_len = sizeof(addr);
 #endif
@@ -194,7 +194,7 @@ svcudp_recv(
 	uint32_t replylen;
 
     again:
-	memset((char *) &dummy, 0, sizeof(dummy));
+	memset(&dummy, 0, sizeof(dummy));
 	dummy_iov[0].iov_base = rpc_buffer(xprt);
 	dummy_iov[0].iov_len = (int) su->su_iosz;
 	dummy.msg_iov = dummy_iov;
@@ -337,7 +337,7 @@ svcudp_destroy(register SVCXPRT *xprt)
 	(type *) mem_alloc((unsigned) (sizeof(type) * (size)))
 
 #define BZERO(addr, type, size)	 \
-	memset((char *) addr, 0, sizeof(type) * (int) (size)) 
+	memset(addr, 0, sizeof(type) * (int) (size)) 
 
 /*
  * An entry in the cache
diff --git a/src/lib/rpc/unit-test/rpc_test_clnt.c b/src/lib/rpc/unit-test/rpc_test_clnt.c
index 7363925517..4e4a18a720 100644
--- a/src/lib/rpc/unit-test/rpc_test_clnt.c
+++ b/src/lib/rpc/unit-test/rpc_test_clnt.c
@@ -11,7 +11,7 @@ rpc_test_echo_1(argp, clnt)
 {
 	static char *clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof (clnt_res));
+	memset(&clnt_res, 0, sizeof (clnt_res));
 	if (clnt_call(clnt, RPC_TEST_ECHO,
 		(xdrproc_t) xdr_wrapstring, (caddr_t) argp,
 		(xdrproc_t) xdr_wrapstring, (caddr_t) &clnt_res,
diff --git a/src/lib/rpc/unit-test/rpc_test_svc.c b/src/lib/rpc/unit-test/rpc_test_svc.c
index 4200d955c2..61b51e08b4 100644
--- a/src/lib/rpc/unit-test/rpc_test_svc.c
+++ b/src/lib/rpc/unit-test/rpc_test_svc.c
@@ -53,7 +53,7 @@ rpc_test_prog_1_svc(rqstp, transp)
 		_rpcsvcstate = _SERVED;
 		return;
 	}
-	(void) memset((char *)&argument, 0, sizeof (argument));
+	(void) memset(&argument, 0, sizeof (argument));
 	if (!svc_getargs(transp, xdr_argument, &argument)) {
 		svcerr_decode(transp);
 		_rpcsvccount--;