Another PGINDENT run that changes variable indenting and case label indenting. Also static variable indenting.

7 files changed, 180 insertions, 181 deletions

diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h
index a159b7a5ebd..11f57f1b9e9 100644
--- a/src/include/libpq/auth.h
+++ b/src/include/libpq/auth.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: auth.h,v 1.5 1997/09/07 04:58:16 momjian Exp $
+ * $Id: auth.h,v 1.6 1997/09/08 02:36:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,12 +30,12 @@
 #define DEFAULT_CLIENT_AUTHSVC	"kerberos"
 #endif							/* KRB4 || KRB5 */
 
-extern int		fe_sendauth(MsgType msgtype, Port * port, char *hostname);
-extern void		fe_setauthsvc(char *name);
-extern MsgType	fe_getauthsvc();
-extern char    *fe_getauthname(void);
-extern int		be_recvauth(MsgType msgtype, Port * port, char *username, StartupInfo * sp);
-extern void		be_setauthsvc(char *name);
+extern int	fe_sendauth(MsgType msgtype, Port * port, char *hostname);
+extern void fe_setauthsvc(char *name);
+extern MsgType fe_getauthsvc();
+extern char *fe_getauthname(void);
+extern int	be_recvauth(MsgType msgtype, Port * port, char *username, StartupInfo * sp);
+extern void be_setauthsvc(char *name);
 
 /* the value that matches any dbName value when doing
    host based authentication*/
diff --git a/src/include/libpq/be-fsstubs.h b/src/include/libpq/be-fsstubs.h
index 2ea347a9b3e..2aef0e6a403 100644
--- a/src/include/libpq/be-fsstubs.h
+++ b/src/include/libpq/be-fsstubs.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: be-fsstubs.h,v 1.3 1997/09/07 04:58:18 momjian Exp $
+ * $Id: be-fsstubs.h,v 1.4 1997/09/08 02:37:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,20 +21,20 @@
 #define LOread(f,l) loread(f,l)
 #define LOwrite(f,b) lowrite(f,b)
 
-extern Oid		lo_import(text * filename);
-extern int4		lo_export(Oid lobjId, text * filename);
+extern Oid	lo_import(text * filename);
+extern int4 lo_export(Oid lobjId, text * filename);
 
-extern Oid		lo_creat(int mode);
+extern Oid	lo_creat(int mode);
 
-extern int		lo_open(Oid lobjId, int mode);
-extern int		lo_close(int fd);
-extern int		lo_read(int fd, char *buf, int len);
-extern int		lo_write(int fd, char *buf, int len);
-extern int		lo_lseek(int fd, int offset, int whence);
-extern int		lo_tell(int fd);
-extern int		lo_unlink(Oid lobjId);
+extern int	lo_open(Oid lobjId, int mode);
+extern int	lo_close(int fd);
+extern int	lo_read(int fd, char *buf, int len);
+extern int	lo_write(int fd, char *buf, int len);
+extern int	lo_lseek(int fd, int offset, int whence);
+extern int	lo_tell(int fd);
+extern int	lo_unlink(Oid lobjId);
 
 extern struct varlena *loread(int fd, int len);
-extern int		lowrite(int fd, struct varlena * wbuf);
+extern int	lowrite(int fd, struct varlena * wbuf);
 
 #endif							/* BE_FSSTUBS_H */
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
index 4550461d06e..bddfa1888b4 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-be.h,v 1.5 1997/09/07 04:58:20 momjian Exp $
+ * $Id: libpq-be.h,v 1.6 1997/09/08 02:37:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,24 +30,24 @@
  */
 
 /* in be-dumpdata.c */
-extern void		be_portalinit(void);
-extern void		be_portalpush(PortalEntry * entry);
+extern void be_portalinit(void);
+extern void be_portalpush(PortalEntry * entry);
 extern PortalEntry *be_portalpop(void);
 extern PortalEntry *be_currentportal(void);
 extern PortalEntry *be_newportal(void);
 extern void
 be_typeinit(PortalEntry * entry, TupleDesc attrs,
 			int natts);
