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

8 files changed, 37 insertions, 38 deletions

diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c
index 7ad59ab..497eb66 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 82bec3c..4395453 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 28d9b6b..19c8b47 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 d760ff1..7f283f2 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 9471d0a..88a517a 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 febf79b..77a83ba 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 2071437..c44463b 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 865fc14..b0dcd0e 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;