diff options
| author | Bruce Momjian <bruce@momjian.us> | 2001-10-28 06:26:15 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2001-10-28 06:26:15 +0000 |
| commit | 6783b2372ef13c141649840a836ff0a954ea1d4d (patch) | |
| tree | 81c727b2b08930bcf3ab7107c84ef59f1f68a78d /src/interfaces/libpq | |
| parent | c29797deeb5dfca61b8959344b682b4c32fe53a1 (diff) | |
| download | postgresql-6783b2372ef13c141649840a836ff0a954ea1d4d.tar.gz | |
Another pgindent run. Fixes enum indenting, and improves #endif
spacing. Also adds space for one-line comments.
Diffstat (limited to 'src/interfaces/libpq')
| -rw-r--r-- | src/interfaces/libpq/fe-auth.h | 3 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 4 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-misc.c | 3 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-print.c | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-fe.h | 7 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-int.h | 31 | ||||
| -rw-r--r-- | src/interfaces/libpq/pqexpbuffer.h | 3 | ||||
| -rw-r--r-- | src/interfaces/libpq/pqsignal.h | 3 |
8 files changed, 33 insertions, 27 deletions
diff --git a/src/interfaces/libpq/fe-auth.h b/src/interfaces/libpq/fe-auth.h index 4d99399cb9..979ac078b5 100644 --- a/src/interfaces/libpq/fe-auth.h +++ b/src/interfaces/libpq/fe-auth.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fe-auth.h,v 1.13 2001/10/25 05:50:13 momjian Exp $ + * $Id: fe-auth.h,v 1.14 2001/10/28 06:26:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,4 +41,5 @@ extern char *fe_getauthname(char *PQerrormsg); #define PG_KRB4_VERSION "PGVER4.1" /* at most KRB_SENDAUTH_VLEN chars */ #define PG_KRB5_VERSION "PGVER5.1" + #endif /* FE_AUTH_H */ diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 69bd5fa591..fa000f3959 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.178 2001/10/25 05:50:13 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.179 2001/10/28 06:26:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -147,7 +147,7 @@ static const struct EnvironmentOptions { const char *envName, *pgName; -} EnvironmentOptions[] = +} EnvironmentOptions[] = { /* common user-interface settings */ diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index 2a75ce43d7..2257cbd47b 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -25,7 +25,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.58 2001/10/25 05:50:13 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.59 2001/10/28 06:26:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -894,4 +894,5 @@ WSSE_GOODEXIT: return winsock_strerror_buf; } + #endif diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c index e753e5dd52..97760766f8 100644 --- a/src/interfaces/libpq/fe-print.c +++ b/src/interfaces/libpq/fe-print.c @@ -10,7 +10,7 @@ * didn't really belong there. * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.43 2001/10/25 05:50:13 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.44 2001/10/28 06:26:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -572,7 +572,7 @@ PQdisplayTuples(const 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 printHeader, /* display headers? */ int quiet ) { @@ -662,7 +662,7 @@ PQdisplayTuples(const PGresult *res, void PQprintTuples(const PGresult *res, FILE *fout, /* output stream */ - int PrintAttNames,/* print attribute names or not */ + int PrintAttNames, /* print attribute names or not */ int TerseOutput, /* delimiter bars or not? */ int colWidth /* width of column, if 0, use variable * width */ diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index de8fa5636e..cdfb575061 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-fe.h,v 1.76 2001/10/25 05:50:13 momjian Exp $ + * $Id: libpq-fe.h,v 1.77 2001/10/28 06:26:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -190,12 +190,14 @@ extern "C" /* Asynchronous (non-blocking) */ extern PGconn *PQconnectStart(const char *conninfo); extern PostgresPollingStatusType PQconnectPoll(PGconn *conn); + /* Synchronous (blocking) */ extern PGconn *PQconnectdb(const char *conninfo); extern PGconn *PQsetdbLogin(const char *pghost, const char *pgport, const char *pgoptions, const char *pgtty, const char *dbName, const char *login, const char *pwd); + #define PQsetdb(M_PGHOST,M_PGPORT,M_PGOPT,M_PGTTY,M_DBNAME) \ PQsetdbLogin(M_PGHOST, M_PGPORT, M_PGOPT, M_PGTTY, M_DBNAME, NULL, NULL) @@ -215,6 +217,7 @@ extern "C" /* Asynchronous (non-blocking) */ extern int PQresetStart(PGconn *conn); extern PostgresPollingStatusType PQresetPoll(PGconn *conn); + /* Synchronous (blocking) */ extern void PQreset(PGconn *conn); @@ -235,6 +238,7 @@ extern "C" extern int PQbackendPID(const PGconn *conn); extern int PQclientEncoding(const PGconn *conn); extern int PQsetClientEncoding(PGconn *conn, const char *encoding); + #ifdef USE_SSL /* Get the SSL structure associated with a connection */ extern SSL *PQgetssl(PGconn *conn); @@ -374,4 +378,5 @@ extern "C" #ifdef __cplusplus } #endif + #endif /* LIBPQ_FE_H */ diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index 26acd3ed83..f7f060a152 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-int.h,v 1.41 2001/10/25 05:50:13 momjian Exp $ + * $Id: libpq-int.h,v 1.42 2001/10/28 06:26:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -139,7 +139,7 @@ struct pg_result */ PQnoticeProcessor noticeHook; /* notice/error message processor */ void *noticeArg; - int client_encoding; /* encoding id */ + int client_encoding; /* encoding id */ char *errMsg; /* error message, or NULL if no error */ @@ -160,26 +160,22 @@ struct pg_result /* PGAsyncStatusType defines the state of the query-execution state machine */ typedef enum { - PGASYNC_IDLE, /* nothing's happening, dude */ - PGASYNC_BUSY, /* query in progress */ - PGASYNC_READY, /* result ready for PQgetResult */ - PGASYNC_COPY_IN,/* Copy In data transfer in progress */ - PGASYNC_COPY_OUT/* Copy Out data transfer in progress */ + PGASYNC_IDLE, /* nothing's happening, dude */ + PGASYNC_BUSY, /* query in progress */ + PGASYNC_READY, /* result ready for PQgetResult */ + PGASYNC_COPY_IN, /* Copy In data transfer in progress */ + PGASYNC_COPY_OUT /* Copy Out data transfer in progress */ } PGAsyncStatusType; /* PGSetenvStatusType defines the state of the PQSetenv state machine */ typedef enum { - SETENV_STATE_OPTION_SEND, /* About to send an - * Environment Option */ - SETENV_STATE_OPTION_WAIT, /* Waiting for above send - * to complete */ + SETENV_STATE_OPTION_SEND, /* About to send an Environment Option */ + SETENV_STATE_OPTION_WAIT, /* Waiting for above send to complete */ /* these next two are only used in MULTIBYTE mode */ - SETENV_STATE_ENCODINGS_SEND, /* About to send an - * "encodings" query */ - SETENV_STATE_ENCODINGS_WAIT, /* Waiting for query to - * complete */ - SETENV_STATE_IDLE + SETENV_STATE_ENCODINGS_SEND, /* About to send an "encodings" query */ + SETENV_STATE_ENCODINGS_WAIT, /* Waiting for query to complete */ + SETENV_STATE_IDLE } PGSetenvStatusType; /* large-object-access data ... allocated only if large-object code is used. */ @@ -282,7 +278,7 @@ struct pg_conn /* Buffer for receiving various parts of messages */ PQExpBufferData workBuffer; /* expansible string */ - int client_encoding; /* encoding id */ + int client_encoding; /* encoding id */ }; /* String descriptions of the ExecStatusTypes. @@ -356,4 +352,5 @@ __attribute__((format_arg(1))); #else #define libpq_gettext(x) (x) #endif + #endif /* LIBPQ_INT_H */ diff --git a/src/interfaces/libpq/pqexpbuffer.h b/src/interfaces/libpq/pqexpbuffer.h index 9e17b314f7..1435b502b7 100644 --- a/src/interfaces/libpq/pqexpbuffer.h +++ b/src/interfaces/libpq/pqexpbuffer.h @@ -18,7 +18,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqexpbuffer.h,v 1.8 2001/10/25 05:50:13 momjian Exp $ + * $Id: pqexpbuffer.h,v 1.9 2001/10/28 06:26:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -160,4 +160,5 @@ extern void appendPQExpBufferChar(PQExpBuffer str, char ch); */ extern void appendBinaryPQExpBuffer(PQExpBuffer str, const char *data, size_t datalen); + #endif /* PQEXPBUFFER_H */ diff --git a/src/interfaces/libpq/pqsignal.h b/src/interfaces/libpq/pqsignal.h index b6b167c188..d36165b4f7 100644 --- a/src/interfaces/libpq/pqsignal.h +++ b/src/interfaces/libpq/pqsignal.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqsignal.h,v 1.11 2001/10/25 05:50:13 momjian Exp $ + * $Id: pqsignal.h,v 1.12 2001/10/28 06:26:12 momjian Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -23,4 +23,5 @@ typedef void (*pqsigfunc) (int); extern pqsigfunc pqsignal(int signo, pqsigfunc func); + #endif /* PQSIGNAL_H */ |
