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

21 files changed, 44 insertions, 46 deletions

diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c
index 07a747b105..a5370a297b 100644
--- a/src/appl/bsd/krcp.c
+++ b/src/appl/bsd/krcp.c
@@ -1300,7 +1300,7 @@ void
 	    exit(1);
     }
     
-    memset ((char*)&creds, 0, sizeof(creds));
+    memset (&creds, 0, sizeof(creds));
 
     if ((status = krb5_read_message(bsd_context, (krb5_pointer)&rem,
 				    &pname_data)))
diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index 01b4ef205e..705285640b 100644
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -469,7 +469,7 @@ int main(argc, argv)
 	    fprintf(stderr, "Error in socket: %s\n", strerror(errno));
 	    exit(2);
 	}
-	memset((char *) &sock_in, 0,sizeof(sock_in));
+	memset(&sock_in, 0,sizeof(sock_in));
 	sock_in.sin_family = AF_INET;
 	sock_in.sin_port = htons(debug_port);
 	sock_in.sin_addr.s_addr = INADDR_ANY;
@@ -920,7 +920,7 @@ static int control(pty, cp, n)
       return (0);
 #ifdef TIOCSWINSZ
     oobdata[0] &= ~TIOCPKT_WINDOW;	/* we know he heard */
-    memcpy((char *)&w,cp+4, sizeof(w));
+    memcpy(&w, cp+4, sizeof(w));
     w.ws_row = ntohs(w.ws_row);
     w.ws_col = ntohs(w.ws_col);
     w.ws_xpixel = ntohs(w.ws_xpixel);
diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c
index aa3f2edb96..76c0ca1fc2 100644
--- a/src/appl/bsd/krshd.c
+++ b/src/appl/bsd/krshd.c
@@ -1950,7 +1950,7 @@ accept_a_connection (int debug_port, struct sockaddr *from,
 	    exit(2);
 	}
 
-	memset((char *) &sock_in6, 0,sizeof(sock_in6));
+	memset(&sock_in6, 0,sizeof(sock_in6));
 	sock_in6.sin6_family = AF_INET6;
 	sock_in6.sin6_port = htons(debug_port);
 	sock_in6.sin6_addr = in6addr_any;
@@ -1982,7 +1982,7 @@ accept_a_connection (int debug_port, struct sockaddr *from,
 	    exit(2);
 	}
 
-	memset((char *) &sock_in, 0,sizeof(sock_in));
+	memset(&sock_in, 0,sizeof(sock_in));
 	sock_in.sin_family = AF_INET;
 	sock_in.sin_port = htons(debug_port);
 	sock_in.sin_addr.s_addr = INADDR_ANY;
diff --git a/src/appl/gss-sample/gss-client.c b/src/appl/gss-sample/gss-client.c
index 390d6e56fa..f84d3c66bc 100644
--- a/src/appl/gss-sample/gss-client.c
+++ b/src/appl/gss-sample/gss-client.c
@@ -114,7 +114,7 @@ connect_to_server(host, port)
     }
 
     saddr.sin_family = hp->h_addrtype;
-    memcpy((char *) &saddr.sin_addr, hp->h_addr, sizeof(saddr.sin_addr));
+    memcpy(&saddr.sin_addr, hp->h_addr, sizeof(saddr.sin_addr));
     saddr.sin_port = htons(port);
 
     if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
diff --git a/src/appl/gssftp/ftp/ftp.c b/src/appl/gssftp/ftp/ftp.c
index 3df233fcdf..79d844b4d5 100644
--- a/src/appl/gssftp/ftp/ftp.c
+++ b/src/appl/gssftp/ftp/ftp.c
@@ -196,7 +196,7 @@ hookup(char* host, int port)
 #endif
 	static char hostnamebuf[80];
 
