Remove unnecessary typedef usage.

u_char -> unsigned char
u_short -> unsigned short
u_long -> unsigned long
u_int -> unsigned int

okay millert@

1 files changed, 49 insertions, 49 deletions

diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h
index e9da4a32ebe..1a704451fdc 100644
--- a/include/rpcsvc/yp_prot.h
+++ b/include/rpcsvc/yp_prot.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yp_prot.h,v 1.7 2004/01/16 21:54:18 deraadt Exp $	*/
+/*	$OpenBSD: yp_prot.h,v 1.8 2004/01/22 21:48:02 espie Exp $	*/
 /*	$NetBSD: yp_prot.h,v 1.6 1995/07/14 21:10:58 christos Exp $	*/
 
 /*
@@ -66,19 +66,19 @@
  */
 
 #ifndef BOOL_DEFINED
-typedef u_int bool;
+typedef unsigned int bool;
 #define BOOL_DEFINED
 #endif
 
 
 /* Program and version symbols, magic numbers */
-#define YPPROG		((u_long)100004)
-#define YPVERS		((u_long)2)
-#define YPVERS_ORIG	((u_long)1)
-#define YPMAXRECORD	((u_long)1024)
-#define YPMAXDOMAIN	((u_long)64)
-#define YPMAXMAP	((u_long)64)
-#define YPMAXPEER	((u_long)256)
+#define YPPROG		((unsigned long)100004)
+#define YPVERS		((unsigned long)2)
+#define YPVERS_ORIG	((unsigned long)1)
+#define YPMAXRECORD	((unsigned long)1024)
+#define YPMAXDOMAIN	((unsigned long)64)
+#define YPMAXMAP	((unsigned long)64)
+#define YPMAXPEER	((unsigned long)256)
 
 /*
  * I don't know if anything of sun's depends on this, or if they
@@ -98,7 +98,7 @@ typedef struct {
 struct ypmap_parms {
 	const char *domain;
 	const char *map;
-	u_long ordernum;
+	unsigned long ordernum;
 	char *owner;
 };
 
@@ -115,9 +115,9 @@ struct ypreq_nokey {
 
 struct ypreq_xfr {
 	struct ypmap_parms map_parms;
-	u_long transid;
-	u_long proto;
-	u_short port;
+	unsigned long transid;
+	unsigned long proto;
+	unsigned short port;
 };
 #define ypxfr_domain	map_parms.domain
 #define ypxfr_map	map_parms.map
@@ -125,24 +125,24 @@ struct ypreq_xfr {
 #define ypxfr_owner	map_parms.owner
 
 struct ypresp_val {
-	u_long status;
+	unsigned long status;
 	datum valdat;
 };
 
 struct ypresp_key_val {
-	u_long status;
+	unsigned long status;
 	datum keydat;
 	datum valdat;
 };
 
 struct ypresp_master {
-	u_long status;
+	unsigned long status;
 	char *master;
 };
 
 struct ypresp_order {
-	u_long status;
-	u_long ordernum;
+	unsigned long status;
+	unsigned long ordernum;
 };
 
 struct ypresp_all {
@@ -158,23 +158,23 @@ struct ypmaplist {
 };
 
 struct ypresp_maplist {
-	u_long status;
+	unsigned long status;
 	struct ypmaplist *list;
 };
 
 /* ypserv procedure numbers */
-#define YPPROC_NULL		((u_long)0)
-#define YPPROC_DOMAIN		((u_long)1)
-#define YPPROC_DOMAIN_NONACK	((u_long)2)
-#define YPPROC_MATCH		((u_long)3)
-#define YPPROC_FIRST		((u_long)4)
-#define YPPROC_NEXT		((u_long)5)
-#define YPPROC_XFR		((u_long)6)
-#define YPPROC_CLEAR		((u_long)7)
-#define YPPROC_ALL		((u_long)8)
-#define YPPROC_MASTER		((u_long)9)
-#define YPPROC_ORDER		((u_long)10)
-#define YPPROC_MAPLIST		((u_long)11)
+#define YPPROC_NULL		((unsigned long)0)
+#define YPPROC_DOMAIN		((unsigned long)1)
+#define YPPROC_DOMAIN_NONACK	((unsigned long)2)
+#define YPPROC_MATCH		((unsigned long)3)
+#define YPPROC_FIRST		((unsigned long)4)
+#define YPPROC_NEXT		((unsigned long)5)
+#define YPPROC_XFR		((unsigned long)6)
+#define YPPROC_CLEAR		((unsigned long)7)
+#define YPPROC_ALL		((unsigned long)8)
+#define YPPROC_MASTER		((unsigned long)9)
+#define YPPROC_ORDER		((unsigned long)10)
+#define YPPROC_MAPLIST		((unsigned long)11)
 
 /* ypserv procedure return status values */
 #define YP_TRUE		((unsigned long)1)	/* general purpose success code */