-extern void		be_printtup(HeapTuple tuple, TupleDesc typeinfo);
+extern void be_printtup(HeapTuple tuple, TupleDesc typeinfo);
 
 
 /* in be-pqexec.c */
-extern char    *
+extern char *
 PQfn(int fnid, int *result_buf, int result_len, int result_is_int,
 	 PQArgBlock * args, int nargs);
-extern char    *PQexec(char *query);
-extern int		pqtest_PQexec(char *q);
-extern int		pqtest_PQfn(char *q);
-extern int32	pqtest(struct varlena * vlena);
+extern char *PQexec(char *query);
+extern int	pqtest_PQexec(char *q);
+extern int	pqtest_PQfn(char *q);
+extern int32 pqtest(struct varlena * vlena);
 
 #endif							/* LIBPQ_BE_H */
diff --git a/src/include/libpq/libpq-fs.h b/src/include/libpq/libpq-fs.h
index 4e7f4e37a2e..ffa20f634d9 100644
--- a/src/include/libpq/libpq-fs.h
+++ b/src/include/libpq/libpq-fs.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-fs.h,v 1.4 1997/09/07 04:58:22 momjian Exp $
+ * $Id: libpq-fs.h,v 1.5 1997/09/08 02:37:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,9 +22,9 @@
 
 struct pgdirent
 {
-	unsigned long	d_ino;
-	unsigned short	d_namlen;
-	char			d_name[MAXNAMLEN + 1];
+	unsigned long d_ino;
+	unsigned short d_namlen;
+	char		d_name[MAXNAMLEN + 1];
 };
 
 /*
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h
index 1b074cba118..e983a91c0fe 100644
--- a/src/include/libpq/libpq.h
+++ b/src/include/libpq/libpq.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq.h,v 1.6 1997/09/07 04:58:24 momjian Exp $
+ * $Id: libpq.h,v 1.7 1997/09/08 02:37:08 momjian Exp $
  *
  * NOTES
  *	  This file contains definitions for structures and
@@ -29,14 +29,14 @@
  */
 typedef struct
 {
-	int				len;
-	int				isint;
+	int			len;
+	int			isint;
 	union
 	{
-		int			   *ptr;	/* can't use void (dec compiler barfs)	 */
-		int				integer;
-	}				u;
-}				PQArgBlock;
+		int		   *ptr;		/* can't use void (dec compiler barfs)	 */
+		int			integer;
+	}			u;
+}			PQArgBlock;
 
 /* ----------------
  * TypeBlock --
@@ -47,10 +47,10 @@ typedef struct
 
 typedef struct TypeBlock
 {
-	char			name[NAMEDATALEN];	/* name of the attribute */
-	int				adtid;		/* adtid of the type */
-	int				adtsize;	/* adtsize of the type */
-}				TypeBlock;
+	char		name[NAMEDATALEN];		/* name of the attribute */
+	int			adtid;			/* adtid of the type */
+	int			adtsize;		/* adtsize of the type */
+}			TypeBlock;
 
 /* ----------------
  * TupleBlock --
@@ -61,12 +61,12 @@ typedef struct TypeBlock
 
 typedef struct TupleBlock
 {
-	char		  **values[TupleBlockSize];		/* an array of tuples */
-	int			   *lengths[TupleBlockSize];	/* an array of length vec.
+	char	  **values[TupleBlockSize]; /* an array of tuples */
+	int		   *lengths[TupleBlockSize];		/* an array of length vec.
 												 * foreach tuple */
 	struct TupleBlock *next;	/* next tuple block */