-	memset((char *)&hisctladdr, 0, sizeof (hisctladdr));
+	memset(&hisctladdr, 0, sizeof (hisctladdr));
 	hisctladdr.sin_addr.s_addr = inet_addr(host);
 	if (hisctladdr.sin_addr.s_addr != -1) {
 		hisctladdr.sin_family = AF_INET;
diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c
index 71e9855296..51072ee607 100644
--- a/src/appl/gssftp/ftpd/ftpd.c
+++ b/src/appl/gssftp/ftpd/ftpd.c
@@ -869,7 +869,7 @@ char *name, *passwd;
 	char ccname[MAXPATHLEN];
 
 #ifdef GSSAPI
-	memset((char *)&my_creds, 0, sizeof(my_creds));
+	memset(&my_creds, 0, sizeof(my_creds));
 	if (krb5_parse_name(kcontext, name, &me))
 		return 0;
 	my_creds.client = me;
diff --git a/src/appl/gssftp/ftpd/popen.c b/src/appl/gssftp/ftpd/popen.c
index 4f4f1586ca..f7995f7712 100644
--- a/src/appl/gssftp/ftpd/popen.c
+++ b/src/appl/gssftp/ftpd/popen.c
@@ -78,7 +78,7 @@ ftpd_popen(program, type)
 			return(NULL);
 		if ((pids = (int *)malloc((u_int)(fds * sizeof(int)))) == NULL)
 			return(NULL);
-		memset((char *)pids, 0, fds * sizeof(int));
+		memset(pids, 0, fds * sizeof(int));
 	}
 	if (pipe(pdes) < 0)
 		return(NULL);
diff --git a/src/appl/simple/client/sim_client.c b/src/appl/simple/client/sim_client.c
index 4873f89af8..3cb71df52a 100644
--- a/src/appl/simple/client/sim_client.c
+++ b/src/appl/simple/client/sim_client.c
@@ -161,9 +161,9 @@ main(argc, argv)
             *cp = tolower((int) *cp);
 
     /* Set server's address */
-    (void) memset((char *)&s_sock, 0, sizeof(s_sock));
+    (void) memset(&s_sock, 0, sizeof(s_sock));
 
-    memcpy((char *)&s_sock.sin_addr, host->h_addr, sizeof(s_sock.sin_addr));
+    memcpy(&s_sock.sin_addr, host->h_addr, sizeof(s_sock.sin_addr));
 #ifdef DEBUG
     printf("s_sock.sin_addr is %s\n", inet_ntoa(s_sock.sin_addr));
 #endif
@@ -186,7 +186,7 @@ main(argc, argv)
 	exit(1);
     }
 
-    memset((char *)&c_sock, 0, sizeof(c_sock));
+    memset(&c_sock, 0, sizeof(c_sock));
     c_sock.sin_family = AF_INET;
 #ifdef BROKEN_STREAMS_SOCKETS
     if (gethostname(my_hostname, sizeof(my_hostname)) < 0) {
@@ -198,7 +198,7 @@ main(argc, argv)
 	fprintf(stderr, "%s: unknown host\n", hostname);
 	exit(1);
     }
-    memcpy((char *)&c_sock.sin_addr, host->h_addr, sizeof(c_sock.sin_addr));
+    memcpy(&c_sock.sin_addr, host->h_addr, sizeof(c_sock.sin_addr));
 #endif
     
 
@@ -243,7 +243,7 @@ main(argc, argv)
     /* PREPARE KRB_SAFE MESSAGE */
 
     /* Get my address */
-    memset((char *) &c_sock, 0, sizeof(c_sock));
+    memset(&c_sock, 0, sizeof(c_sock));
     len = sizeof(c_sock);
     if (getsockname(sock, (struct sockaddr *)&c_sock, &len) < 0) {
 	com_err(progname, errno, "while getting socket name");
diff --git a/src/appl/simple/server/sim_server.c b/src/appl/simple/server/sim_server.c
index 137cc49f02..bfe2f756b5 100644
--- a/src/appl/simple/server/sim_server.c
+++ b/src/appl/simple/server/sim_server.c
@@ -132,7 +132,7 @@ char *argv[];
     }
 
     /* Set up server address */
-    memset((char *)&s_sock, 0, sizeof(s_sock));
+    memset(&s_sock, 0, sizeof(s_sock));
     s_sock.sin_family = AF_INET;
 
     if (port == 0) {
@@ -155,7 +155,7 @@ char *argv[];
 	fprintf(stderr, "%s: host unknown\n", full_hname);
 	exit(1);
     }
-    memcpy((char *)&s_sock.sin_addr, host->h_addr, sizeof(s_sock.sin_addr));
+    memcpy(&s_sock.sin_addr, host->h_addr, sizeof(s_sock.sin_addr));
 
     /* Open socket */
     if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
