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

10 files changed, 17 insertions, 17 deletions

diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c
index af6673d07..557b63a25 100644
--- a/src/kadmin/cli/kadmin.c
+++ b/src/kadmin/cli/kadmin.c
@@ -216,7 +216,7 @@ char *kadmin_startup(argc, argv)
     char *db_name = NULL;
     char *svcname;
 
-    memset((char *) &params, 0, sizeof(params));
+    memset(&params, 0, sizeof(params));
 
 #if defined(USE_KIM)
     /* Turn off all password prompting from the KLL */
diff --git a/src/kadmin/cli/keytab.c b/src/kadmin/cli/keytab.c
index 89fbe66b1..5fb5613f2 100644
--- a/src/kadmin/cli/keytab.c
+++ b/src/kadmin/cli/keytab.c
@@ -266,7 +266,7 @@ int add_principal(void *lhandle, char *keytab_str, krb5_keytab keytab,
      krb5_keyblock *keys;
      int code, nkeys, i;
 
-     (void) memset((char *)&princ_rec, 0, sizeof(princ_rec));
+     (void) memset(&princ_rec, 0, sizeof(princ_rec));
 
      princ = NULL;
      keys = NULL;
@@ -309,7 +309,7 @@ int add_principal(void *lhandle, char *keytab_str, krb5_keytab keytab,
      }
 
      for (i = 0; i < nkeys; i++) {
-	  memset((char *) &new_entry, 0, sizeof(new_entry));
+	  memset(&new_entry, 0, sizeof(new_entry));
 	  new_entry.principal = princ;
 	  new_entry.key = keys[i];
 	  new_entry.vno = princ_rec.kvno;
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index 55677f7a5..8dab4605c 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -1493,7 +1493,7 @@ process_k5beta_record(fname, kcontext, filep, verbose, linenop)
     try2read = (char *) NULL;
     (*linenop)++;
     retval = 1;
-    memset((char *)&dbent, 0, sizeof(dbent));
+    memset(&dbent, 0, sizeof(dbent));
 
     /* Make sure we've got key_data entries */
     if (krb5_dbe_create_key_data(kcontext, &dbent) ||
@@ -1794,7 +1794,7 @@ process_k5beta6_record(fname, kcontext, filep, verbose, linenop)
     const char		*try2read;
 
     try2read = (char *) NULL;
-    memset((char *) &dbentry, 0, sizeof(dbentry));
+    memset(&dbentry, 0, sizeof(dbentry));
     (*linenop)++;
     retval = 1;
     name = (char *) NULL;
diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c
index 6a638a351..e8e489729 100644
--- a/src/kadmin/dbutil/kdb5_create.c
+++ b/src/kadmin/dbutil/kdb5_create.c
@@ -349,7 +349,7 @@ master key name '%s'\n",
     }
     /* clean up */
     (void) krb5_db_fini(util_context);
-    memset((char *)master_keyblock.contents, 0, master_keyblock.length);
+    memset(master_keyblock.contents, 0, master_keyblock.length);
     free(master_keyblock.contents);
     if (pw_str) {
 	memset(pw_str, 0, pw_size);
@@ -426,7 +426,7 @@ add_principal(context, princ, op, pblock)
     int			  nentries = 1;
     krb5_actkvno_node     actkvno;
 
-    memset((char *) &entry, 0, sizeof(entry));
+    memset(&entry, 0, sizeof(entry));
 
     entry.len = KRB5_KDB_V1_BASE_LENGTH;
     entry.attributes = pblock->flags;
@@ -449,7 +449,7 @@ add_principal(context, princ, op, pblock)
 	if ((entry.key_data=(krb5_key_data*)malloc(sizeof(krb5_key_data)))
 	    == NULL)
 	    goto error_out;
-	memset((char *) entry.key_data, 0, sizeof(krb5_key_data));
+	memset(entry.key_data, 0, sizeof(krb5_key_data));
 	entry.n_key_data = 1;
 
         if (global_params.mask & KADM5_CONFIG_KVNO)
diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c
index 786726e63..48bbd5533 100644
--- a/src/kadmin/dbutil/kdb5_mkey.c
+++ b/src/kadmin/dbutil/kdb5_mkey.c
@@ -99,7 +99,7 @@ add_new_mkey(krb5_context context, krb5_db_entry *master_entry,
     if (master_entry->key_data == NULL)
         return (ENOMEM);
 
-    memset((char *) master_entry->key_data, 0,
+    memset(master_entry->key_data, 0,
            sizeof(krb5_key_data) * (old_key_data_count + 1));
     master_entry->n_key_data = old_key_data_count + 1;
 
@@ -1308,7 +1308,7 @@ kdb5_purge_mkeys(int argc, char *argv[])
         exit_status++;
         return;
     }
-    memset((char *) master_entry.key_data, 0, sizeof(krb5_key_data) * num_kvnos_inuse);
+    memset(master_entry.key_data, 0, sizeof(krb5_key_data) * num_kvnos_inuse);
     master_entry.n_key_data = num_kvnos_inuse; /* there's only 1 mkey per kvno */
 
     /*
diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
index 6cb70c1cd..1b0d5a492 100644
--- a/src/kadmin/dbutil/kdb5_util.c
+++ b/src/kadmin/dbutil/kdb5_util.c
@@ -519,7 +519,7 @@ static int open_db_and_mkey()
     if ((retval = krb5_c_random_seed(util_context, &seed))) {
 	com_err(progname, retval, "while seeding random number generator");
 	exit_status++;
-	memset((char *)master_keyblock.contents, 0, master_keyblock.length);
+	memset(master_keyblock.contents, 0, master_keyblock.length);
 	krb5_free_keyblock_contents(util_context, &master_keyblock);
         krb5_db_free_mkey_list(util_context, master_keylist);
 	return(1);
@@ -544,7 +544,7 @@ quit()
 	return 0;
     krb5_db_free_mkey_list(util_context, master_keylist);
     retval = krb5_db_fini(util_context);
-    memset((char *)master_keyblock.contents, 0, master_keyblock.length);
+    memset(master_keyblock.contents, 0, master_keyblock.length);
     finished = TRUE;
     if (retval && retval != KRB5_KDB_DBNOTINITED) {
 	com_err(progname, retval, "while closing database");
diff --git a/src/kadmin/ktutil/ktutil_funcs.c b/src/kadmin/ktutil/ktutil_funcs.c
index c39448c20..6fa2a3025 100644
--- a/src/kadmin/ktutil/ktutil_funcs.c
+++ b/src/kadmin/ktutil/ktutil_funcs.c
@@ -131,7 +131,7 @@ krb5_error_code ktutil_add(context, list, princ_str, kvno,
     if (!entry) {
         return ENOMEM;
     }
-    memset((char *) entry, 0, sizeof(*entry));
+    memset(entry, 0, sizeof(*entry));
 
     if (!lp) {		/* if list is empty, start one */
         lp = (krb5_kt_list) malloc(sizeof(*lp));
@@ -258,7 +258,7 @@ krb5_error_code ktutil_read_keytab(context, name, list)
 	    retval = ENOMEM;
 	    break;
 	}
-	memset((char *)entry, 0, sizeof (*entry));
+	memset(entry, 0, sizeof (*entry));
 	retval = krb5_kt_next_entry(context, kt, entry, &cursor);
 	if (retval)
 	    break;
diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c
index e00701b0c..9140bbdc4 100644
--- a/src/kadmin/server/ipropd_svc.c
+++ b/src/kadmin/server/ipropd_svc.c
@@ -542,7 +542,7 @@ krb5_iprop_prog_1(struct svc_req *rqstp,
 	svcerr_noproc(transp);
 	return;
     }
-    (void) memset((char *)&argument, 0, sizeof (argument));
+    (void) memset(&argument, 0, sizeof (argument));
     if (!svc_getargs(transp, _xdr_argument, (caddr_t)&argument)) {
 	krb5_klog_syslog(LOG_ERR,
 			 _("RPC svc_getargs failed (%s)"),
diff --git a/src/kadmin/server/kadm_rpc_svc.c b/src/kadmin/server/kadm_rpc_svc.c
index cba42a48c..280cf4444 100644
--- a/src/kadmin/server/kadm_rpc_svc.c
+++ b/src/kadmin/server/kadm_rpc_svc.c
@@ -217,7 +217,7 @@ void kadm_1(rqstp, transp)
 	  svcerr_noproc(transp);
 	  return;
      }
-     memset((char *)&argument, 0, sizeof(argument));
+     memset(&argument, 0, sizeof(argument));
      if (!svc_getargs(transp, xdr_argument, &argument)) {
 	  svcerr_decode(transp);
 	  return;
diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index 81e74758f..97d714428 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -248,7 +248,7 @@ int main(int argc, char *argv[])
 
      nofork = 0;
 
-     memset((char *) &params, 0, sizeof(params));
+     memset(&params, 0, sizeof(params));
      
      argc--; argv++;
      while (argc) {