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

4 files changed, 18 insertions, 18 deletions

diff --git a/src/slave/kprop.c b/src/slave/kprop.c
index 5f68f29e8e..0c2709ae95 100644
--- a/src/slave/kprop.c
+++ b/src/slave/kprop.c
@@ -262,7 +262,7 @@ void get_tickets(context)
 	 *
 	 * Construct the principal name for the slave host.
 	 */
-	memset((char *)&creds, 0, sizeof(creds));
+	memset(&creds, 0, sizeof(creds));
 	retval = krb5_sname_to_principal(context,
 					 slave_host, KPROP_SERVICE_NAME,
 					 KRB5_NT_SRV_HST, &creds.server);
@@ -342,7 +342,7 @@ open_connection(host, fd, Errmsg, ErrmsgSz)
 		return(0);
 	}
 	my_sin.sin_family = hp->h_addrtype;
-	memcpy((char *)&my_sin.sin_addr, hp->h_addr, sizeof(my_sin.sin_addr));
+	memcpy(&my_sin.sin_addr, hp->h_addr, sizeof(my_sin.sin_addr));
 	if(!port) {
 		sp = getservbyname(KPROP_SERVICE, "tcp");
 		if (sp == 0) {
@@ -372,7 +372,7 @@ open_connection(host, fd, Errmsg, ErrmsgSz)
 	receiver_addr.addrtype = ADDRTYPE_INET;
 	receiver_addr.length = sizeof(my_sin.sin_addr);
 	receiver_addr.contents = (krb5_octet *) malloc(sizeof(my_sin.sin_addr));
-	memcpy((char *) receiver_addr.contents, (char *) &my_sin.sin_addr,
+	memcpy(receiver_addr.contents, &my_sin.sin_addr,
 	       sizeof(my_sin.sin_addr));
 
 	socket_length = sizeof(my_sin);
@@ -385,7 +385,7 @@ open_connection(host, fd, Errmsg, ErrmsgSz)
 	sender_addr.addrtype = ADDRTYPE_INET;
 	sender_addr.length = sizeof(my_sin.sin_addr);
 	sender_addr.contents = (krb5_octet *) malloc(sizeof(my_sin.sin_addr));
-	memcpy((char *) sender_addr.contents, (char *) &my_sin.sin_addr,
+	memcpy(sender_addr.contents, &my_sin.sin_addr,
 	       sizeof(my_sin.sin_addr));
 
 	return(0);
@@ -672,7 +672,7 @@ xmit_database(context, auth_context, my_creds, fd, database_fd,
 		exit(1);
 	}
 
-	memcpy((char *)&send_size, outbuf.data, sizeof(send_size));
+	memcpy(&send_size, outbuf.data, sizeof(send_size));
 	send_size = ntohl(send_size);
 	if (send_size != database_size) {
 		com_err(progname, 0,
@@ -696,7 +696,7 @@ send_error(context, my_creds, fd, err_text, err_code)
 	const char	*text;
 	krb5_data	outbuf;
 
-	memset((char *)&error, 0, sizeof(error));
+	memset(&error, 0, sizeof(error));
 	krb5_us_timeofday(context, &error.ctime, &error.cusec);
 	error.server = my_creds->server;
 	error.client = my_principal;
diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index ba63d5847d..cf4715ee24 100644
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -276,7 +276,7 @@ retry:
 		com_err(progname, errno, "while obtaining socket");
 		exit(1);
 	}
-	memset((char *) &my_sin,0, sizeof(my_sin));
+	memset(&my_sin,0, sizeof(my_sin));
 	if(!port) {
 		sp = getservbyname(KPROP_SERVICE, "tcp");
 		if (sp == NULL) {
@@ -361,7 +361,7 @@ retry:
 		int child_pid;
 		int status;
 	    
-		memset((char *)&frominet, 0, sizeof(frominet));
+		memset(&frominet, 0, sizeof(frominet));
 		fromlen = sizeof(frominet);
 		if (debug)
 		    fprintf(stderr, "waiting for a kprop connection\n");
@@ -1019,7 +1019,7 @@ void PRS(argv)
 	static const char	tmp[] = ".temp";
 	kdb_log_context *log_ctx;
 
-	(void) memset((char *)&params, 0, sizeof (params));
+	(void) memset(&params, 0, sizeof (params));
 
 	retval = krb5_init_context(&kpropd_context);
 	if (retval) {
@@ -1221,7 +1221,7 @@ kerberos_authenticate(context, fd, clientp, etype, my_sin)
     sender_addr.addrtype = ADDRTYPE_INET;
     sender_addr.length = sizeof(my_sin.sin_addr);
     sender_addr.contents = (krb5_octet *) malloc(sizeof(my_sin.sin_addr));
-    memcpy((char *) sender_addr.contents, (char *) &my_sin.sin_addr,
+    memcpy(sender_addr.contents, &my_sin.sin_addr,
            sizeof(my_sin.sin_addr));
 
     sin_length = sizeof(r_sin);
@@ -1233,7 +1233,7 @@ kerberos_authenticate(context, fd, clientp, etype, my_sin)
     receiver_addr.addrtype = ADDRTYPE_INET;
     receiver_addr.length = sizeof(r_sin.sin_addr);
     receiver_addr.contents = (krb5_octet *) malloc(sizeof(r_sin.sin_addr));
-    memcpy((char *) receiver_addr.contents, (char *) &r_sin.sin_addr,
+    memcpy(receiver_addr.contents, &r_sin.sin_addr,
            sizeof(r_sin.sin_addr));
 
     if (debug) {
@@ -1410,7 +1410,7 @@ recv_database(context, fd, database_fd, confmsg)
 			"while decoding database size from client");
 		exit(1);
 	}
-	memcpy((char *) &database_size, outbuf.data, sizeof(database_size));
+	memcpy(&database_size, outbuf.data, sizeof(database_size));
 	krb5_free_data_contents(context, &inbuf);
 	krb5_free_data_contents(context, &outbuf);
 	database_size = ntohl(database_size);
@@ -1508,7 +1508,7 @@ send_error(context, fd, err_code, err_text)
 	krb5_data	outbuf;
 	char		buf[1024];
 
-	memset((char *)&error, 0, sizeof(error));
+	memset(&error, 0, sizeof(error));
 	krb5_us_timeofday(context, &error.stime, &error.susec);
 	error.server = server;
 	error.client = client;
diff --git a/src/slave/kpropd_rpc.c b/src/slave/kpropd_rpc.c
index e5713b2e14..cd95395330 100644
--- a/src/slave/kpropd_rpc.c
+++ b/src/slave/kpropd_rpc.c
@@ -14,7 +14,7 @@ iprop_null_1(void *argp, CLIENT *clnt)
 {
 	static char clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call (clnt, IPROP_NULL,
 		(xdrproc_t) xdr_void, (caddr_t) argp,
 		(xdrproc_t) xdr_void, (caddr_t) &clnt_res,
@@ -29,7 +29,7 @@ iprop_get_updates_1(kdb_last_t *argp, CLIENT *clnt)
 {
 	static kdb_incr_result_t clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call (clnt, IPROP_GET_UPDATES,
 		(xdrproc_t) xdr_kdb_last_t, (caddr_t) argp,
 		(xdrproc_t) xdr_kdb_incr_result_t, (caddr_t) &clnt_res,
@@ -44,7 +44,7 @@ iprop_full_resync_1(void *argp, CLIENT *clnt)
 {
 	static kdb_fullresync_result_t clnt_res;
 
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	memset(&clnt_res, 0, sizeof(clnt_res));
 	if (clnt_call (clnt, IPROP_FULL_RESYNC,
 		(xdrproc_t) xdr_void, (caddr_t) argp,
 		(xdrproc_t) xdr_kdb_fullresync_result_t, (caddr_t) &clnt_res,
diff --git a/src/slave/kproplog.c b/src/slave/kproplog.c
index 7bf9bbaa33..43a7738d41 100644
--- a/src/slave/kproplog.c
+++ b/src/slave/kproplog.c
@@ -397,7 +397,7 @@ print_update(kdb_hlog_t *ulog, uint32_t entry, unsigned int verbose)
 	    exit(1);
 	}
 
-	(void) memset((char *)&upd, 0, sizeof (kdb_incr_update_t));
+	(void) memset(&upd, 0, sizeof (kdb_incr_update_t));
 	xdrmem_create(&xdrs, (char *)indx_log->entry_data,
 		      indx_log->kdb_entry_size, XDR_DECODE);
 	if (!xdr_kdb_incr_update_t(&xdrs, &upd)) {
@@ -498,7 +498,7 @@ main(int argc, char **argv)
 	exit(1);
     }
 
-    (void) memset((char *)&params, 0, sizeof (params));
+    (void) memset(&params, 0, sizeof (params));
 
     if (kadm5_get_config_params(context, 1, &params, &params)) {
 	(void) fprintf(stderr,