diff options
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/libpgtcl/pgtclId.c | 6 | ||||
| -rw-r--r-- | src/interfaces/libpgtcl/pgtclId.h | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-auth.c | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-auth.h | 4 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 46 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-connect.h | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-exec.c | 98 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-lobj.c | 26 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-misc.c | 18 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-fe.h | 138 |
10 files changed, 177 insertions, 177 deletions
diff --git a/src/interfaces/libpgtcl/pgtclId.c b/src/interfaces/libpgtcl/pgtclId.c index fb43616a8ea..5b82ff1a51c 100644 --- a/src/interfaces/libpgtcl/pgtclId.c +++ b/src/interfaces/libpgtcl/pgtclId.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclId.c,v 1.5 1997/09/08 02:40:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclId.c,v 1.6 1997/09/08 21:55:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,7 +29,7 @@ * Create the Id for a new connection and hash it */ void -PgSetConnectionId(Pg_clientData * cd, char *id, PGconn * conn) +PgSetConnectionId(Pg_clientData * cd, char *id, PGconn *conn) { Tcl_HashEntry *hent; Pg_ConnectionId *connid; @@ -111,7 +111,7 @@ PgDelConnectionId(Pg_clientData * cd, char *id) * Create a new result Id and hash it */ void -PgSetResultId(Pg_clientData * cd, char *id, char *connid_c, PGresult * res) +PgSetResultId(Pg_clientData * cd, char *id, char *connid_c, PGresult *res) { Tcl_HashEntry *hent; Pg_ConnectionId *connid; diff --git a/src/interfaces/libpgtcl/pgtclId.h b/src/interfaces/libpgtcl/pgtclId.h index 22d44c5b9fa..130f017ec6e 100644 --- a/src/interfaces/libpgtcl/pgtclId.h +++ b/src/interfaces/libpgtcl/pgtclId.h @@ -8,15 +8,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pgtclId.h,v 1.4 1997/09/08 02:40:17 momjian Exp $ + * $Id: pgtclId.h,v 1.5 1997/09/08 21:55:26 momjian Exp $ * *------------------------------------------------------------------------- */ -extern void PgSetConnectionId(Pg_clientData * cd, char *id, PGconn * conn); +extern void PgSetConnectionId(Pg_clientData * cd, char *id, PGconn *conn); extern PGconn *PgGetConnectionId(Pg_clientData * cd, char *id); extern void PgDelConnectionId(Pg_clientData * cd, char *id); -extern void PgSetResultId(Pg_clientData * cd, char *id, char *connid, PGresult * res); +extern void PgSetResultId(Pg_clientData * cd, char *id, char *connid, PGresult *res); extern PGresult *PgGetResultId(Pg_clientData * cd, char *id); extern void PgDelResultId(Pg_clientData * cd, char *id); extern void PgGetConnByResultId(Pg_clientData * cd, char *id, char *resid); diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c index 0b4a697f859..3bcd919dc0c 100644 --- a/src/interfaces/libpq/fe-auth.c +++ b/src/interfaces/libpq/fe-auth.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.10 1997/09/08 02:40:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.11 1997/09/08 21:55:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -457,7 +457,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock, #endif /* KRB5 */ static int -pg_password_sendauth(Port * port, const char *user, const char *password) +pg_password_sendauth(Port *port, const char *user, const char *password) { PacketBuf buf; char *tmp; @@ -478,7 +478,7 @@ pg_password_sendauth(Port * port, const char *user, const char *password) * fe_sendauth -- client demux routine for outgoing authentication information */ int -fe_sendauth(MsgType msgtype, Port * port, const char *hostname, +fe_sendauth(MsgType msgtype, Port *port, const char *hostname, const char *user, const char *password, const char *PQerrormsg) { switch (msgtype) diff --git a/src/interfaces/libpq/fe-auth.h b/src/interfaces/libpq/fe-auth.h index 6bd4530a285..6f188a541ec 100644 --- a/src/interfaces/libpq/fe-auth.h +++ b/src/interfaces/libpq/fe-auth.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: fe-auth.h,v 1.5 1997/09/08 02:40:23 momjian Exp $ + * $Id: fe-auth.h,v 1.6 1997/09/08 21:55:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,7 +29,7 @@ #endif /* KRB4 || KRB5 */ extern int -fe_sendauth(MsgType msgtype, Port * port, const char *hostname, +fe_sendauth(MsgType msgtype, Port *port, const char *hostname, const char *user, const char *password, const char *PQerromsg); extern void fe_setauthsvc(const char *name, char *PQerrormsg); diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index c338f49ca3e..d2089157764 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.40 1997/09/08 02:40:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.41 1997/09/08 21:55:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,11 +39,11 @@ /* use a local version instead of the one found in pqpacket.c */ -static ConnStatusType connectDB(PGconn * conn); +static ConnStatusType connectDB(PGconn *conn); -static void startup2PacketBuf(StartupInfo * s, PacketBuf * res); -static void freePGconn(PGconn * conn); -static void closePGconn(PGconn * conn); +static void startup2PacketBuf(StartupInfo *s, PacketBuf *res); +static void freePGconn(PGconn *conn); +static void closePGconn(PGconn *conn); static int conninfo_parse(const char *conninfo, char *errorMessage); static char *conninfo_getval(char *keyword); static void conninfo_free(void); @@ -463,7 +463,7 @@ PQsetdb(const char *pghost, const char *pgport, const char *pgoptions, const cha * */ static ConnStatusType -connectDB(PGconn * conn) +connectDB(PGconn *conn) { struct hostent *hp; @@ -646,7 +646,7 @@ connect_errReturn: * */ static void -freePGconn(PGconn * conn) +freePGconn(PGconn *conn) { if (!conn) return; @@ -674,7 +674,7 @@ freePGconn(PGconn * conn) - properly close a connection to the backend */ static void -closePGconn(PGconn * conn) +closePGconn(PGconn *conn) { /* GH: What to do for !USE_POSIX_SIGNALS ? */ #if defined(USE_POSIX_SIGNALS) @@ -721,7 +721,7 @@ closePGconn(PGconn * conn) after this */ void -PQfinish(PGconn * conn) +PQfinish(PGconn *conn) { if (!conn) { @@ -740,7 +740,7 @@ PQfinish(PGconn * conn) closes the existing connection and makes a new one */ void -PQreset(PGconn * conn) +PQreset(PGconn *conn) { if (!conn) { @@ -768,8 +768,8 @@ PQreset(PGconn * conn) * */ int -packetSend(Port * port, - PacketBuf * buf, +packetSend(Port *port, + PacketBuf *buf, PacketLen len, bool nonBlocking) { @@ -798,7 +798,7 @@ packetSend(Port * port, * converts a StartupInfo structure to a PacketBuf */ static void -startup2PacketBuf(StartupInfo * s, PacketBuf * res) +startup2PacketBuf(StartupInfo *s, PacketBuf *res) { char *tmp; @@ -1088,7 +1088,7 @@ conninfo_free() /* =========== accessor functions for PGconn ========= */ char * -PQdb(PGconn * conn) +PQdb(PGconn *conn) { if (!conn) { @@ -1099,7 +1099,7 @@ PQdb(PGconn * conn) } char * -PQuser(PGconn * conn) +PQuser(PGconn *conn) { if (!conn) { @@ -1110,7 +1110,7 @@ PQuser(PGconn * conn) } char * -PQhost(PGconn * conn) +PQhost(PGconn *conn) { if (!conn) { @@ -1122,7 +1122,7 @@ PQhost(PGconn * conn) } char * -PQoptions(PGconn * conn) +PQoptions(PGconn *conn) { if (!conn) { @@ -1133,7 +1133,7 @@ PQoptions(PGconn * conn) } char * -PQtty(PGconn * conn) +PQtty(PGconn *conn) { if (!conn) { @@ -1144,7 +1144,7 @@ PQtty(PGconn * conn) } char * -PQport(PGconn * conn) +PQport(PGconn *conn) { if (!conn) { @@ -1155,7 +1155,7 @@ PQport(PGconn * conn) } ConnStatusType -PQstatus(PGconn * conn) +PQstatus(PGconn *conn) { if (!conn) { @@ -1166,7 +1166,7 @@ PQstatus(PGconn * conn) } char * -PQerrorMessage(PGconn * conn) +PQerrorMessage(PGconn *conn) { if (!conn) { @@ -1177,7 +1177,7 @@ PQerrorMessage(PGconn * conn) } void -PQtrace(PGconn * conn, FILE * debug_port) +PQtrace(PGconn *conn, FILE *debug_port) { if (conn == NULL || conn->status == CONNECTION_BAD) @@ -1189,7 +1189,7 @@ PQtrace(PGconn * conn, FILE * debug_port) } void -PQuntrace(PGconn * conn) +PQuntrace(PGconn *conn) { if (conn == NULL || conn->status == CONNECTION_BAD) diff --git a/src/interfaces/libpq/fe-connect.h b/src/interfaces/libpq/fe-connect.h index bf4c5cdf35d..bbacedf6dd6 100644 --- a/src/interfaces/libpq/fe-connect.h +++ b/src/interfaces/libpq/fe-connect.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: fe-connect.h,v 1.3 1997/09/08 02:40:27 momjian Exp $ + * $Id: fe-connect.h,v 1.4 1997/09/08 21:55:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,12 +18,12 @@ *---------------------------------------------------------------- */ -extern int packetSend(Port * port, PacketBuf * buf, PacketLen len, bool nonBlocking); +extern int packetSend(Port *port, PacketBuf *buf, PacketLen len, bool nonBlocking); #endif /* FE_CONNECT_H */ #ifndef FE_CONNECT_H #define FE_CONNECT_H -int packetSend(Port * port, PacketBuf * buf, PacketLen len, bool nonBlocking); +int packetSend(Port *port, PacketBuf *buf, PacketLen len, bool nonBlocking); #endif diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index 454555bfda3..332b9f6b777 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.37 1997/09/08 02:40:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.38 1997/09/08 21:55:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,15 +56,15 @@ const char *pgresStatus[] = { }; -static PGresult *makePGresult(PGconn * conn, char *pname); -static void addTuple(PGresult * res, PGresAttValue * tup); -static PGresAttValue *getTuple(PGconn * conn, PGresult * res, int binary); -static PGresult *makeEmptyPGresult(PGconn * conn, ExecStatusType status); -static void fill(int length, int max, char filler, FILE * fp); +static PGresult *makePGresult(PGconn *conn, char *pname); +static void addTuple(PGresult *res, PGresAttValue *tup); +static PGresAttValue *getTuple(PGconn *conn, PGresult *res, int binary); +static PGresult *makeEmptyPGresult(PGconn *conn, ExecStatusType status); +static void fill(int length, int max, char filler, FILE *fp); static char * -do_header(FILE * fout, PQprintOpt * po, const int nFields, +do_header(FILE *fout, PQprintOpt *po, const int nFields, int fieldMax[], char *fieldNames[], unsigned char fieldNotNum[], - const int fs_len, PGresult * res); + const int fs_len, PGresult *res); /* * PQclear - @@ -72,7 +72,7 @@ do_header(FILE * fout, PQprintOpt * po, const int nFields, * */ void -PQclear(PGresult * res) +PQclear(PGresult *res) { int i, j; @@ -114,7 +114,7 @@ PQclear(PGresult * res) */ static PGresult * -makeEmptyPGresult(PGconn * conn, ExecStatusType status) +makeEmptyPGresult(PGconn *conn, ExecStatusType status) { PGresult *result; @@ -140,7 +140,7 @@ makeEmptyPGresult(PGconn * conn, ExecStatusType status) */ static PGresAttValue * -getTuple(PGconn * conn, PGresult * result, int binary) +getTuple(PGconn *conn, PGresult *result, int binary) { char bitmap[MAX_FIELDS]; /* the backend sends us a bitmap * of */ @@ -225,7 +225,7 @@ getTuple(PGconn * conn, PGresult * result, int binary) * */ static void -addTuple(PGresult * res, PGresAttValue * tup) +addTuple(PGresult *res, PGresAttValue *tup) { if (res->ntups == res->tupArrSize) { @@ -262,7 +262,7 @@ addTuple(PGresult * res, PGresAttValue * tup) */ static PGresult * -makePGresult(PGconn * conn, char *pname) +makePGresult(PGconn *conn, char *pname) { PGresult *result; int id; @@ -406,9 +406,9 @@ makePGresult_badResponse_return: */ static void -process_response_from_backend(FILE * pfin, FILE * pfout, FILE * pfdebug, - PGconn * conn, - PGresult ** result_p, char *const reason) +process_response_from_backend(FILE *pfin, FILE *pfout, FILE *pfdebug, + PGconn *conn, + PGresult **result_p, char *const reason) { int id; @@ -630,7 +630,7 @@ process_response_from_backend(FILE * pfin, FILE * pfout, FILE * pfdebug, */ PGresult * -PQexec(PGconn * conn, const char *query) +PQexec(PGconn *conn, const char *query) { PGresult *result; char buffer[MAX_MESSAGE_LEN]; @@ -692,7 +692,7 @@ PQexec(PGconn * conn, const char *query) */ PGnotify * -PQnotifies(PGconn * conn) +PQnotifies(PGconn *conn) { Dlelem *e; @@ -727,7 +727,7 @@ PQnotifies(PGconn * conn) * 1 in other cases */ int -PQgetline(PGconn * conn, char *s, int maxlen) +PQgetline(PGconn *conn, char *s, int maxlen) { int c = '\0'; @@ -764,7 +764,7 @@ PQgetline(PGconn * conn, char *s, int maxlen) * */ void -PQputline(PGconn * conn, const char *s) +PQputline(PGconn *conn, const char *s) { if (conn && (conn->Pfout)) { @@ -783,7 +783,7 @@ PQputline(PGconn * conn, const char *s) * 1 on failure */ int -PQendcopy(PGconn * conn) +PQendcopy(PGconn *conn) { FILE *pfin, *pfdebug; @@ -819,7 +819,7 @@ PQendcopy(PGconn * conn) /* simply send out max-length number of filler characters to fp */ static void -fill(int length, int max, char filler, FILE * fp) +fill(int length, int max, char filler, FILE *fp) { int count; char filltmp[2]; @@ -838,8 +838,8 @@ fill(int length, int max, char filler, FILE * fp) * kept for backward compatibility */ void -PQdisplayTuples(PGresult * res, - FILE * fp, /* where to send the output */ +PQdisplayTuples(PGresult *res, + FILE *fp, /* where to send the output */ int fillAlign, /* pad the fields with spaces */ const char *fieldSep, /* field separator */ int printHeader,/* display headers? */ @@ -934,8 +934,8 @@ PQdisplayTuples(PGresult * res, * */ void -PQprintTuples(PGresult * res, - FILE * fout, /* output stream */ +PQprintTuples(PGresult *res, + FILE *fout, /* output stream */ int PrintAttNames,/* print attribute names or not */ int TerseOutput, /* delimiter bars or not? */ int colWidth /* width of column, if 0, use variable @@ -1014,12 +1014,12 @@ PQprintTuples(PGresult * res, static void -do_field(PQprintOpt * po, PGresult * res, +do_field(PQprintOpt *po, PGresult *res, const int i, const int j, char *buf, const int fs_len, char *fields[], const int nFields, char *fieldNames[], unsigned char fieldNotNum[], int fieldMax[], - const int fieldMaxLen, FILE * fout + const int fieldMaxLen, FILE *fout ) { @@ -1114,9 +1114,9 @@ do_field(PQprintOpt * po, PGresult * res, static char * -do_header(FILE * fout, PQprintOpt * po, const int nFields, int fieldMax[], +do_header(FILE *fout, PQprintOpt *po, const int nFields, int fieldMax[], char *fieldNames[], unsigned char fieldNotNum[], - const int fs_len, PGresult * res) + const int fs_len, PGresult *res) { int j; /* for loop index */ @@ -1202,7 +1202,7 @@ do_header(FILE * fout, PQprintOpt * po, const int nFields, int fieldMax[], static void -output_row(FILE * fout, PQprintOpt * po, const int nFields, char *fields[], +output_row(FILE *fout, PQprintOpt *po, const int nFields, char *fields[], unsigned char fieldNotNum[], int fieldMax[], char *border, const int row_index) { @@ -1257,9 +1257,9 @@ output_row(FILE * fout, PQprintOpt * po, const int nFields, char *fields[], */ void -PQprint(FILE * fout, - PGresult * res, - PQprintOpt * po +PQprint(FILE *fout, + PGresult *res, + PQprintOpt *po ) { int nFields; @@ -1502,12 +1502,12 @@ PQprint(FILE * fout, */ PGresult * -PQfn(PGconn * conn, +PQfn(PGconn *conn, int fnid, int *result_buf, int *actual_result_len, int result_is_int, - PQArgBlock * args, + PQArgBlock *args, int nargs) { FILE *pfin, @@ -1609,7 +1609,7 @@ PQfn(PGconn * conn, /* ====== accessor funcs for PGresult ======== */ ExecStatusType -PQresultStatus(PGresult * res) +PQresultStatus(PGresult *res) { if (!res) { @@ -1621,7 +1621,7 @@ PQresultStatus(PGresult * res) } int -PQntuples(PGresult * res) +PQntuples(PGresult *res) { if (!res) { @@ -1632,7 +1632,7 @@ PQntuples(PGresult * res) } int -PQnfields(PGresult * res) +PQnfields(PGresult *res) { if (!res) { @@ -1646,7 +1646,7 @@ PQnfields(PGresult * res) returns NULL if the field_num is invalid */ char * -PQfname(PGresult * res, int field_num) +PQfname(PGresult *res, int field_num) { if (!res) { @@ -1673,7 +1673,7 @@ PQfname(PGresult * res, int field_num) returns -1 on a bad field name */ int -PQfnumber(PGresult * res, const char *field_name) +PQfnumber(PGresult *res, const char *field_name) { int i; @@ -1698,7 +1698,7 @@ PQfnumber(PGresult * res, const char *field_name) } Oid -PQftype(PGresult * res, int field_num) +PQftype(PGresult *res, int field_num) { if (!res) { @@ -1721,7 +1721,7 @@ PQftype(PGresult * res, int field_num) } int2 -PQfsize(PGresult * res, int field_num) +PQfsize(PGresult *res, int field_num) { if (!res) { @@ -1744,7 +1744,7 @@ PQfsize(PGresult * res, int field_num) } char * -PQcmdStatus(PGresult * res) +PQcmdStatus(PGresult *res) { if (!res) { @@ -1761,7 +1761,7 @@ PQcmdStatus(PGresult * res) */ static char oidStatus[32] = {0}; const char * -PQoidStatus(PGresult * res) +PQoidStatus(PGresult *res) { if (!res) { @@ -1791,7 +1791,7 @@ PQoidStatus(PGresult * res) of inserted/affected tuples, if not, return "" */ const char * -PQcmdTuples(PGresult * res) +PQcmdTuples(PGresult *res) { if (!res) { @@ -1841,7 +1841,7 @@ PQcmdTuples(PGresult * res) if res is not binary, a null-terminated ASCII string is returned. */ char * -PQgetvalue(PGresult * res, int tup_num, int field_num) +PQgetvalue(PGresult *res, int tup_num, int field_num) { if (!res) { @@ -1876,7 +1876,7 @@ PQgetvalue(PGresult * res, int tup_num, int field_num) NOT include the size field of the varlena. */ int -PQgetlength(PGresult * res, int tup_num, int field_num) +PQgetlength(PGresult *res, int tup_num, int field_num) { if (!res) { @@ -1903,7 +1903,7 @@ PQgetlength(PGresult * res, int tup_num, int field_num) returns the null status of a field value. */ int -PQgetisnull(PGresult * res, int tup_num, int field_num) +PQgetisnull(PGresult *res, int tup_num, int field_num) { if (!res) { diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 6e97e6465d9..3af5dc09715 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.9 1997/09/08 02:40:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.10 1997/09/08 21:55:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,7 +23,7 @@ #define LO_BUFSIZE 1024 -static int lo_initialize(PGconn * conn); +static int lo_initialize(PGconn *conn); /* * lo_open @@ -33,7 +33,7 @@ static int lo_initialize(PGconn * conn); * return -1 upon failure. */ int -lo_open(PGconn * conn, Oid lobjId, int mode) +lo_open(PGconn *conn, Oid lobjId, int mode) { int fd; int result_len; @@ -79,7 +79,7 @@ lo_open(PGconn * conn, Oid lobjId, int mode) * returns -1 upon failure. */ int -lo_close(PGconn * conn, int fd) +lo_close(PGconn *conn, int fd) { PQArgBlock argv[1]; PGresult *res; @@ -117,7 +117,7 @@ lo_close(PGconn * conn, int fd) */ int -lo_read(PGconn * conn, int fd, char *buf, int len) +lo_read(PGconn *conn, int fd, char *buf, int len) { PQArgBlock argv[2]; PGresult *res; @@ -156,7 +156,7 @@ lo_read(PGconn * conn, int fd, char *buf, int len) * */ int -lo_write(PGconn * conn, int fd, char *buf, int len) +lo_write(PGconn *conn, int fd, char *buf, int len) { PQArgBlock argv[2]; PGresult *res; @@ -201,7 +201,7 @@ lo_write(PGconn * conn, int fd, char *buf, int len) */ int -lo_lseek(PGconn * conn, int fd, int offset, int whence) +lo_lseek(PGconn *conn, int fd, int offset, int whence) { PQArgBlock argv[3]; PGresult *res; @@ -249,7 +249,7 @@ lo_lseek(PGconn * conn, int fd, int offset, int whence) */ Oid -lo_creat(PGconn * conn, int mode) +lo_creat(PGconn *conn, int mode) { PQArgBlock argv[1]; PGresult *res; @@ -286,7 +286,7 @@ lo_creat(PGconn * conn, int mode) */ int -lo_tell(PGconn * conn, int fd) +lo_tell(PGconn *conn, int fd) { int retval; PQArgBlock argv[1]; @@ -323,7 +323,7 @@ lo_tell(PGconn * conn, int fd) */ int -lo_unlink(PGconn * conn, Oid lobjId) +lo_unlink(PGconn *conn, Oid lobjId) { PQArgBlock argv[1]; PGresult *res; @@ -362,7 +362,7 @@ lo_unlink(PGconn * conn, Oid lobjId) */ Oid -lo_import(PGconn * conn, char *filename) +lo_import(PGconn *conn, char *filename) { int fd; int nbytes, @@ -427,7 +427,7 @@ lo_import(PGconn * conn, char *filename) * returns -1 upon failure, 1 otherwise */ int -lo_export(PGconn * conn, Oid lobjId, char *filename) +lo_export(PGconn *conn, Oid lobjId, char *filename) { int fd; int nbytes, @@ -488,7 +488,7 @@ lo_export(PGconn * conn, Oid lobjId, char *filename) * ---------------- */ static int -lo_initialize(PGconn * conn) +lo_initialize(PGconn *conn) { PGresult *res; PGlobjfuncs *lobjfuncs; diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index 23d1e42955f..9f5fd907b54 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.7 1997/09/08 02:40:35 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.8 1997/09/08 21:55:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,7 @@ if debug is set, also echo the character fetched */ int -pqGetc(FILE * fin, FILE * debug) +pqGetc(FILE *fin, FILE *debug) { int c; @@ -49,7 +49,7 @@ pqGetc(FILE * fin, FILE * debug) returns 1 if there was an error, 0 otherwise. */ int -pqPutnchar(const char *s, int len, FILE * f, FILE * debug) +pqPutnchar(const char *s, int len, FILE *f, FILE *debug) { if (f == NULL) return 1; @@ -68,7 +68,7 @@ pqPutnchar(const char *s, int len, FILE * f, FILE * debug) get a string of exactly len length from stream f */ int -pqGetnchar(char *s, int len, FILE * f, FILE * debug) +pqGetnchar(char *s, int len, FILE *f, FILE *debug) { int cnt; @@ -90,7 +90,7 @@ pqGetnchar(char *s, int len, FILE * f, FILE * debug) get a string of up to length len from stream f */ int -pqGets(char *s, int len, FILE * f, FILE * debug) +pqGets(char *s, int len, FILE *f, FILE *debug) { int c; const char *str = s; @@ -116,7 +116,7 @@ pqGets(char *s, int len, FILE * f, FILE * debug) returns 0 if successful, 1 otherwise */ int -pqPutInt(const int integer, int bytes, FILE * f, FILE * debug) +pqPutInt(const int integer, int bytes, FILE *f, FILE *debug) { int retval = 0; @@ -146,7 +146,7 @@ pqPutInt(const int integer, int bytes, FILE * f, FILE * debug) returns 0 if successful */ int -pqGetInt(int *result, int bytes, FILE * f, FILE * debug) +pqGetInt(int *result, int bytes, FILE *f, FILE *debug) { int retval = 0; @@ -171,7 +171,7 @@ pqGetInt(int *result, int bytes, FILE * f, FILE * debug) /* --------------------------------------------------------------------- */ int -pqPuts(const char *s, FILE * f, FILE * debug) +pqPuts(const char *s, FILE *f, FILE *debug) { if (f == NULL) return 1; @@ -193,7 +193,7 @@ pqPuts(const char *s, FILE * f, FILE * debug) /* --------------------------------------------------------------------- */ void -pqFlush(FILE * f, FILE * debug) +pqFlush(FILE *f, FILE *debug) { if (f) fflush(f); diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index 397630ad5d9..6f2d93b8db4 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-fe.h,v 1.22 1997/09/08 02:40:36 momjian Exp $ + * $Id: libpq-fe.h,v 1.23 1997/09/08 21:55:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,7 @@ extern "C" { CONNECTION_OK, CONNECTION_BAD - } ConnStatusType; + } ConnStatusType; typedef enum { @@ -49,7 +49,7 @@ extern "C" PGRES_NONFATAL_ERROR, PGRES_FATAL_ERROR - } ExecStatusType; + } ExecStatusType; /* string descriptions of the ExecStatusTypes */ extern const char *pgresStatus[]; @@ -79,14 +79,14 @@ extern "C" int *ptr; /* can't use void (dec compiler barfs) */ int integer; } u; - } PQArgBlock; + } PQArgBlock; typedef struct pgresAttDesc { char *name; /* type name */ Oid adtid; /* type id */ short adtsize; /* type size */ - } PGresAttDesc; + } PGresAttDesc; /* use char* for Attribute values, ASCII tuples are guaranteed to be null-terminated @@ -100,14 +100,14 @@ extern "C" { int len; /* length in bytes of the value */ char *value; /* actual value */ - } PGresAttValue; + } PGresAttValue; typedef struct pgNotify { char relname[NAMEDATALEN]; /* name of relation * containing data */ int be_pid; /* process id of backend */ - } PGnotify; + } PGnotify; typedef struct pgLobjfuncs { @@ -120,7 +120,7 @@ extern "C" Oid fn_lo_tell; /* OID of backend function lo_tell */ Oid fn_lo_read; /* OID of backend function LOread */ Oid fn_lo_write;/* OID of backend function LOwrite */ - } PGlobjfuncs; + } PGlobjfuncs; /* PGconn encapsulates a connection to the backend */ typedef struct pg_conn @@ -147,7 +147,7 @@ extern "C" char *pgauth; PGlobjfuncs *lobjfuncs; /* Backend function OID's for large object * access */ - } PGconn; + } PGconn; #define CMDSTATUS_LEN 40 @@ -167,7 +167,7 @@ extern "C" int binary; /* binary tuple values if binary == 1, * otherwise ASCII */ PGconn *conn; - } PGresult; + } PGresult; typedef char pqbool; @@ -224,55 +224,55 @@ extern "C" extern PGconn *PQsetdb(const char *pghost, const char *pgport, const char *pgoptions, const char *pgtty, const char *dbName); /* close the current connection and free the PGconn data structure */ - extern void PQfinish(PGconn * conn); + extern void PQfinish(PGconn *conn); /* * close the current connection and restablish a new one with the same * parameters */ - extern void PQreset(PGconn * conn); - - extern char *PQdb(PGconn * conn); - extern char *PQuser(PGconn * conn); - extern char *PQhost(PGconn * conn); - extern char *PQoptions(PGconn * conn); - extern char *PQport(PGconn * conn); - extern char *PQtty(PGconn * conn); - extern ConnStatusType PQstatus(PGconn * conn); - extern char *PQerrorMessage(PGconn * conn); - extern void PQtrace(PGconn * conn, FILE * debug_port); - extern void PQuntrace(PGconn * conn); + extern void PQreset(PGconn *conn); + + extern char *PQdb(PGconn *conn); + extern char *PQuser(PGconn *conn); + extern char *PQhost(PGconn *conn); + extern char *PQoptions(PGconn *conn); + extern char *PQport(PGconn *conn); + extern char *PQtty(PGconn *conn); + extern ConnStatusType PQstatus(PGconn *conn); + extern char *PQerrorMessage(PGconn *conn); + extern void PQtrace(PGconn *conn, FILE *debug_port); + extern void PQuntrace(PGconn *conn); /* === in fe-exec.c === */ - extern PGresult *PQexec(PGconn * conn, const char *query); - extern int PQgetline(PGconn * conn, char *string, int length); - extern int PQendcopy(PGconn * conn); - extern void PQputline(PGconn * conn, const char *string); - extern ExecStatusType PQresultStatus(PGresult * res); - extern int PQntuples(PGresult * res); - extern int PQnfields(PGresult * res); - extern char *PQfname(PGresult * res, int field_num); - extern int PQfnumber(PGresult * res, const char *field_name); - extern Oid PQftype(PGresult * res, int field_num); - extern short PQfsize(PGresult * res, int field_num); - extern char *PQcmdStatus(PGresult * res); - extern const char *PQoidStatus(PGresult * res); - extern const char *PQcmdTuples(PGresult * res); - extern char *PQgetvalue(PGresult * res, int tup_num, int field_num); - extern int PQgetlength(PGresult * res, int tup_num, int field_num); - extern int PQgetisnull(PGresult * res, int tup_num, int field_num); - extern void PQclear(PGresult * res); + extern PGresult *PQexec(PGconn *conn, const char *query); + extern int PQgetline(PGconn *conn, char *string, int length); + extern int PQendcopy(PGconn *conn); + extern void PQputline(PGconn *conn, const char *string); + extern ExecStatusType PQresultStatus(PGresult *res); + extern int PQntuples(PGresult *res); + extern int PQnfields(PGresult *res); + extern char *PQfname(PGresult *res, int field_num); + extern int PQfnumber(PGresult *res, const char *field_name); + extern Oid PQftype(PGresult *res, int field_num); + extern short PQfsize(PGresult *res, int field_num); + extern char *PQcmdStatus(PGresult *res); + extern const char *PQoidStatus(PGresult *res); + extern const char *PQcmdTuples(PGresult *res); + extern char *PQgetvalue(PGresult *res, int tup_num, int field_num); + extern int PQgetlength(PGresult *res, int tup_num, int field_num); + extern int PQgetisnull(PGresult *res, int tup_num, int field_num); + extern void PQclear(PGresult *res); /* PQdisplayTuples() is a better version of PQprintTuples() */ - extern void PQdisplayTuples(PGresult * res, - FILE * fp, /* where to send the + extern void PQdisplayTuples(PGresult *res, + FILE *fp, /* where to send the * output */ int fillAlign, /* pad the fields with * spaces */ const char *fieldSep, /* field separator */ int printHeader, /* display headers? */ int quiet); - extern void PQprintTuples(PGresult * res, - FILE * fout, /* output stream */ + extern void PQprintTuples(PGresult *res, + FILE *fout, /* output stream */ int printAttName, /* print attribute names * or not */ int terseOutput, /* delimiter bars or @@ -280,17 +280,17 @@ extern "C" int width /* width of column, if * 0, use variable width */ ); - extern void PQprint(FILE * fout, /* output stream */ - PGresult * res, - PQprintOpt * ps /* option structure */ + extern void PQprint(FILE *fout, /* output stream */ + PGresult *res, + PQprintOpt *ps /* option structure */ ); - extern PGnotify *PQnotifies(PGconn * conn); - extern PGresult *PQfn(PGconn * conn, + extern PGnotify *PQnotifies(PGconn *conn); + extern PGresult *PQfn(PGconn *conn, int fnid, int *result_buf, int *result_len, int result_is_int, - PQArgBlock * args, + PQArgBlock *args, int nargs); /* === in fe-auth.c === */ extern MsgType fe_getauthsvc(char *PQerrormsg); @@ -302,30 +302,30 @@ extern "C" returns 0 if successful if debug is non-null, debugging output is sent to that stream */ - extern int pqGets(char *s, int maxlen, FILE * stream, FILE * debug); - extern int pqGetnchar(char *s, int maxlen, FILE * stream, FILE * debug); - extern int pqPutnchar(const char *s, int maxlen, FILE * stream, FILE * debug); - extern int pqPuts(const char *s, FILE * stream, FILE * debug); - extern int pqGetc(FILE * stream, FILE * debug); + extern int pqGets(char *s, int maxlen, FILE *stream, FILE *debug); + extern int pqGetnchar(char *s, int maxlen, FILE *stream, FILE *debug); + extern int pqPutnchar(const char *s, int maxlen, FILE *stream, FILE *debug); + extern int pqPuts(const char *s, FILE *stream, FILE *debug); + extern int pqGetc(FILE *stream, FILE *debug); /* get a n-byte integer from the stream into result */ /* returns 0 if successful */ - extern int pqGetInt(int *result, int bytes, FILE * stream, FILE * debug); + extern int pqGetInt(int *result, int bytes, FILE *stream, FILE *debug); /* put a n-byte integer into the stream */ /* returns 0 if successful */ - extern int pqPutInt(const int n, int bytes, FILE * stream, FILE * debug); - extern void pqFlush(FILE * stream, FILE * debug); + extern int pqPutInt(const int n, int bytes, FILE *stream, FILE *debug); + extern void pqFlush(FILE *stream, FILE *debug); /* === in fe-lobj.c === */ - int lo_open(PGconn * conn, Oid lobjId, int mode); - int lo_close(PGconn * conn, int fd); - int lo_read(PGconn * conn, int fd, char *buf, int len); - int lo_write(PGconn * conn, int fd, char *buf, int len); - int lo_lseek(PGconn * conn, int fd, int offset, int whence); - Oid lo_creat(PGconn * conn, int mode); - int lo_tell(PGconn * conn, int fd); - int lo_unlink(PGconn * conn, Oid lobjId); - Oid lo_import(PGconn * conn, char *filename); - int lo_export(PGconn * conn, Oid lobjId, char *filename); + int lo_open(PGconn *conn, Oid lobjId, int mode); + int lo_close(PGconn *conn, int fd); + int lo_read(PGconn *conn, int fd, char *buf, int len); + int lo_write(PGconn *conn, int fd, char *buf, int len); + int lo_lseek(PGconn *conn, int fd, int offset, int whence); + Oid lo_creat(PGconn *conn, int mode); + int lo_tell(PGconn *conn, int fd); + int lo_unlink(PGconn *conn, Oid lobjId); + Oid lo_import(PGconn *conn, char *filename); + int lo_export(PGconn *conn, Oid lobjId, char *filename); /* max length of message to send */ #define MAX_MESSAGE_LEN 8193 |