-	int				tuple_index;/* current tuple index */
-}				TupleBlock;
+	int			tuple_index;	/* current tuple index */
+}			TupleBlock;
 
 /* ----------------
  * GroupBuffer --
@@ -75,12 +75,12 @@ typedef struct TupleBlock
  */
 typedef struct GroupBuffer
 {
-	int				no_tuples;	/* number of tuples in this group */
-	int				no_fields;	/* number of attributes */
-	TypeBlock	   *types;		/* types of the attributes */
-	TupleBlock	   *tuples;		/* tuples in this group */
+	int			no_tuples;		/* number of tuples in this group */
+	int			no_fields;		/* number of attributes */
+	TypeBlock  *types;			/* types of the attributes */
+	TupleBlock *tuples;			/* tuples in this group */
 	struct GroupBuffer *next;	/* next group */
-}				GroupBuffer;
+}			GroupBuffer;
 
 /* ----------------
  * PortalBuffer --
@@ -89,11 +89,11 @@ typedef struct GroupBuffer
  */
 typedef struct PortalBuffer
 {
-	int				rule_p;		/* 1 if this is an asynchronized portal. */
-	int				no_tuples;	/* number of tuples in this portal buffer */
-	int				no_groups;	/* number of tuple groups */
-	GroupBuffer    *groups;		/* linked list of tuple groups */
-}				PortalBuffer;
+	int			rule_p;			/* 1 if this is an asynchronized portal. */
+	int			no_tuples;		/* number of tuples in this portal buffer */
+	int			no_groups;		/* number of tuple groups */
+	GroupBuffer *groups;		/* linked list of tuple groups */
+}			PortalBuffer;
 
 /* ----------------
  * PortalEntry --
@@ -107,30 +107,30 @@ typedef struct PortalBuffer
 
 typedef struct PortalEntry
 {
-	char			name[PortalNameLength];		/* name of this portal */
-	PortalBuffer   *portal;		/* tuples contained in this portal */
-	Pointer			portalcxt;	/* memory context (for backend) */
-	Pointer			result;		/* result for PQexec */
-}				PortalEntry;
+	char		name[PortalNameLength]; /* name of this portal */
+	PortalBuffer *portal;		/* tuples contained in this portal */
+	Pointer		portalcxt;		/* memory context (for backend) */
+	Pointer		result;			/* result for PQexec */
+}			PortalEntry;
 
 #define PORTALS_INITIAL_SIZE 32
 #define PORTALS_GROW_BY		 32
 
 /* in portalbuf.c */
 extern PortalEntry **portals;
-extern size_t	portals_array_size;
+extern size_t portals_array_size;
 
 /*
  *	Asynchronous notification
  */
 typedef struct PQNotifyList
 {
-	char			relname[NAMEDATALEN];		/* name of relation
-												 * containing data */
-	int				be_pid;		/* process id of backend */
-	int				valid;		/* has this already been handled by user. */
+	char		relname[NAMEDATALEN];	/* name of relation containing
+										 * data */
+	int			be_pid;			/* process id of backend */
+	int			valid;			/* has this already been handled by user. */
 /*	  SLNode Node; */
-}				PQNotifyList;
+}			PQNotifyList;
 
 /*
  * Exceptions.
@@ -141,9 +141,9 @@ typedef struct PQNotifyList
 
 /* in portal.c */
 extern Exception MemoryError,
-				PortalError,
-				PostquelError,
-				ProtocolError;
+			PortalError,
+			PostquelError,
+			ProtocolError;
 
 /*
  * POSTGRES backend dependent Constants.
@@ -154,7 +154,7 @@ extern Exception MemoryError,
 #define COMMAND_LENGTH 20
 #define REMARK_LENGTH 80
 
-extern char		PQerrormsg[ERROR_MSG_LENGTH];	/* in portal.c */
+extern char PQerrormsg[ERROR_MSG_LENGTH];		/* in portal.c */
 
 /*
  * External functions.
@@ -163,22 +163,22 @@ extern char		PQerrormsg[ERROR_MSG_LENGTH];	/* in portal.c */
 /*
  * prototypes for functions in portal.c
  */