diff --git a/src/appl/telnet/libtelnet/auth.c b/src/appl/telnet/libtelnet/auth.c
index 1a1006605a..aed6887992 100644
--- a/src/appl/telnet/libtelnet/auth.c
+++ b/src/appl/telnet/libtelnet/auth.c
@@ -383,8 +383,7 @@ auth_send(data, cnt)
 	auth_send_cnt = cnt;
 	if (auth_send_cnt > sizeof(_auth_send_data))
 	    auth_send_cnt = sizeof(_auth_send_data);
-	memcpy((void *)_auth_send_data, (void *)data, 
-	       (unsigned) auth_send_cnt);
+	memcpy(_auth_send_data, data, (unsigned) auth_send_cnt);
 	auth_send_data = _auth_send_data;
 
 	auth_send_retry();
@@ -510,7 +509,7 @@ auth_name(data, cnt)
 					Name, cnt, (int) sizeof(savename)-1);
 		return;
 	}
-	memcpy((void *)savename, (void *)data, (unsigned) cnt);
+	memcpy(savename, data, (unsigned) cnt);
 	savename[cnt] = '\0';	/* Null terminate */
 	if (auth_debug_mode)
 		printf(">>>%s: Got NAME [%s]\r\n", Name, savename);
diff --git a/src/appl/telnet/libtelnet/enc_des.c b/src/appl/telnet/libtelnet/enc_des.c
index aa00ae27ec..6dd48b696d 100644
--- a/src/appl/telnet/libtelnet/enc_des.c
+++ b/src/appl/telnet/libtelnet/enc_des.c
@@ -199,7 +199,7 @@ ofb64_init(server)
 fb64_init(fbp)
 	register struct fb *fbp;
 {
-	memset((void *)fbp, 0, sizeof(*fbp));
+	memset(fbp, 0, sizeof(*fbp));
 	fbp->state[0] = fbp->state[1] = FAILED;
 	fbp->fb_feed[0] = IAC;
 	fbp->fb_feed[1] = SB;
@@ -600,8 +600,8 @@ fb64_stream_iv(seed, stp)
 	Block seed;
 	register struct stinfo *stp;
 {
-	memcpy((void *)stp->str_iv,     (void *)seed, sizeof(Block));
-	memcpy((void *)stp->str_output, (void *)seed, sizeof(Block));
+	memcpy(stp->str_iv,     seed, sizeof(Block));
+	memcpy(stp->str_output, seed, sizeof(Block));
 
 	stp->str_index = sizeof(Block);
 }
@@ -611,7 +611,7 @@ fb64_stream_key(key, stp)
 	Block key;
 	register struct stinfo *stp;
 {
-	memcpy((void *)stp->str_keybytes, (void *)key, sizeof(Block));
+	memcpy(stp->str_keybytes, key, sizeof(Block));
 	stp->str_key.length = 8;
 	stp->str_key.contents = stp->str_keybytes;
 	/* the original version of this code uses des ecb mode, but
@@ -619,7 +619,7 @@ fb64_stream_key(key, stp)
 	   is identical */
 	stp->str_key.enctype = ENCTYPE_DES_CBC_RAW;
 
-	memcpy((void *)stp->str_output, (void *)stp->str_iv, sizeof(Block));
+	memcpy(stp->str_output, stp->str_iv, sizeof(Block));
 
 	stp->str_index = sizeof(Block);
 }
@@ -659,7 +659,7 @@ cfb64_encrypt(s, c)
 		if (idx == sizeof(Block)) {
 			Block b;
 			ecb_encrypt(stp, stp->str_output, b);
-			memcpy((void *)stp->str_feed,(void *)b,sizeof(Block));
+			memcpy(stp->str_feed,b,sizeof(Block));
 			idx = 0;
 		}
 
@@ -693,7 +693,7 @@ cfb64_decrypt(data)
 	if (idx == sizeof(Block)) {
 		Block b;
 		ecb_encrypt(stp, stp->str_output, b);
-		memcpy((void *)stp->str_feed, (void *)b, sizeof(Block));
+		memcpy(stp->str_feed, b, sizeof(Block));
 		stp->str_index = 1;	/* Next time will be 1 */
 		idx = 0;		/* But now use 0 */ 
 	}
@@ -735,7 +735,7 @@ ofb64_encrypt(s, c)
 		if (idx == sizeof(Block)) {
 			Block b;
 			ecb_encrypt(stp, stp->str_feed, b);
-			memcpy((void *)stp->str_feed,(void *)b,sizeof(Block));
+			memcpy(stp->str_feed,b,sizeof(Block));
 			idx = 0;
 		}
 		*s++ ^= stp->str_feed[idx];
@@ -766,7 +766,7 @@ ofb64_decrypt(data)
 	if (idx == sizeof(Block)) {
 		Block b;
 		ecb_encrypt(stp, stp->str_feed, b);
-		memcpy((void *)stp->str_feed, (void *)b, sizeof(Block));
+		memcpy(stp->str_feed, b, sizeof(Block));
 		stp->str_index = 1;	/* Next time will be 1 */
 		idx = 0;		/* But now use 0 */ 
 	}
diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c
index 40eb184acb..77a1b5a6d7 100644
--- a/src/appl/telnet/libtelnet/kerberos5.c
+++ b/src/appl/telnet/libtelnet/kerberos5.c
@@ -249,7 +249,7 @@ kerberos5_send(ap)
 		return(0);
 	}
 
