From d1f942ab4c8c82a127d8a3e24a46de188ef38ca2 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Thu, 22 Jan 2004 21:48:02 +0000
Subject: Remove unnecessary typedef usage.

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

okay millert@
---
 include/protocols/talkd.h | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

(limited to 'include/protocols')

diff --git a/include/protocols/talkd.h b/include/protocols/talkd.h
index 7dce0aef4ca..09503582a62 100644
--- a/include/protocols/talkd.h
+++ b/include/protocols/talkd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: talkd.h,v 1.3 2003/06/02 19:34:12 millert Exp $	*/
+/*	$OpenBSD: talkd.h,v 1.4 2004/01/22 21:48:02 espie Exp $	*/
 /*	$NetBSD: talkd.h,v 1.5 1995/03/04 07:59:30 cgd Exp $	*/
 
 /*
@@ -57,31 +57,33 @@
  * Client->server request message format.
  */
 typedef struct {
-	u_char	  vers;			/* protocol version */
-	u_char	  type;			/* request type, see below */
-	u_char	  answer;		/* not used */
-	u_char	  pad;
-	u_int32_t id_num;		/* message id */
-	struct	  osockaddr addr;	/* old (4.3) style */
-	struct	  osockaddr ctl_addr;	/* old (4.3) style */
-	int32_t	  pid;			/* caller's process id */
+	unsigned char	  vers;			/* protocol version */
+	unsigned char	  type;			/* request type, see below */
+	unsigned char	  answer;		/* not used */
+	unsigned char	  pad;
+	u_int32_t 	  id_num;		/* message id */
+	struct	  osockaddr addr;		/* old (4.3) style */
+	struct	  osockaddr ctl_addr;		/* old (4.3) style */
+	int32_t	  	  pid;			/* caller's process id */
 #define	NAME_SIZE	12
-	char	  l_name[NAME_SIZE];	/* caller's name */
-	char	  r_name[NAME_SIZE];	/* callee's name */
+	char	  	  l_name[NAME_SIZE];	/* caller's name */
+	char	  	  r_name[NAME_SIZE];	/* callee's name */
 #define	TTY_SIZE	16
-	char	  r_tty[TTY_SIZE];	/* callee's tty name */
+	char	  	  r_tty[TTY_SIZE];	/* callee's tty name */
 } CTL_MSG;
 
 /*
  * Server->client response message format.
  */
 typedef struct {
-	u_char	  vers;		/* protocol version */
-	u_char	  type;		/* type of request message, see below */
-	u_char	  answer;	/* respose to request message, see below */
-	u_char	  pad;
-	u_int32_t id_num;	/* message id */
-	struct	  osockaddr addr; /* address for establishing conversation */
+	unsigned char	  vers;		/* protocol version */
+	unsigned char	  type;		/* type of request message, see below */
+	unsigned char	  answer;	/* response to request message, 
+					   see below */
+	unsigned char	  pad;
+	u_int32_t 	  id_num;	/* message id */
+	struct	  osockaddr addr; 	/* address for establishing 
+					   conversation */
 } CTL_RESPONSE;
 
 #define	TALK_VERSION	1		/* protocol version */
-- 
cgit v1.2.3-59-g8ed1b