-extern void		pqdebug(char *target, char *msg);
-extern void		pqdebug2(char *target, char *msg1, char *msg2);
-extern void		PQtrace(void);
-extern void		PQuntrace(void);
-extern int		PQnportals(int rule_p);
-extern void		PQpnames(char **pnames, int rule_p);
+extern void pqdebug(char *target, char *msg);
+extern void pqdebug2(char *target, char *msg1, char *msg2);
+extern void PQtrace(void);
+extern void PQuntrace(void);
+extern int	PQnportals(int rule_p);
+extern void PQpnames(char **pnames, int rule_p);
 extern PortalBuffer *PQparray(char *pname);
-extern int		PQrulep(PortalBuffer * portal);
-extern int		PQntuples(PortalBuffer * portal);
-extern int		PQninstances(PortalBuffer * portal);
-extern int		PQngroups(PortalBuffer * portal);
-extern int		PQntuplesGroup(PortalBuffer * portal, int group_index);
-extern int		PQninstancesGroup(PortalBuffer * portal, int group_index);
-extern int		PQnfieldsGroup(PortalBuffer * portal, int group_index);
-extern int		PQfnumberGroup(PortalBuffer * portal, int group_index, char *field_name);
-extern char    *PQfnameGroup(PortalBuffer * portal, int group_index, int field_number);
+extern int	PQrulep(PortalBuffer * portal);
+extern int	PQntuples(PortalBuffer * portal);
+extern int	PQninstances(PortalBuffer * portal);
+extern int	PQngroups(PortalBuffer * portal);
+extern int	PQntuplesGroup(PortalBuffer * portal, int group_index);
+extern int	PQninstancesGroup(PortalBuffer * portal, int group_index);
+extern int	PQnfieldsGroup(PortalBuffer * portal, int group_index);
+extern int	PQfnumberGroup(PortalBuffer * portal, int group_index, char *field_name);
+extern char *PQfnameGroup(PortalBuffer * portal, int group_index, int field_number);
 extern int
 PQftypeGroup(PortalBuffer * portal, int group_index,
 			 int field_number);
@@ -186,79 +186,79 @@ extern int
 PQfsizeGroup(PortalBuffer * portal, int group_index,
 			 int field_number);
 extern GroupBuffer *PQgroup(PortalBuffer * portal, int tuple_index);
-extern int		PQgetgroup(PortalBuffer * portal, int tuple_index);
-extern int		PQnfields(PortalBuffer * portal, int tuple_index);
-extern int		PQfnumber(PortalBuffer * portal, int tuple_index, char *field_name);
-extern char    *PQfname(PortalBuffer * portal, int tuple_index, int field_number);
-extern int		PQftype(PortalBuffer * portal, int tuple_index, int field_number);
-extern int		PQfsize(PortalBuffer * portal, int tuple_index, int field_number);
-extern int		PQsametype(PortalBuffer * portal, int tuple_index1, int tuple_index2);
-extern char    *PQgetvalue(PortalBuffer * portal, int tuple_index, int field_number);
-extern char    *PQgetAttr(PortalBuffer * portal, int tuple_index, int field_number);
-extern int		PQgetlength(PortalBuffer * portal, int tuple_index, int field_number);
-extern void		PQclear(char *pname);
-extern void		PQcleanNotify(void);
-extern void		PQnotifies_init(void);
+extern int	PQgetgroup(PortalBuffer * portal, int tuple_index);
+extern int	PQnfields(PortalBuffer * portal, int tuple_index);
+extern int	PQfnumber(PortalBuffer * portal, int tuple_index, char *field_name);
+extern char *PQfname(PortalBuffer * portal, int tuple_index, int field_number);
+extern int	PQftype(PortalBuffer * portal, int tuple_index, int field_number);
+extern int	PQfsize(PortalBuffer * portal, int tuple_index, int field_number);
+extern int	PQsametype(PortalBuffer * portal, int tuple_index1, int tuple_index2);
+extern char *PQgetvalue(PortalBuffer * portal, int tuple_index, int field_number);
+extern char *PQgetAttr(PortalBuffer * portal, int tuple_index, int field_number);
+extern int	PQgetlength(PortalBuffer * portal, int tuple_index, int field_number);
+extern void PQclear(char *pname);
+extern void PQcleanNotify(void);
+extern void PQnotifies_init(void);
 extern PQNotifyList *PQnotifies(void);
