diff options
| author | Bruce Momjian | 1997-09-08 21:56:23 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1997-09-08 21:56:23 +0000 |
| commit | 59f6a57e59fe8353f9edaa3703516ea67e06672b (patch) | |
| tree | 1b083fb66cf0be3890480a1ed5fb077dd7293790 /src/include/libpq | |
| parent | 075cede74858a9a04e97097b1ccd555121516c20 (diff) | |
Used modified version of indent that understands over 100 typedefs.
Diffstat (limited to 'src/include/libpq')
| -rw-r--r-- | src/include/libpq/auth.h | 6 | ||||
| -rw-r--r-- | src/include/libpq/be-fsstubs.h | 6 | ||||
| -rw-r--r-- | src/include/libpq/hba.h | 9 | ||||
| -rw-r--r-- | src/include/libpq/libpq-be.h | 8 | ||||
| -rw-r--r-- | src/include/libpq/libpq.h | 86 | ||||
| -rw-r--r-- | src/include/libpq/password.h | 2 | ||||
| -rw-r--r-- | src/include/libpq/pqcomm.h | 12 |
7 files changed, 65 insertions, 64 deletions
diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h index 11f57f1b9e9..6a4160e65df 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.6 1997/09/08 02:36:58 momjian Exp $ + * $Id: auth.h,v 1.7 1997/09/08 21:52:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,11 +30,11 @@ #define DEFAULT_CLIENT_AUTHSVC "kerberos" #endif /* KRB4 || KRB5 */ -extern int fe_sendauth(MsgType msgtype, Port * port, char *hostname); +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 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 diff --git a/src/include/libpq/be-fsstubs.h b/src/include/libpq/be-fsstubs.h index 2aef0e6a403..507f2a93677 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.4 1997/09/08 02:37:00 momjian Exp $ + * $Id: be-fsstubs.h,v 1.5 1997/09/08 21:52:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,8 +21,8 @@ #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); diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index c54b9938ce4..8a430b94c7b 100644 --- a/src/include/libpq/hba.h +++ b/src/include/libpq/hba.h @@ -4,7 +4,7 @@ * Interface to hba.c * * - * $Id: hba.h,v 1.4 1997/09/07 04:58:19 momjian Exp $ + * $Id: hba.h,v 1.5 1997/09/08 21:52:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,16 +38,17 @@ enum Userauth { - Trust, Ident, Password + Trust, Ident, + Password }; extern int -hba_recvauth(const Port * port, const char database[], const char user[], +hba_recvauth(const Port *port, const char database[], const char user[], const char DataDir[]); void find_hba_entry(const char DataDir[], const struct in_addr ip_addr, const char database[], - bool * host_ok_p, enum Userauth * userauth_p, + bool *host_ok_p, enum Userauth * userauth_p, char usermap_name[], bool find_password_entries); #endif diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index bddfa1888b4..534adf12b65 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.6 1997/09/08 02:37:03 momjian Exp $ + * $Id: libpq-be.h,v 1.7 1997/09/08 21:52:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,12 +31,12 @@ /* in be-dumpdata.c */ extern void be_portalinit(void); -extern void be_portalpush(PortalEntry * entry); +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, +be_typeinit(PortalEntry *entry, TupleDesc attrs, int natts); extern void be_printtup(HeapTuple tuple, TupleDesc typeinfo); @@ -44,7 +44,7 @@ extern void be_printtup(HeapTuple tuple, TupleDesc typeinfo); /* in be-pqexec.c */ extern char * PQfn(int fnid, int *result_buf, int result_len, int result_is_int, - PQArgBlock * args, int nargs); + PQArgBlock *args, int nargs); extern char *PQexec(char *query); extern int pqtest_PQexec(char *q); extern int pqtest_PQfn(char *q); diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index e983a91c0fe..68265f809a7 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.7 1997/09/08 02:37:08 momjian Exp $ + * $Id: libpq.h,v 1.8 1997/09/08 21:52:36 momjian Exp $ * * NOTES * This file contains definitions for structures and @@ -36,7 +36,7 @@ typedef struct int *ptr; /* can't use void (dec compiler barfs) */ int integer; } u; -} PQArgBlock; +} PQArgBlock; /* ---------------- * TypeBlock -- @@ -50,7 +50,7 @@ typedef struct TypeBlock char name[NAMEDATALEN]; /* name of the attribute */ int adtid; /* adtid of the type */ int adtsize; /* adtsize of the type */ -} TypeBlock; +} TypeBlock; /* ---------------- * TupleBlock -- @@ -66,7 +66,7 @@ typedef struct TupleBlock * foreach tuple */ struct TupleBlock *next; /* next tuple block */ int tuple_index; /* current tuple index */ -} TupleBlock; +} TupleBlock; /* ---------------- * GroupBuffer -- @@ -80,7 +80,7 @@ typedef struct GroupBuffer TypeBlock *types; /* types of the attributes */ TupleBlock *tuples; /* tuples in this group */ struct GroupBuffer *next; /* next group */ -} GroupBuffer; +} GroupBuffer; /* ---------------- * PortalBuffer -- @@ -93,7 +93,7 @@ typedef struct PortalBuffer 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; +} PortalBuffer; /* ---------------- * PortalEntry -- @@ -111,7 +111,7 @@ typedef struct PortalEntry PortalBuffer *portal; /* tuples contained in this portal */ Pointer portalcxt; /* memory context (for backend) */ Pointer result; /* result for PQexec */ -} PortalEntry; +} PortalEntry; #define PORTALS_INITIAL_SIZE 32 #define PORTALS_GROW_BY 32 @@ -130,7 +130,7 @@ typedef struct PQNotifyList int be_pid; /* process id of backend */ int valid; /* has this already been handled by user. */ /* SLNode Node; */ -} PQNotifyList; +} PQNotifyList; /* * Exceptions. @@ -170,37 +170,37 @@ 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, +PQftypeGroup(PortalBuffer *portal, int group_index, int field_number); extern int -PQfsizeGroup(PortalBuffer * portal, int group_index, +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 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 PQNotifyList *PQnotifies(void); -extern void PQremoveNotify(PQNotifyList * nPtr); +extern void PQremoveNotify(PQNotifyList *nPtr); extern void PQappendNotify(char *relname, int pid); /* @@ -209,7 +209,7 @@ extern void PQappendNotify(char *relname, int pid); 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 GroupBuffer *pbuf_addGroup(PortalBuffer *portal); extern TypeBlock *pbuf_addTypes(int n); extern TupleBlock *pbuf_addTuples(void); extern char **pbuf_addTuple(int n); @@ -217,18 +217,18 @@ 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 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_setportalinfo(PortalEntry *entry, char *pname); extern PortalEntry *pbuf_setup(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 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); /* * prototypes for functions in pqcomm.c @@ -253,12 +253,12 @@ 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 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 int StreamConnection(int server_fd, Port *port); extern void StreamClose(int sock); #endif /* LIBPQ_H */ diff --git a/src/include/libpq/password.h b/src/include/libpq/password.h index 2b933553d59..28b279a7c08 100644 --- a/src/include/libpq/password.h +++ b/src/include/libpq/password.h @@ -7,7 +7,7 @@ #define PWFILE_NAME_SIZE USERMAP_NAME_SIZE int -verify_password(char *user, char *password, Port * port, +verify_password(char *user, char *password, Port *port, char *database, char *DataDir); #endif diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h index f565900a5d5..c81c5d666c6 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.13 1997/09/08 20:58:26 momjian Exp $ + * $Id: pqcomm.h,v 1.14 1997/09/08 21:52:38 momjian Exp $ * * NOTES * Some of this should move to libpq.h @@ -74,7 +74,7 @@ typedef struct StartupInfo 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; +} StartupInfo; /* amount of available data in a packet buffer */ #define MESSAGE_SIZE sizeof(StartupInfo) + 5 /* why 5? BJM 2/11/97 */ @@ -91,7 +91,7 @@ typedef struct PacketBuf int len; MsgType msgtype; char data[MESSAGE_SIZE]; -} PacketBuf; +} PacketBuf; /* update the conversion routines StartupInfo2PacketBuf() and PacketBuf2StartupInfo() (decl. below) @@ -113,7 +113,7 @@ typedef struct Port * PacketBufId id; *//* id of packet buf currently in use */ PacketBuf buf; /* stream implementation (curr pack buf) */ -} Port; +} Port; /* invalid socket descriptor */ #define INVALID_SOCK (-1) @@ -147,9 +147,9 @@ 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, +PacketSend(Port *port, PacketBuf *buf, PacketLen len, char nonBlocking); /* extern PacketBuf* StartupInfo2PacketBuf(StartupInfo*); */ |