-	memset((char *)&creds, 0, sizeof(creds));
+	memset(&creds, 0, sizeof(creds));
 	if (auth_debug_mode)
 	    printf("telnet: calling krb5_sname_to_principal\n");
 	if ((r = krb5_sname_to_principal(telnet_context, RemoteHostName,
diff --git a/src/appl/telnet/telnet/commands.c b/src/appl/telnet/telnet/commands.c
index f82f3e6808..a029e6381a 100644
--- a/src/appl/telnet/telnet/commands.c
+++ b/src/appl/telnet/telnet/commands.c
@@ -3144,17 +3144,16 @@ sourceroute(arg, cpp, lenp)
 			sin_addr.s_addr = tmp;
 		} else if ((host = gethostbyname(cp))) {
 #if	defined(h_addr)
-			memcpy((caddr_t)&sin_addr,
-				host->h_addr_list[0], sizeof(sin_addr));
+			memcpy(&sin_addr,
+			        host->h_addr_list[0], sizeof(sin_addr));
 #else
-			memcpy((caddr_t)&sin_addr, host->h_addr, 
-			       sizeof(sin_addr));
+			memcpy(&sin_addr, host->h_addr, sizeof(sin_addr));
 #endif
 		} else {
 			*cpp = cp;
 			return(0);
 		}
-		memcpy(lsrp, (char *)&sin_addr, 4);
+		memcpy(lsrp, &sin_addr, 4);
 		lsrp += 4;
 		if (cp2)
 			cp = cp2;
diff --git a/src/appl/telnet/telnet/general.h b/src/appl/telnet/telnet/general.h
index 4efa951946..88c29c6472 100644
--- a/src/appl/telnet/telnet/general.h
+++ b/src/appl/telnet/telnet/general.h
@@ -41,5 +41,5 @@
 #define	numberof(x)	(sizeof x/sizeof x[0])
 #define	highestof(x)	(numberof(x)-1)
 
-#define	ClearElement(x)		memset((char *)&x, 0, sizeof x)
-#define	ClearArray(x)		memset((char *)x, 0, sizeof x)
+#define	ClearElement(x)		memset(&x, 0, sizeof x)
+#define	ClearArray(x)		memset(x, 0, sizeof x)
diff --git a/src/appl/telnet/telnet/ring.c b/src/appl/telnet/telnet/ring.c
index fdff682b50..6ed596f76c 100644
--- a/src/appl/telnet/telnet/ring.c
+++ b/src/appl/telnet/telnet/ring.c
@@ -109,7 +109,7 @@ Ring *ring;
     unsigned char *buffer;
     int count;
 {
-    memset((char *)ring, 0, sizeof *ring);
+    memset(ring, 0, sizeof *ring);
 
     ring->size = count;
 
diff --git a/src/appl/telnet/telnetd/sys_term.c b/src/appl/telnet/telnetd/sys_term.c
index 5c08c76069..a0a0ee5038 100644
--- a/src/appl/telnet/telnetd/sys_term.c
+++ b/src/appl/telnet/telnetd/sys_term.c
@@ -235,7 +235,7 @@ copy_termbuf(cp, len)
 {
 	if (len > sizeof(termbuf))
 		len = sizeof(termbuf);
-	memcpy((char *)&termbuf, cp, len);
+	memcpy(&termbuf, cp, len);
 	termbuf2 = termbuf;
 }
 #endif	/* defined(LINEMODE) && defined(TIOCPKT_IOCTL) */
@@ -956,7 +956,7 @@ getptyslave()
 	init_termbuf();
 # ifdef	TIOCGWINSZ
 	if (def_row || def_col) {
-		memset((char *)&ws, 0, sizeof(ws));
+		memset(&ws, 0, sizeof(ws));
 		ws.ws_col = def_col;
 		ws.ws_row = def_row;
 		(void)ioctl(t, TIOCSWINSZ, (char *)&ws);
@@ -1137,7 +1137,7 @@ startslave(host, autologin, autoname)
 				INIT_FIFO);
 		fatalperror(net, tbuf);
 	}
-	memset((char *)&request, 0, sizeof(request));
+	memset(&request, 0, sizeof(request));
 	request.magic = INIT_MAGIC;
 	SCPYN(request.gen_id, gen_id);
 	SCPYN(request.tty_id, &line[8]);
diff --git a/src/appl/telnet/telnetd/telnetd-ktd.c b/src/appl/telnet/telnetd/telnetd-ktd.c
index 295f19580a..5a340bd7fb 100644
--- a/src/appl/telnet/telnetd/telnetd-ktd.c
+++ b/src/appl/telnet/telnetd/telnetd-ktd.c
@@ -395,7 +395,7 @@ main(argc, argv)
 	if (secflag)  {
 		int sz = sizeof(ss);
 
-		memset((char *)&dv, 0, sizeof(dv));
+		memset(&dv, 0, sizeof(dv));
 
 		if (getsysv(&sysv, sizeof(struct sysv)) != 0) {
 			perror("getsysv");
diff --git a/src/appl/telnet/telnetd/telnetd.c b/src/appl/telnet/telnetd/telnetd.c
index 4115b66712..8ee129ec34 100644
--- a/src/appl/telnet/telnetd/telnetd.c
+++ b/src/appl/telnet/telnetd/telnetd.c
@@ -564,7 +564,7 @@ main(argc, argv)
 		int szi = sizeof(int);
 #endif /* SO_SEC_MULTI */
 
-		memset((char *)&dv, 0, sizeof(dv));
+		memset(&dv, 0, sizeof(dv));
 
 		if (getsysv(&sysv, sizeof(struct sysv)) != 0) {
 			perror("getsysv");
diff --git a/src/appl/telnet/telnetd/termstat.c b/src/appl/telnet/telnetd/termstat.c
index 531e167830..fa7803dfe3 100644
--- a/src/appl/telnet/telnetd/termstat.c
+++ b/src/appl/telnet/telnetd/termstat.c
@@ -624,7 +624,7 @@ defer_terminit()
 	if (def_col || def_row) {
 		struct winsize ws;
 
-		memset((char *)&ws, 0, sizeof(ws));
+		memset(&ws, 0, sizeof(ws));
 		ws.ws_col = def_col;
 		ws.ws_row = def_row;
 		(void) ioctl(pty, TIOCSWINSZ, (char *)&ws);
diff --git a/src/appl/user_user/client.c b/src/appl/user_user/client.c
index 1ee1606597..6edf0fffff 100644
--- a/src/appl/user_user/client.c
+++ b/src/appl/user_user/client.c
@@ -120,7 +120,7 @@ char *argv[];
 	  return 5;
       }
 
-      memcpy ((char *)&serv_net_addr.sin_addr, host->h_addr_list[i++], 
+      memcpy (&serv_net_addr.sin_addr, host->h_addr_list[i++], 
 	      sizeof(serv_net_addr.sin_addr));
 
       if (connect(s, (struct sockaddr *)&serv_net_addr, 
@@ -139,7 +139,7 @@ char *argv[];
       return 6;
   }
 
-  memset ((char*)&creds, 0, sizeof(creds));
+  memset (&creds, 0, sizeof(creds));
 
   retval = krb5_cc_get_principal(context, cc, &creds.client);
   if (retval) {
diff --git a/src/appl/user_user/server.c b/src/appl/user_user/server.c
index 9d1ab19ae6..40243fed06 100644
--- a/src/appl/user_user/server.c
+++ b/src/appl/user_user/server.c
@@ -125,7 +125,7 @@ char *argv[];
       return 4;
   }
 
-  memset ((char*)&creds, 0, sizeof(creds));
+  memset (&creds, 0, sizeof(creds));
   retval = krb5_cc_get_principal(context, cc, &creds.client);
   if (retval) {
       com_err("uu-client", retval, "getting principal name");