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/backend/libpq | |
| parent | 075cede74858a9a04e97097b1ccd555121516c20 (diff) | |
Used modified version of indent that understands over 100 typedefs.
Diffstat (limited to 'src/backend/libpq')
| -rw-r--r-- | src/backend/libpq/auth.c | 6 | ||||
| -rw-r--r-- | src/backend/libpq/be-dumpdata.c | 6 | ||||
| -rw-r--r-- | src/backend/libpq/be-fsstubs.c | 10 | ||||
| -rw-r--r-- | src/backend/libpq/be-pqexec.c | 4 | ||||
| -rw-r--r-- | src/backend/libpq/hba.c | 49 | ||||
| -rw-r--r-- | src/backend/libpq/password.c | 2 | ||||
| -rw-r--r-- | src/backend/libpq/portal.c | 50 | ||||
| -rw-r--r-- | src/backend/libpq/portalbuf.c | 22 | ||||
| -rw-r--r-- | src/backend/libpq/pqcomm.c | 8 | ||||
| -rw-r--r-- | src/backend/libpq/pqcomprim.c | 20 | ||||
| -rw-r--r-- | src/backend/libpq/pqpacket.c | 10 |
11 files changed, 94 insertions, 93 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index f3af7c52ccc..eeb26b9587d 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.16 1997/09/08 02:23:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.17 1997/09/08 21:43:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -424,7 +424,7 @@ pg_krb5_recvauth(int sock, #endif /* KRB5 */ static int -pg_password_recvauth(Port * port, char *database, char *DataDir) +pg_password_recvauth(Port *port, char *database, char *DataDir) { PacketBuf buf; char *user, @@ -449,7 +449,7 @@ pg_password_recvauth(Port * port, char *database, char *DataDir) * be_recvauth -- server demux routine for incoming authentication information */ int -be_recvauth(MsgType msgtype_arg, Port * port, char *username, StartupInfo * sp) +be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo *sp) { MsgType msgtype; diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c index f2a0a71889a..97413e82f48 100644 --- a/src/backend/libpq/be-dumpdata.c +++ b/src/backend/libpq/be-dumpdata.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.7 1997/09/08 02:23:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.8 1997/09/08 21:43:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -73,7 +73,7 @@ be_portalinit(void) * ---------------- */ void -be_portalpush(PortalEntry * entry) +be_portalpush(PortalEntry *entry) { DLAddTail(be_portalstack, DLNewElem(entry)); } @@ -166,7 +166,7 @@ be_newportal(void) * ---------------- */ void -be_typeinit(PortalEntry * entry, +be_typeinit(PortalEntry *entry, TupleDesc tupDesc, int natts) { diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c index da166ae54a0..19a52757370 100644 --- a/src/backend/libpq/be-fsstubs.c +++ b/src/backend/libpq/be-fsstubs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.14 1997/09/08 02:23:10 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.15 1997/09/08 21:43:41 momjian Exp $ * * NOTES * This should be moved to a more appropriate place. It is here @@ -49,7 +49,7 @@ static LargeObjectDesc *cookies[MAX_LOBJ_FDS]; static GlobalMemory fscxt = NULL; -static int newLOfd(LargeObjectDesc * lobjCookie); +static int newLOfd(LargeObjectDesc *lobjCookie); static void deleteLOfd(int fd); @@ -254,7 +254,7 @@ lowrite(int fd, struct varlena * wbuf) * imports a file as an (inversion) large object. */ Oid -lo_import(text * filename) +lo_import(text *filename) { int fd; int nbytes, @@ -317,7 +317,7 @@ lo_import(text * filename) * exports an (inversion) large object. */ int4 -lo_export(Oid lobjId, text * filename) +lo_export(Oid lobjId, text *filename) { int fd; int nbytes, @@ -377,7 +377,7 @@ lo_export(Oid lobjId, text * filename) *****************************************************************************/ static int -newLOfd(LargeObjectDesc * lobjCookie) +newLOfd(LargeObjectDesc *lobjCookie) { int i; diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c index 24f2240d10d..31be26425f9 100644 --- a/src/backend/libpq/be-pqexec.c +++ b/src/backend/libpq/be-pqexec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.6 1997/09/08 02:23:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.7 1997/09/08 21:43:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,7 +63,7 @@ PQfn(int fnid, int *result_buf, /* can't use void, dec compiler barfs */ int result_len, int result_is_int, - PQArgBlock * args, + PQArgBlock *args, int nargs) { char *retval; /* XXX - should be datum, maybe ? */ diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 8e1a0753b22..d0734d3ea5c 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.21 1997/09/08 02:23:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.22 1997/09/08 21:43:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,7 +42,7 @@ isblank(const char c) static void -next_token(FILE * fp, char *buf, const int bufsz) +next_token(FILE *fp, char *buf, const int bufsz) { /*-------------------------------------------------------------------------- Grab one token out of fp. Tokens are strings of non-blank @@ -85,7 +85,7 @@ next_token(FILE * fp, char *buf, const int bufsz) static void -read_through_eol(FILE * file) +read_through_eol(FILE *file) { int c; @@ -97,8 +97,8 @@ read_through_eol(FILE * file) static void -read_hba_entry2(FILE * file, enum Userauth * userauth_p, char usermap_name[], - bool * error_p, bool * matches_p, bool find_password_entries) +read_hba_entry2(FILE *file, enum Userauth * userauth_p, char usermap_name[], + bool *error_p, bool *matches_p, bool find_password_entries) { /*-------------------------------------------------------------------------- Read from file FILE the rest of a host record, after the mask field, @@ -182,9 +182,9 @@ read_hba_entry2(FILE * file, enum Userauth * userauth_p, char usermap_name[], static void -process_hba_record(FILE * file, +process_hba_record(FILE *file, const struct in_addr ip_addr, const char database[], - bool * matches_p, bool * error_p, + bool *matches_p, bool *error_p, enum Userauth * userauth_p, char usermap_name[], bool find_password_entries) { @@ -311,9 +311,9 @@ process_hba_record(FILE * file, static void -process_open_config_file(FILE * file, +process_open_config_file(FILE *file, 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) { /*--------------------------------------------------------------------------- @@ -370,7 +370,7 @@ process_open_config_file(FILE * file, 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) { /*-------------------------------------------------------------------------- @@ -461,7 +461,7 @@ find_hba_entry(const char DataDir[], const struct in_addr ip_addr, static void interpret_ident_response(char ident_response[], - bool * error_p, char ident_username[]) + bool *error_p, char ident_username[]) { /*---------------------------------------------------------------------------- Parse the string "ident_response[]" as a response from a query to an Ident @@ -549,7 +549,7 @@ interpret_ident_response(char ident_response[], static void ident(const struct in_addr remote_ip_addr, const struct in_addr local_ip_addr, const ushort remote_port, const ushort local_port, - bool * ident_failed, char ident_username[]) + bool *ident_failed, char ident_username[]) { /*-------------------------------------------------------------------------- Talk to the ident server on host "remote_ip_addr" and find out who @@ -661,7 +661,7 @@ ident(const struct in_addr remote_ip_addr, const struct in_addr local_ip_addr, static void -parse_map_record(FILE * file, +parse_map_record(FILE *file, char file_map[], char file_pguser[], char file_iuser[]) { /*--------------------------------------------------------------------------- @@ -702,11 +702,11 @@ parse_map_record(FILE * file, static void -verify_against_open_usermap(FILE * file, +verify_against_open_usermap(FILE *file, const char pguser[], const char ident_username[], const char usermap_name[], - bool * checks_out_p) + bool *checks_out_p) { /*-------------------------------------------------------------------------- This function does the same thing as verify_against_usermap, @@ -758,7 +758,7 @@ verify_against_usermap(const char DataDir[], const char pguser[], const char ident_username[], const char usermap_name[], - bool * checks_out_p) + bool *checks_out_p) { /*-------------------------------------------------------------------------- See if the user with ident username "ident_username" is allowed to act @@ -838,7 +838,7 @@ static void authident(const char DataDir[], const Port port, const char postgres_username[], const char usermap_name[], - bool * authentic_p) + bool *authentic_p) { /*--------------------------------------------------------------------------- Talk to the ident server on the remote host and find out who owns the @@ -878,7 +878,7 @@ authident(const char DataDir[], 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[]) { /*--------------------------------------------------------------------------- @@ -923,7 +923,7 @@ hba_recvauth(const Port * port, const char database[], const char user[], case Trust: retvalue = STATUS_OK; break; - case Ident: + case Ident: { /* @@ -934,14 +934,15 @@ hba_recvauth(const Port * port, const char database[], const char user[], bool authentic; /* He is who he says he * is. */ - authident(DataDir, *port, user, usermap_name, &authentic); + authident(DataDir, *port, user, usermap_name, &authentic); - if (authentic) - retvalue = STATUS_OK; + if (authentic) + retvalue = STATUS_OK; else - retvalue = STATUS_ERROR; + retvalue = STATUS_ERROR; } - break; + break; + default: retvalue = STATUS_ERROR; Assert(false); diff --git a/src/backend/libpq/password.c b/src/backend/libpq/password.c index 2553878fc5a..bd2f6bee201 100644 --- a/src/backend/libpq/password.c +++ b/src/backend/libpq/password.c @@ -10,7 +10,7 @@ #endif int -verify_password(char *user, char *password, Port * port, +verify_password(char *user, char *password, Port *port, char *database, char *DataDir) { bool host_ok; diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c index 2d213a1f24e..c85b3a763c2 100644 --- a/src/backend/libpq/portal.c +++ b/src/backend/libpq/portal.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.8 1997/09/08 02:23:14 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.9 1997/09/08 21:43:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -183,7 +183,7 @@ PQparray(char *pname) * -------------------------------- */ int -PQrulep(PortalBuffer * portal) +PQrulep(PortalBuffer *portal) { if (!valid_pointer("PQrulep: invalid portal pointer", portal)) return (-1); @@ -196,7 +196,7 @@ PQrulep(PortalBuffer * portal) * -------------------------------- */ int -PQntuples(PortalBuffer * portal) +PQntuples(PortalBuffer *portal) { if (!valid_pointer("PQntuples: invalid portal pointer", portal)) return (-1); @@ -205,7 +205,7 @@ PQntuples(PortalBuffer * portal) } int -PQninstances(PortalBuffer * portal) +PQninstances(PortalBuffer *portal) { return (PQntuples(portal)); } @@ -215,7 +215,7 @@ PQninstances(PortalBuffer * portal) * -------------------------------- */ int -PQngroups(PortalBuffer * portal) +PQngroups(PortalBuffer *portal) { if (!valid_pointer("PQngroups: invalid portal pointer", portal)) return (-1); @@ -228,7 +228,7 @@ PQngroups(PortalBuffer * portal) * -------------------------------- */ int -PQntuplesGroup(PortalBuffer * portal, int group_index) +PQntuplesGroup(PortalBuffer *portal, int group_index) { GroupBuffer *gbp; @@ -244,7 +244,7 @@ PQntuplesGroup(PortalBuffer * portal, int group_index) } int -PQninstancesGroup(PortalBuffer * portal, int group_index) +PQninstancesGroup(PortalBuffer *portal, int group_index) { return (PQntuplesGroup(portal, group_index)); } @@ -254,7 +254,7 @@ PQninstancesGroup(PortalBuffer * portal, int group_index) * -------------------------------- */ int -PQnfieldsGroup(PortalBuffer * portal, int group_index) +PQnfieldsGroup(PortalBuffer *portal, int group_index) { GroupBuffer *gbp; @@ -274,7 +274,7 @@ PQnfieldsGroup(PortalBuffer * portal, int group_index) * -------------------------------- */ int -PQfnumberGroup(PortalBuffer * portal, int group_index, char *field_name) +PQfnumberGroup(PortalBuffer *portal, int group_index, char *field_name) { GroupBuffer *gbp; @@ -296,7 +296,7 @@ PQfnumberGroup(PortalBuffer * portal, int group_index, char *field_name) * -------------------------------- */ char * -PQfnameGroup(PortalBuffer * portal, int group_index, int field_number) +PQfnameGroup(PortalBuffer *portal, int group_index, int field_number) { GroupBuffer *gbp; @@ -318,7 +318,7 @@ PQfnameGroup(PortalBuffer * portal, int group_index, int field_number) * -------------------------------- */ int -PQftypeGroup(PortalBuffer * portal, int group_index, int field_number) +PQftypeGroup(PortalBuffer *portal, int group_index, int field_number) { GroupBuffer *gbp; @@ -339,7 +339,7 @@ PQftypeGroup(PortalBuffer * portal, int group_index, int field_number) * -------------------------------- */ int -PQfsizeGroup(PortalBuffer * portal, int group_index, int field_number) +PQfsizeGroup(PortalBuffer *portal, int group_index, int field_number) { GroupBuffer *gbp; @@ -360,7 +360,7 @@ PQfsizeGroup(PortalBuffer * portal, int group_index, int field_number) * -------------------------------- */ GroupBuffer * -PQgroup(PortalBuffer * portal, int tuple_index) +PQgroup(PortalBuffer *portal, int tuple_index) { GroupBuffer *gbp; int tuple_count = 0; @@ -386,7 +386,7 @@ PQgroup(PortalBuffer * portal, int tuple_index) * -------------------------------- */ int -PQgetgroup(PortalBuffer * portal, int tuple_index) +PQgetgroup(PortalBuffer *portal, int tuple_index) { GroupBuffer *gbp; int tuple_count = 0, @@ -412,7 +412,7 @@ PQgetgroup(PortalBuffer * portal, int tuple_index) * -------------------------------- */ int -PQnfields(PortalBuffer * portal, int tuple_index) +PQnfields(PortalBuffer *portal, int tuple_index) { GroupBuffer *gbp; @@ -432,7 +432,7 @@ PQnfields(PortalBuffer * portal, int tuple_index) * -------------------------------- */ int -PQfnumber(PortalBuffer * portal, int tuple_index, char *field_name) +PQfnumber(PortalBuffer *portal, int tuple_index, char *field_name) { GroupBuffer *gbp; @@ -452,7 +452,7 @@ PQfnumber(PortalBuffer * portal, int tuple_index, char *field_name) * -------------------------------- */ char * -PQfname(PortalBuffer * portal, int tuple_index, int field_number) +PQfname(PortalBuffer *portal, int tuple_index, int field_number) { GroupBuffer *gbp; @@ -473,7 +473,7 @@ PQfname(PortalBuffer * portal, int tuple_index, int field_number) * -------------------------------- */ int -PQftype(PortalBuffer * portal, int tuple_index, int field_number) +PQftype(PortalBuffer *portal, int tuple_index, int field_number) { GroupBuffer *gbp; @@ -493,7 +493,7 @@ PQftype(PortalBuffer * portal, int tuple_index, int field_number) * -------------------------------- */ int -PQfsize(PortalBuffer * portal, int tuple_index, int field_number) +PQfsize(PortalBuffer *portal, int tuple_index, int field_number) { GroupBuffer *gbp; @@ -516,7 +516,7 @@ PQfsize(PortalBuffer * portal, int tuple_index, int field_number) * -------------------------------- */ int -PQsametype(PortalBuffer * portal, int tuple_index1, int tuple_index2) +PQsametype(PortalBuffer *portal, int tuple_index1, int tuple_index2) { GroupBuffer *gbp1, *gbp2; @@ -536,7 +536,7 @@ PQsametype(PortalBuffer * portal, int tuple_index1, int tuple_index2) } static TupleBlock * -PQGetTupleBlock(PortalBuffer * portal, +PQGetTupleBlock(PortalBuffer *portal, int tuple_index, int *tuple_offset) { @@ -579,7 +579,7 @@ PQGetTupleBlock(PortalBuffer * portal, * -------------------------------- */ char * -PQgetvalue(PortalBuffer * portal, +PQgetvalue(PortalBuffer *portal, int tuple_index, int field_number) { @@ -599,7 +599,7 @@ PQgetvalue(PortalBuffer * portal, * -------------------------------- */ char * -PQgetAttr(PortalBuffer * portal, +PQgetAttr(PortalBuffer *portal, int tuple_index, int field_number) { @@ -627,7 +627,7 @@ PQgetAttr(PortalBuffer * portal, * -------------------------------- */ int -PQgetlength(PortalBuffer * portal, +PQgetlength(PortalBuffer *portal, int tuple_index, int field_number) { @@ -716,7 +716,7 @@ PQnotifies() } void -PQremoveNotify(PQNotifyList * nPtr) +PQremoveNotify(PQNotifyList *nPtr) { nPtr->valid = 0; /* remove later */ } diff --git a/src/backend/libpq/portalbuf.c b/src/backend/libpq/portalbuf.c index 71db1d1e761..bff6a449ead 100644 --- a/src/backend/libpq/portalbuf.c +++ b/src/backend/libpq/portalbuf.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.6 1997/09/08 02:23:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.7 1997/09/08 21:43:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -160,7 +160,7 @@ pbuf_addPortal() * -------------------------------- */ GroupBuffer * -pbuf_addGroup(PortalBuffer * portal) +pbuf_addGroup(PortalBuffer *portal) { GroupBuffer *group, *group1; @@ -285,7 +285,7 @@ pbuf_freeEntry(int i) * -------------------------------- */ void -pbuf_freeTypes(TypeBlock * types) +pbuf_freeTypes(TypeBlock *types) { pbuf_free((caddr_t) types); } @@ -295,7 +295,7 @@ pbuf_freeTypes(TypeBlock * types) * -------------------------------- */ void -pbuf_freeTuples(TupleBlock * tuples, +pbuf_freeTuples(TupleBlock *tuples, int no_tuples, int no_fields) { @@ -328,7 +328,7 @@ pbuf_freeTuples(TupleBlock * tuples, * -------------------------------- */ void -pbuf_freeGroup(GroupBuffer * group) +pbuf_freeGroup(GroupBuffer *group) { if (group->next != NULL) pbuf_freeGroup(group->next); @@ -347,7 +347,7 @@ pbuf_freeGroup(GroupBuffer * group) * -------------------------------- */ void -pbuf_freePortal(PortalBuffer * portal) +pbuf_freePortal(PortalBuffer *portal) { if (portal->groups != NULL) pbuf_freeGroup(portal->groups); @@ -381,7 +381,7 @@ pbuf_getIndex(char *pname) * -------------------------------- */ void -pbuf_setportalinfo(PortalEntry * entry, char *pname) +pbuf_setportalinfo(PortalEntry *entry, char *pname) { if (entry) strNcpy(entry->name, pname, PortalNameLength - 1); @@ -449,7 +449,7 @@ pbuf_close(char *pname) * -------------------------------- */ GroupBuffer * -pbuf_findGroup(PortalBuffer * portal, +pbuf_findGroup(PortalBuffer *portal, int group_index) { GroupBuffer *group; @@ -473,7 +473,7 @@ pbuf_findGroup(PortalBuffer * portal, * -------------------------------- */ int -pbuf_findFnumber(GroupBuffer * group, +pbuf_findFnumber(GroupBuffer *group, char *field_name) { TypeBlock *types; @@ -498,7 +498,7 @@ pbuf_findFnumber(GroupBuffer * group, * -------------------------------- */ void -pbuf_checkFnumber(GroupBuffer * group, +pbuf_checkFnumber(GroupBuffer *group, int field_number) { if (field_number < 0 || field_number >= group->no_fields) @@ -511,7 +511,7 @@ pbuf_checkFnumber(GroupBuffer * group, * -------------------------------- */ char * -pbuf_findFname(GroupBuffer * group, +pbuf_findFname(GroupBuffer *group, int field_number) { pbuf_checkFnumber(group, field_number); diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index 93e8fa81af2..550e797d272 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.21 1997/09/08 02:23:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.22 1997/09/08 21:43:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -100,7 +100,7 @@ pq_init(int fd) * used for debugging libpq */ static int -pq_getc(FILE * fin) +pq_getc(FILE *fin) { int c; @@ -643,7 +643,7 @@ StreamServerPort(char *hostName, short portName, int *fdP) * RETURNS: STATUS_OK or STATUS_ERROR */ int -StreamConnection(int server_fd, Port * port) +StreamConnection(int server_fd, Port *port) { int addrlen; @@ -712,7 +712,7 @@ StreamClose(int sock) * --------------------------- */ int -StreamOpen(char *hostName, short portName, Port * port) +StreamOpen(char *hostName, short portName, Port *port) { struct hostent *hp; int laddrlen = sizeof(struct sockaddr_in); diff --git a/src/backend/libpq/pqcomprim.c b/src/backend/libpq/pqcomprim.c index d6bdf6f13bb..594bb2b98ad 100644 --- a/src/backend/libpq/pqcomprim.c +++ b/src/backend/libpq/pqcomprim.c @@ -46,7 +46,7 @@ /* --------------------------------------------------------------------- */ int -pqPutShort(int integer, FILE * f) +pqPutShort(int integer, FILE *f) { int retval = 0; u_short n, @@ -62,7 +62,7 @@ pqPutShort(int integer, FILE * f) /* --------------------------------------------------------------------- */ int -pqPutLong(int integer, FILE * f) +pqPutLong(int integer, FILE *f) { int retval = 0; u_long n; @@ -76,7 +76,7 @@ pqPutLong(int integer, FILE * f) /* --------------------------------------------------------------------- */ int -pqGetShort(int *result, FILE * f) +pqGetShort(int *result, FILE *f) { int retval = 0; u_short n; @@ -90,7 +90,7 @@ pqGetShort(int *result, FILE * f) /* --------------------------------------------------------------------- */ int -pqGetLong(int *result, FILE * f) +pqGetLong(int *result, FILE *f) { int retval = 0; u_long n; @@ -107,7 +107,7 @@ pqGetLong(int *result, FILE * f) Return 0 if ok. */ int -pqGetNBytes(char *s, size_t len, FILE * f) +pqGetNBytes(char *s, size_t len, FILE *f) { int cnt; @@ -123,7 +123,7 @@ pqGetNBytes(char *s, size_t len, FILE * f) /* --------------------------------------------------------------------- */ int -pqPutNBytes(const char *s, size_t len, FILE * f) +pqPutNBytes(const char *s, size_t len, FILE *f) { if (f == NULL) return 0; @@ -136,7 +136,7 @@ pqPutNBytes(const char *s, size_t len, FILE * f) /* --------------------------------------------------------------------- */ int -pqGetString(char *s, size_t len, FILE * f) +pqGetString(char *s, size_t len, FILE *f) { int c; @@ -153,7 +153,7 @@ pqGetString(char *s, size_t len, FILE * f) /* --------------------------------------------------------------------- */ int -pqPutString(const char *s, FILE * f) +pqPutString(const char *s, FILE *f) { if (f == NULL) return 0; @@ -170,14 +170,14 @@ pqPutString(const char *s, FILE * f) /* --------------------------------------------------------------------- */ int -pqGetByte(FILE * f) +pqGetByte(FILE *f) { return getc(f); } /* --------------------------------------------------------------------- */ int -pqPutByte(int c, FILE * f) +pqPutByte(int c, FILE *f) { if (!f) return 0; diff --git a/src/backend/libpq/pqpacket.c b/src/backend/libpq/pqpacket.c index fb1f2fbb481..1e95794c851 100644 --- a/src/backend/libpq/pqpacket.c +++ b/src/backend/libpq/pqpacket.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.7 1997/09/08 02:23:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.8 1997/09/08 21:43:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,8 +57,8 @@ * */ int -PacketReceive(Port * port, /* receive port */ - PacketBuf * buf, /* MAX_PACKET_SIZE-worth of buffer space */ +PacketReceive(Port *port, /* receive port */ + PacketBuf *buf, /* MAX_PACKET_SIZE-worth of buffer space */ bool nonBlocking) /* NON_BLOCKING or BLOCKING i/o */ { PacketLen max_size = sizeof(PacketBuf); @@ -219,8 +219,8 @@ PacketReceive(Port * port, /* receive port */ * */ int -PacketSend(Port * port, - PacketBuf * buf, +PacketSend(Port *port, + PacketBuf *buf, PacketLen len, bool nonBlocking) { |