-extern void		PQremoveNotify(PQNotifyList * nPtr);
-extern void		PQappendNotify(char *relname, int pid);
+extern void PQremoveNotify(PQNotifyList * nPtr);
+extern void PQappendNotify(char *relname, int pid);
 
 /*
  * prototypes for functions in portalbuf.c
  */
-extern caddr_t	pbuf_alloc(size_t size);
-extern void		pbuf_free(caddr_t pointer);
+extern caddr_t pbuf_alloc(size_t size);
+extern void pbuf_free(caddr_t pointer);
 extern PortalBuffer *pbuf_addPortal(void);
 extern GroupBuffer *pbuf_addGroup(PortalBuffer * portal);
 extern TypeBlock *pbuf_addTypes(int n);
 extern TupleBlock *pbuf_addTuples(void);
-extern char   **pbuf_addTuple(int n);
-extern int	   *pbuf_addTupleValueLengths(int n);
-extern char    *pbuf_addValues(int n);
+extern char **pbuf_addTuple(int n);
+extern int *pbuf_addTupleValueLengths(int n);
+extern char *pbuf_addValues(int n);
 extern PortalEntry *pbuf_addEntry(void);
-extern void		pbuf_freeEntry(int i);
-extern void		pbuf_freeTypes(TypeBlock * types);
-extern void		pbuf_freeTuples(TupleBlock * tuples, int no_tuples, int no_fields);
-extern void		pbuf_freeGroup(GroupBuffer * group);
-extern void		pbuf_freePortal(PortalBuffer * portal);
-extern int		pbuf_getIndex(char *pname);
-extern void		pbuf_setportalinfo(PortalEntry * entry, char *pname);
+extern void pbuf_freeEntry(int i);
+extern void pbuf_freeTypes(TypeBlock * types);
+extern void pbuf_freeTuples(TupleBlock * tuples, int no_tuples, int no_fields);
+extern void pbuf_freeGroup(GroupBuffer * group);
+extern void pbuf_freePortal(PortalBuffer * portal);
+extern int	pbuf_getIndex(char *pname);
+extern void pbuf_setportalinfo(PortalEntry * entry, char *pname);
 extern PortalEntry *pbuf_setup(char *pname);
-extern void		pbuf_close(char *pname);
+extern void pbuf_close(char *pname);
 extern GroupBuffer *pbuf_findGroup(PortalBuffer * portal, int group_index);
-extern int		pbuf_findFnumber(GroupBuffer * group, char *field_name);
-extern void		pbuf_checkFnumber(GroupBuffer * group, int field_number);
-extern char    *pbuf_findFname(GroupBuffer * group, int field_number);
+extern int	pbuf_findFnumber(GroupBuffer * group, char *field_name);
+extern void pbuf_checkFnumber(GroupBuffer * group, int field_number);
+extern char *pbuf_findFname(GroupBuffer * group, int field_number);
 
 /*
  * prototypes for functions in pqcomm.c
  */
