use less oddball types

2 files changed, 11 insertions, 10 deletions

diff --git a/server/bdump.c b/server/bdump.c
index 991c3e1..ad9fef6 100644
--- a/server/bdump.c
+++ b/server/bdump.c
@@ -1301,7 +1301,7 @@ bdump_recv_loop(Server *server)
 		    } else {
 			retval = Z_krb5_init_keyblock(Z_krb5_ctx,
 						    ntohl(*(krb5_enctype *)&buf[0]),
-						    ntohl(*(u_int32_t *)&buf[4]),
+						    ntohl(*(uint32_t *)&buf[4]),
 						    &client->session_keyblock);
 			if (retval) {
 			    syslog(LOG_ERR, "brl failed to allocate keyblock: %s",
@@ -1467,7 +1467,7 @@ send_normal_tcp(ZNotice_Kind_t kind,
     char *pack;
     int packlen, count;
     Code_t retval;
-    u_short length;
+    unsigned short length;
  
     memset (&notice, 0, sizeof(notice));
 
@@ -1512,7 +1512,7 @@ send_normal_tcp(ZNotice_Kind_t kind,
     }
 #endif
 
-    length = htons((u_short) packlen);
+    length = htons((unsigned short) packlen);
  
     count = net_write(output, (char *) &length, sizeof(length));
     if (count != sizeof(length)) {
@@ -1550,10 +1550,10 @@ send_normal_tcp(ZNotice_Kind_t kind,
 static Code_t
 get_packet(void *packet, int len, int *retlen)
 {
-    u_short length;
+    unsigned short length;
     int result;
  
-    result = net_read(input, (char *) &length, sizeof(u_short));
+    result = net_read(input, (char *) &length, sizeof(unsigned short));
     if (result < sizeof(short)) {
 	if (result < 0) {
 	    return errno;
@@ -1596,7 +1596,7 @@ extract_sin(ZNotice_t *notice, struct sockaddr_in *target)
     if ((cp >= notice->z_message + notice->z_message_len) || (*cp == '\0')) {
 	return(ZSRV_PKSHORT);
     }
-    target->sin_port = htons((u_short) atoi(cp));
+    target->sin_port = htons((unsigned short)atoi(cp));
     target->sin_family = AF_INET;
     return ZERR_NONE;
 }
diff --git a/server/subscr.c b/server/subscr.c
index 201721b..0516647 100644
--- a/server/subscr.c
+++ b/server/subscr.c
@@ -811,7 +811,7 @@ subscr_send_subs(Client *client)
 	    return errno;
 	}
 	*(krb5_enctype *)&bufp[0] = htonl(Z_enctype(client->session_keyblock));
-	*(u_int32_t *)&bufp[4] = htonl(Z_keylen(client->session_keyblock));
+	*(uint32_t *)&bufp[4] = htonl(Z_keylen(client->session_keyblock));
 	memcpy(&bufp[8], Z_keydata(client->session_keyblock), Z_keylen(client->session_keyblock));
 
 	retval = ZMakeZcode(buf, sizeof(buf), bufp, Z_keylen(client->session_keyblock) + 8);
@@ -1010,7 +1010,7 @@ subscr_realm_sendit(Client *who,
   /* convert the address to a string of the form x.x.x.x/port */
   strcpy(addr, inet_ntoa(who->addr.sin_addr));
   if ((retval = ZMakeAscii(port, sizeof(port), (unsigned char *) 
-                           &who->addr.sin_port, sizeof(u_short))) != ZERR_NONE) 
+                           &who->addr.sin_port, sizeof(unsigned short))) != ZERR_NONE) 
     {
       syslog(LOG_ERR, "subscr_rlm_sendit make ascii: %s",
              error_message(retval));
@@ -1285,7 +1285,7 @@ subscr_realm_subs(ZRealm *realm)
 
     num = 0;
     if ((retval = ZMakeAscii(port, sizeof(port), (unsigned char *) 
-			     &num, sizeof(u_short))) != ZERR_NONE) 
+			     &num, sizeof(unsigned short))) != ZERR_NONE) 
       {
 	syslog(LOG_ERR, "subscr_rlm_sendit make ascii: %s",
 	       error_message(retval));
@@ -1499,7 +1499,8 @@ Code_t subscr_foreign_user(ZNotice_t *notice,
   
   snotice = *notice;
   
-  if ((status = ZReadAscii(cp, strlen(cp), (unsigned char *)&snotice.z_port, sizeof(u_short)))
+  if ((status = ZReadAscii(cp, strlen(cp), (unsigned char *)&snotice.z_port,
+			   sizeof(unsigned short)))
       != ZERR_NONE) 
     {
       syslog(LOG_ERR, "subscr_foreign_user read ascii: %s",