@@ -205,10 +205,10 @@ struct dom_binding {
 	struct dom_binding *dom_pnext;
 	char dom_domain[YPMAXDOMAIN + 1];
 	struct sockaddr_in dom_server_addr;
-	u_short dom_server_port;
+	unsigned short dom_server_port;
 	int dom_socket;
 	CLIENT *dom_client;
-	u_short dom_local_port;
+	unsigned short dom_local_port;
 	long dom_vers;
 };
 
@@ -226,14 +226,14 @@ struct dom_binding {
  *			used by ypset.
  */
 
-#define YPBINDPROG		((u_long)100007)
-#define YPBINDVERS		((u_long)2)
-#define YPBINDVERS_ORIG		((u_long)1)
+#define YPBINDPROG		((unsigned long)100007)
+#define YPBINDVERS		((unsigned long)2)
+#define YPBINDVERS_ORIG		((unsigned long)1)
 
 /* ypbind procedure numbers */
-#define YPBINDPROC_NULL		((u_long)0)
-#define YPBINDPROC_DOMAIN	((u_long)1)
-#define YPBINDPROC_SETDOM	((u_long)2)
+#define YPBINDPROC_NULL		((unsigned long)0)
+#define YPBINDPROC_DOMAIN	((unsigned long)1)
+#define YPBINDPROC_SETDOM	((unsigned long)2)
 
 /* error code in ypbind_resp.ypbind_status */
 enum ypbind_resptype {
@@ -244,13 +244,13 @@ enum ypbind_resptype {
 /* network order, of course */
 struct ypbind_binding {
 	struct in_addr	ypbind_binding_addr;
-	u_short		ypbind_binding_port;
+	unsigned short	ypbind_binding_port;
 };
 
 struct ypbind_resp {
 	enum ypbind_resptype	ypbind_status;
 	union {
-		u_long			ypbind_error;
+		unsigned long		ypbind_error;
 		struct ypbind_binding	ypbind_bindinfo;
 	} ypbind_respbody;
 };
@@ -266,7 +266,7 @@ struct ypbind_resp {
 struct ypbind_setdom {
 	char ypsetdom_domain[YPMAXDOMAIN + 1];
 	struct ypbind_binding ypsetdom_binding;
-	u_short ypsetdom_vers;
+	unsigned short ypsetdom_vers;
 };
 #define ypsetdom_addr ypsetdom_binding.ypbind_binding_addr
 #define ypsetdom_port ypsetdom_binding.ypbind_binding_port
@@ -283,16 +283,16 @@ struct ypbind_setdom {
  * This protocol is not implemented, naturally, because this YP
  * implementation only does the client side.
  */
-#define YPPUSHVERS		((u_long)1)
-#define YPPUSHVERS_ORIG		((u_long)1)
+#define YPPUSHVERS		((unsigned long)1)
+#define YPPUSHVERS_ORIG		((unsigned long)1)
 
 /* yppush procedure numbers */
-#define YPPUSHPROC_NULL		((u_long)0)
-#define YPPUSHPROC_XFRRESP	((u_long)1)
+#define YPPUSHPROC_NULL		((unsigned long)0)
+#define YPPUSHPROC_XFRRESP	((unsigned long)1)
 
 struct yppushresp_xfr {
-	u_long	transid;
-	u_long	status;
+	unsigned long	transid;
+	unsigned long	status;
 };
 
 /* yppush status value in yppushresp_xfr.status */
@@ -329,7 +329,7 @@ bool_t xdr_ypresp_val(XDR *, struct ypresp_val *);
 bool_t xdr_ypbind_setdom(XDR *, struct ypbind_setdom *);
 bool_t xdr_ypresp_key_val(XDR *, struct ypresp_key_val *);
 bool_t xdr_ypresp_all(XDR *, struct ypresp_all *);
-bool_t xdr_ypresp_all_seq(XDR *, u_long *);
+bool_t xdr_ypresp_all_seq(XDR *, unsigned long *);
 bool_t xdr_ypresp_master(XDR *, struct ypresp_master *);
 bool_t xdr_ypmaplist_str(XDR *, char *);
 bool_t xdr_ypmaplist(XDR *, struct ypmaplist *);