-extern void		pq_init(int fd);
-extern void		pq_gettty(char *tp);
-extern int		pq_getport(void);
-extern void		pq_close(void);
-extern void		pq_flush(void);
-extern int		pq_getstr(char *s, int maxlen);
-extern int		PQgetline(char *s, int maxlen);
-extern int		PQputline(char *s);
-extern int		pq_getnchar(char *s, int off, int maxlen);
-extern int		pq_getint(int b);
-extern void		pq_putstr(char *s);
-extern void		pq_putnchar(char *s, int n);
-extern void		pq_putint(int i, int b);
-extern int		pq_sendoob(char *msg, int len);
-extern int		pq_recvoob(char *msgPtr, int *lenPtr);
-extern int		pq_getinaddr(struct sockaddr_in * sin, char *host, int port);
-extern int		pq_getinserv(struct sockaddr_in * sin, char *host, char *serv);
+extern void pq_init(int fd);
+extern void pq_gettty(char *tp);
+extern int	pq_getport(void);
+extern void pq_close(void);
+extern void pq_flush(void);
+extern int	pq_getstr(char *s, int maxlen);
+extern int	PQgetline(char *s, int maxlen);
+extern int	PQputline(char *s);
+extern int	pq_getnchar(char *s, int off, int maxlen);
+extern int	pq_getint(int b);
+extern void pq_putstr(char *s);
+extern void pq_putnchar(char *s, int n);
+extern void pq_putint(int i, int b);
+extern int	pq_sendoob(char *msg, int len);
+extern int	pq_recvoob(char *msgPtr, int *lenPtr);
+extern int	pq_getinaddr(struct sockaddr_in * sin, char *host, int port);
+extern int	pq_getinserv(struct sockaddr_in * sin, char *host, char *serv);
 extern int
 pq_connect(char *dbname, char *user, char *args, char *hostName,
 		   char *debugTty, char *execFile, short portName);
-extern int		StreamOpen(char *hostName, short portName, Port * port);
-extern void		pq_regoob(void (*fptr) ());
-extern void		pq_unregoob(void);
-extern void		pq_async_notify(void);
-extern int		StreamServerPort(char *hostName, short portName, int *fdP);
-extern int		StreamConnection(int server_fd, Port * port);
-extern void		StreamClose(int sock);
+extern int	StreamOpen(char *hostName, short portName, Port * port);
+extern void pq_regoob(void (*fptr) ());
+extern void pq_unregoob(void);
+extern void pq_async_notify(void);
+extern int	StreamServerPort(char *hostName, short portName, int *fdP);
+extern int	StreamConnection(int server_fd, Port * port);
+extern void StreamClose(int sock);
 
 #endif							/* LIBPQ_H */
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index 3aceb3de5b4..83c76aa2690 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqcomm.h,v 1.11 1997/09/07 04:58:26 momjian Exp $
+ * $Id: pqcomm.h,v 1.12 1997/09/08 02:37:08 momjian Exp $
  *
  * NOTES
  *	  Some of this should move to libpq.h
@@ -62,19 +62,19 @@ typedef enum _MsgType
 
 #define LAST_AUTHENTICATION_TYPE 14
 
-typedef char   *Addr;
-typedef int		PacketLen;		/* packet length */
+typedef char *Addr;
+typedef int PacketLen;			/* packet length */
 
 
 typedef struct StartupInfo
 {
 /*	   PacketHdr		hdr; */
-	char			database[PATH_SIZE];		/* database name */
-	char			user[NAMEDATALEN];	/* user name */
-	char			options[ARGV_SIZE]; /* possible additional args */
-	char			execFile[ARGV_SIZE];		/* possible backend to use */
-	char			tty[PATH_SIZE];		/* possible tty for debug output */
-}				StartupInfo;
+	char		database[PATH_SIZE];	/* database name */
+	char		user[NAMEDATALEN];		/* user name */
+	char		options[ARGV_SIZE];		/* possible additional args */
+	char		execFile[ARGV_SIZE];	/* possible backend to use */
+	char		tty[PATH_SIZE]; /* possible tty for debug output */
+}			StartupInfo;
 
 /* amount of available data in a packet buffer */
 #define MESSAGE_SIZE	sizeof(StartupInfo) + 5 /* why 5? BJM 2/11/97 */
@@ -88,10 +88,10 @@ typedef struct StartupInfo
    Be sure to use htonl() and ntohl() on the len and msgtype fields! */
 typedef struct PacketBuf
 {
-	int				len;
-	MsgType			msgtype;
-	char			data[MESSAGE_SIZE];
-}				PacketBuf;
+	int			len;
+	MsgType		msgtype;
+	char		data[MESSAGE_SIZE];
+}			PacketBuf;
 
 /* update the conversion routines
   StartupInfo2PacketBuf() and PacketBuf2StartupInfo() (decl. below)
@@ -103,18 +103,17 @@ typedef struct PacketBuf
  */
 typedef struct Port
 {
-	int				sock;		/* file descriptor */
-	int				mask;		/* select mask */
-	int				nBytes;		/* nBytes read in so far */
+	int			sock;			/* file descriptor */
+	int			mask;			/* select mask */
+	int			nBytes;			/* nBytes read in so far */
 	struct sockaddr_in laddr;	/* local addr (us) */
 	struct sockaddr_in raddr;	/* remote addr (them) */
 
 	/*
-	 *	   PacketBufId				id;*//* id of packet buf currently in
-	 * use
-	 */
-	PacketBuf		buf;		/* stream implementation (curr pack buf) */
-}				Port;
+	 * PacketBufId				id;
+	 *//* id of packet buf currently in use */
+	PacketBuf	buf;			/* stream implementation (curr pack buf) */
+}			Port;
 
 /* invalid socket descriptor */
 #define INVALID_SOCK	(-1)
@@ -128,33 +127,33 @@ typedef struct Port
 
 #define DEFAULT_STRING			""
 
-extern FILE    *Pfout,
-			   *Pfin;
-extern int		PQAsyncNotifyWaiting;
+extern FILE *Pfout,
+		   *Pfin;
+extern int	PQAsyncNotifyWaiting;
 
 /* in pqcompriv.c */
-int				pqGetShort(int *, FILE *);
-int				pqGetLong(int *, FILE *);
-int				pqGetNBytes(char *, size_t, FILE *);
-int				pqGetString(char *, size_t, FILE *);
-int				pqGetByte(FILE *);
-
-int				pqPutShort(int, FILE *);
-int				pqPutLong(int, FILE *);
-int				pqPutNBytes(const char *, size_t, FILE *);
-int				pqPutString(const char *, FILE *);
-int				pqPutByte(int, FILE *);
+int			pqGetShort(int *, FILE *);
+int			pqGetLong(int *, FILE *);
+int			pqGetNBytes(char *, size_t, FILE *);
+int			pqGetString(char *, size_t, FILE *);
+int			pqGetByte(FILE *);
+
+int			pqPutShort(int, FILE *);
+int			pqPutLong(int, FILE *);
+int			pqPutNBytes(const char *, size_t, FILE *);
+int			pqPutString(const char *, FILE *);
+int			pqPutByte(int, FILE *);
 
 /*
  * prototypes for functions in pqpacket.c
  */
-extern int		PacketReceive(Port * port, PacketBuf * buf, char nonBlocking);
+extern int	PacketReceive(Port * port, PacketBuf * buf, char nonBlocking);
 extern int
 PacketSend(Port * port, PacketBuf * buf,
 		   PacketLen len, char nonBlocking);
 
 /* extern PacketBuf* StartupInfo2PacketBuf(StartupInfo*); */
 /* extern StartupInfo* PacketBuf2StartupInfo(PacketBuf*); */
-extern char    *name_of_authentication_type(int type);
+extern char *name_of_authentication_type(int type);
 
 #endif							/* PQCOMM_H */
diff --git a/src/include/libpq/pqsignal.h b/src/include/libpq/pqsignal.h
index 69bdb21df7e..f85025a1592 100644
--- a/src/include/libpq/pqsignal.h
+++ b/src/include/libpq/pqsignal.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqsignal.h,v 1.6 1997/09/07 04:58:27 momjian Exp $
+ * $Id: pqsignal.h,v 1.7 1997/09/08 02:37:09 momjian Exp $
  *
  * NOTES
  *	  This shouldn't be in libpq, but the monitor and some other
@@ -17,7 +17,7 @@
 #ifndef PQSIGNAL_H
 #define PQSIGNAL_H
 
-typedef void	(*pqsigfunc) (int);
+typedef void (*pqsigfunc) (int);
 
 extern pqsigfunc pqsignal(int signo, pqsigfunc func);