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 | |
| parent | c29797deeb5dfca61b8959344b682b4c32fe53a1 (diff) | |
| download | postgresql-6783b2372ef13c141649840a836ff0a954ea1d4d.tar.gz postgresql-6783b2372ef13c141649840a836ff0a954ea1d4d.zip | |
Another pgindent run. Fixes enum indenting, and improves #endif
spacing. Also adds space for one-line comments.
525 files changed, 2434 insertions, 2054 deletions
diff --git a/contrib/btree_gist/btree_gist.c b/contrib/btree_gist/btree_gist.c index 4235c0a5d9b..837b2ed7bdc 100644 --- a/contrib/btree_gist/btree_gist.c +++ b/contrib/btree_gist/btree_gist.c @@ -486,7 +486,7 @@ tskey_cmp(const void *a, const void *b) TimestampGetDatum(((TSKEY *) (((RIX *) a)->r))->lower), TimestampGetDatum(((TSKEY *) (((RIX *) b)->r))->lower) ) - ); + ); } /************************************************** diff --git a/contrib/dbase/dbf.h b/contrib/dbase/dbf.h index b54093bacee..ab64d46690e 100644 --- a/contrib/dbase/dbf.h +++ b/contrib/dbase/dbf.h @@ -59,7 +59,7 @@ typedef struct { u_char dbf_name[DBF_NAMELEN]; /* field-name terminated with \0 */ u_char dbf_type; /* field-type */ - u_char dbf_reserved[4]; /* some reserved stuff */ + u_char dbf_reserved[4]; /* some reserved stuff */ u_char dbf_flen; /* field-length */ u_char dbf_dec; /* number of decimal positions if type is * 'N' */ @@ -135,4 +135,5 @@ extern long get_long(u_char *cp); extern void put_long(u_char *cp, long lval); extern short get_short(u_char *cp); extern void put_short(u_char *cp, short lval); + #endif /* _DBF_H */ diff --git a/contrib/dblink/dblink.h b/contrib/dblink/dblink.h index f4de437e3df..4d2fd6e1ba3 100644 --- a/contrib/dblink/dblink.h +++ b/contrib/dblink/dblink.h @@ -66,4 +66,5 @@ extern Datum dblink_tok(PG_FUNCTION_ARGS); * Internal declarations */ dblink_results *init_dblink_results(MemoryContext fn_mcxt); + #endif /* DBLINK_H */ diff --git a/contrib/lo/lo.c b/contrib/lo/lo.c index 431756e9a77..b2c3af699a5 100644 --- a/contrib/lo/lo.c +++ b/contrib/lo/lo.c @@ -1,7 +1,7 @@ /* * PostgreSQL type definitions for managed LargeObjects. * - * $Header: /cvsroot/pgsql/contrib/lo/lo.c,v 1.9 2001/10/25 05:49:19 momjian Exp $ + * $Header: /cvsroot/pgsql/contrib/lo/lo.c,v 1.10 2001/10/28 06:25:40 momjian Exp $ * */ @@ -33,8 +33,8 @@ typedef Oid Blob; */ Blob *lo_in(char *str); /* Create from String */ -char *lo_out(Blob * addr); /* Output oid as String */ -Oid lo_oid(Blob * addr); /* Return oid as an oid */ +char *lo_out(Blob * addr); /* Output oid as String */ +Oid lo_oid(Blob * addr); /* Return oid as an oid */ Blob *lo(Oid oid); /* Return Blob based on oid */ Datum lo_manage(PG_FUNCTION_ARGS); /* Trigger handler */ @@ -139,7 +139,7 @@ lo_manage(PG_FUNCTION_ARGS) TupleDesc tupdesc; /* Tuple Descriptor */ HeapTuple rettuple; /* Tuple to be returned */ bool isdelete; /* are we deleting? */ - HeapTuple newtuple = NULL; /* The new value for tuple */ + HeapTuple newtuple = NULL; /* The new value for tuple */ HeapTuple trigtuple; /* The original value of tuple */ if (!CALLED_AS_TRIGGER(fcinfo)) diff --git a/contrib/miscutil/misc_utils.h b/contrib/miscutil/misc_utils.h index 0fb07012dfa..f4577f49de4 100644 --- a/contrib/miscutil/misc_utils.h +++ b/contrib/miscutil/misc_utils.h @@ -6,4 +6,5 @@ int unlisten(char *relname); int max(int x, int y); int min(int x, int y); int active_listeners(text *relname); + #endif diff --git a/contrib/pg_dumplo/pg_dumplo.h b/contrib/pg_dumplo/pg_dumplo.h index 1c76cfb624c..5bb298fb007 100644 --- a/contrib/pg_dumplo/pg_dumplo.h +++ b/contrib/pg_dumplo/pg_dumplo.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------------------- * pg_dumplo * - * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/pg_dumplo.h,v 1.5 2001/10/25 05:49:19 momjian Exp $ + * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/pg_dumplo.h,v 1.6 2001/10/28 06:25:40 momjian Exp $ * * Karel Zak 1999-2000 * ------------------------------------------------------------------------- @@ -64,11 +64,11 @@ typedef struct typedef enum { - ACTION_NONE, - ACTION_SHOW, - ACTION_EXPORT_ATTR, - ACTION_EXPORT_ALL, - ACTION_IMPORT + ACTION_NONE, + ACTION_SHOW, + ACTION_EXPORT_ATTR, + ACTION_EXPORT_ALL, + ACTION_IMPORT } PGLODUMP_ACTIONS; extern char *progname; @@ -78,4 +78,5 @@ extern void index_file(LODumpMaster * pgLO); extern void load_lolist(LODumpMaster * pgLO); extern void pglo_export(LODumpMaster * pgLO); extern void pglo_import(LODumpMaster * pgLO); + #endif /* PG_DUMPLO_H */ diff --git a/contrib/pg_resetxlog/pg_resetxlog.c b/contrib/pg_resetxlog/pg_resetxlog.c index b6981345e2f..653ba94371d 100644 --- a/contrib/pg_resetxlog/pg_resetxlog.c +++ b/contrib/pg_resetxlog/pg_resetxlog.c @@ -23,7 +23,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.8 2001/10/25 05:49:19 momjian Exp $ + * $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.9 2001/10/28 06:25:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -491,7 +491,7 @@ ReadRecordV0(XLogRecPtr *RecPtr, char *buffer) readFile = XLogFileOpen(readId, readSeg); if (readFile < 0) goto next_record_is_invalid; - readOff = (uint32) (-1); /* force read to occur below */ + readOff = (uint32) (-1); /* force read to occur below */ } targetPageOff = ((RecPtr->xrecoff % XLogSegSize) / BLCKSZ) * BLCKSZ; diff --git a/contrib/pgcrypto/blf.h b/contrib/pgcrypto/blf.h index 37d40218035..4677d055204 100644 --- a/contrib/pgcrypto/blf.h +++ b/contrib/pgcrypto/blf.h @@ -79,4 +79,5 @@ void blf_ecb_decrypt(blf_ctx *, uint8 *, uint32); void blf_cbc_encrypt(blf_ctx *, uint8 *, uint8 *, uint32); void blf_cbc_decrypt(blf_ctx *, uint8 *, uint8 *, uint32); + #endif diff --git a/contrib/pgcrypto/crypt-des.c b/contrib/pgcrypto/crypt-des.c index eacb192ad08..bc403b2ec30 100644 --- a/contrib/pgcrypto/crypt-des.c +++ b/contrib/pgcrypto/crypt-des.c @@ -159,14 +159,14 @@ static uint8 pbox[32] = { static uint32 _crypt_bits32[32] = { - 0x80000000, 0x40000000, 0x20000000, 0x10000000, - 0x08000000, 0x04000000, 0x02000000, 0x01000000, - 0x00800000, 0x00400000, 0x00200000, 0x00100000, - 0x00080000, 0x00040000, 0x00020000, 0x00010000, - 0x00008000, 0x00004000, 0x00002000, 0x00001000, - 0x00000800, 0x00000400, 0x00000200, 0x00000100, - 0x00000080, 0x00000040, 0x00000020, 0x00000010, - 0x00000008, 0x00000004, 0x00000002, 0x00000001 + 0x80000000, 0x40000000, 0x20000000, 0x10000000, + 0x08000000, 0x04000000, 0x02000000, 0x01000000, + 0x00800000, 0x00400000, 0x00200000, 0x00100000, + 0x00080000, 0x00040000, 0x00020000, 0x00010000, + 0x00008000, 0x00004000, 0x00002000, 0x00001000, + 0x00000800, 0x00000400, 0x00000200, 0x00000100, + 0x00000080, 0x00000040, 0x00000020, 0x00000010, + 0x00000008, 0x00000004, 0x00000002, 0x00000001 }; static uint8 _crypt_bits8[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c index 00ff81e5b7a..ba1d17efd98 100644 --- a/contrib/pgcrypto/internal.c +++ b/contrib/pgcrypto/internal.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: internal.c,v 1.6 2001/10/25 05:49:19 momjian Exp $ + * $Id: internal.c,v 1.7 2001/10/28 06:25:41 momjian Exp $ */ @@ -61,7 +61,7 @@ static struct int_digest { char *name; void (*init) (PX_MD * h); -} int_digest_list[] = +} int_digest_list[] = { { @@ -520,7 +520,7 @@ static struct { char *name; PX_Cipher *(*load) (void); -} int_ciphers[] = +} int_ciphers[] = { { diff --git a/contrib/pgcrypto/md5.h b/contrib/pgcrypto/md5.h index 868f8a233a0..dfabe24a1e3 100644 --- a/contrib/pgcrypto/md5.h +++ b/contrib/pgcrypto/md5.h @@ -1,4 +1,4 @@ -/* $Id: md5.h,v 1.5 2001/08/21 00:42:41 momjian Exp $ */ +/* $Id: md5.h,v 1.6 2001/10/28 06:25:41 momjian Exp $ */ /* $KAME: md5.h,v 1.3 2000/02/22 14:01:18 itojun Exp $ */ /* @@ -75,4 +75,5 @@ do { \ md5_pad((y)); \ md5_result((x), (y)); \ } while (0) + #endif /* ! _NETINET6_MD5_H_ */ diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c index f9769b7e208..66b341949ac 100644 --- a/contrib/pgcrypto/openssl.c +++ b/contrib/pgcrypto/openssl.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openssl.c,v 1.6 2001/10/25 05:49:19 momjian Exp $ + * $Id: openssl.c,v 1.7 2001/10/28 06:25:41 momjian Exp $ */ #include <postgres.h> @@ -331,28 +331,28 @@ struct "bf-cbc", { gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size, - bf_init, bf_cbc_encrypt, bf_cbc_decrypt, gen_evp_free + bf_init, bf_cbc_encrypt, bf_cbc_decrypt, gen_evp_free } }, { "bf-ecb", { gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size, - bf_init, bf_ecb_encrypt, bf_ecb_decrypt, gen_evp_free + bf_init, bf_ecb_encrypt, bf_ecb_decrypt, gen_evp_free } }, { "bf-cfb", { gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size, - bf_init, bf_cfb64_encrypt, bf_cfb64_decrypt, gen_evp_free + bf_init, bf_cfb64_encrypt, bf_cfb64_decrypt, gen_evp_free } }, { "bf-ofb", { gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size, - bf_init, bf_ofb64_encrypt, bf_ofb64_decrypt, gen_evp_free + bf_init, bf_ofb64_encrypt, bf_ofb64_decrypt, gen_evp_free } }, { diff --git a/contrib/pgcrypto/pgcrypto.h b/contrib/pgcrypto/pgcrypto.h index 26d04c5dc41..0d8c1174f2d 100644 --- a/contrib/pgcrypto/pgcrypto.h +++ b/contrib/pgcrypto/pgcrypto.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pgcrypto.h,v 1.6 2001/10/25 05:49:20 momjian Exp $ + * $Id: pgcrypto.h,v 1.7 2001/10/28 06:25:41 momjian Exp $ */ #ifndef _PG_CRYPTO_H @@ -45,4 +45,5 @@ Datum pg_decrypt(PG_FUNCTION_ARGS); Datum pg_encrypt_iv(PG_FUNCTION_ARGS); Datum pg_decrypt_iv(PG_FUNCTION_ARGS); Datum pg_cipher_exists(PG_FUNCTION_ARGS); + #endif diff --git a/contrib/pgcrypto/px-crypt.c b/contrib/pgcrypto/px-crypt.c index c0821408087..fc0c4e94ac4 100644 --- a/contrib/pgcrypto/px-crypt.c +++ b/contrib/pgcrypto/px-crypt.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: px-crypt.c,v 1.3 2001/10/25 05:49:20 momjian Exp $ + * $Id: px-crypt.c,v 1.4 2001/10/28 06:25:41 momjian Exp $ */ #include <postgres.h> @@ -75,7 +75,7 @@ static struct unsigned id_len; char *(*crypt) (const char *psw, const char *salt, char *buf, unsigned len); -} px_crypt_list[] = +} px_crypt_list[] = { { diff --git a/contrib/pgcrypto/px-crypt.h b/contrib/pgcrypto/px-crypt.h index 7265d414915..3d6f13ff1a5 100644 --- a/contrib/pgcrypto/px-crypt.h +++ b/contrib/pgcrypto/px-crypt.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: px-crypt.h,v 1.3 2001/10/25 05:49:20 momjian Exp $ + * $Id: px-crypt.h,v 1.4 2001/10/28 06:25:41 momjian Exp $ */ #ifndef _PX_CRYPT_H @@ -89,4 +89,5 @@ char *px_crypt_des(const char *key, const char *setting); char *px_crypt_md5(const char *pw, const char *salt, char *dst, unsigned dstlen); #endif /* !PX_SYSTEM_CRYPT */ + #endif /* _PX_CRYPT_H */ diff --git a/contrib/pgcrypto/random.c b/contrib/pgcrypto/random.c index 559e40c4561..4c3bb6db1b9 100644 --- a/contrib/pgcrypto/random.c +++ b/contrib/pgcrypto/random.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: random.c,v 1.3 2001/10/25 05:49:20 momjian Exp $ + * $Id: random.c,v 1.4 2001/10/28 06:25:41 momjian Exp $ */ @@ -124,4 +124,5 @@ px_get_random_bytes(uint8 *dst, unsigned count) return -1; } + #endif /* RAND_OPENSSL */ diff --git a/contrib/pgcrypto/rijndael.c b/contrib/pgcrypto/rijndael.c index cca8759e8b6..546f39a20f4 100644 --- a/contrib/pgcrypto/rijndael.c +++ b/contrib/pgcrypto/rijndael.c @@ -664,4 +664,5 @@ main() printf("\n};\n\n"); return 0; } + #endif diff --git a/contrib/pgcrypto/sha1.c b/contrib/pgcrypto/sha1.c index 26095697907..129ce7a55c0 100644 --- a/contrib/pgcrypto/sha1.c +++ b/contrib/pgcrypto/sha1.c @@ -1,4 +1,4 @@ -/* $Id: sha1.c,v 1.8 2001/10/25 05:49:20 momjian Exp $ */ +/* $Id: sha1.c,v 1.9 2001/10/28 06:25:41 momjian Exp $ */ /* $KAME: sha1.c,v 1.3 2000/02/22 14:01:18 itojun Exp $ */ /* @@ -345,4 +345,5 @@ sha1_result(struct sha1_ctxt * ctxt, uint8 *digest0) digest[19] = ctxt->h.b8[16]; #endif } + #endif /* unsupported */ diff --git a/contrib/pgcrypto/sha1.h b/contrib/pgcrypto/sha1.h index 03c6443ccc4..1699b385a42 100644 --- a/contrib/pgcrypto/sha1.h +++ b/contrib/pgcrypto/sha1.h @@ -1,4 +1,4 @@ -/* $Id: sha1.h,v 1.6 2001/10/25 05:49:20 momjian Exp $ */ +/* $Id: sha1.h,v 1.7 2001/10/28 06:25:41 momjian Exp $ */ /* $KAME: sha1.h,v 1.4 2000/02/22 14:01:18 itojun Exp $ */ /* @@ -71,4 +71,5 @@ typedef struct sha1_ctxt SHA1_CTX; #define SHA1Final(x, y) sha1_result((y), (x)) #define SHA1_RESULTLEN (160/8) + #endif /* _NETINET6_SHA1_H_ */ diff --git a/contrib/rserv/rserv.c b/contrib/rserv/rserv.c index be4a136a1b9..6faab692d7a 100644 --- a/contrib/rserv/rserv.c +++ b/contrib/rserv/rserv.c @@ -43,7 +43,7 @@ _rserv_log_() char **args; /* argument: argnum */ Relation rel; /* triggered relation */ HeapTuple tuple; /* tuple to return */ - HeapTuple newtuple = NULL; /* tuple to return */ + HeapTuple newtuple = NULL; /* tuple to return */ TupleDesc tupdesc; /* tuple description */ int keynum; char *key; diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c index 441c1e884d9..f1163739e6b 100644 --- a/contrib/spi/refint.c +++ b/contrib/spi/refint.c @@ -52,7 +52,7 @@ check_primary_key(PG_FUNCTION_ARGS) HeapTuple tuple = NULL; /* tuple to return */ TupleDesc tupdesc; /* tuple description */ EPlan *plan; /* prepared plan */ - Oid *argtypes = NULL; /* key types to prepare execution plan */ + Oid *argtypes = NULL; /* key types to prepare execution plan */ bool isnull; /* to know is some column NULL or not */ char ident[2 * NAMEDATALEN]; /* to identify myself */ int ret; @@ -235,10 +235,10 @@ check_foreign_key(PG_FUNCTION_ARGS) char *relname; /* referencing relation name */ Relation rel; /* triggered relation */ HeapTuple trigtuple = NULL; /* tuple to being changed */ - HeapTuple newtuple = NULL; /* tuple to return */ + HeapTuple newtuple = NULL; /* tuple to return */ TupleDesc tupdesc; /* tuple description */ EPlan *plan; /* prepared plan(s) */ - Oid *argtypes = NULL; /* key types to prepare execution plan */ + Oid *argtypes = NULL; /* key types to prepare execution plan */ bool isnull; /* to know is some column NULL or not */ bool isequal = true; /* are keys in both tuples equal (in * UPDATE) */ diff --git a/contrib/tsearch/crc32.h b/contrib/tsearch/crc32.h index b08065d8c87..97254a4a909 100644 --- a/contrib/tsearch/crc32.h +++ b/contrib/tsearch/crc32.h @@ -6,4 +6,5 @@ extern unsigned int crc32_sz(char *buf, int size); /* Returns crc32 of null-terminated string */ #define crc32(buf) crc32_sz((buf),strlen(buf)) + #endif diff --git a/contrib/tsearch/deflex.h b/contrib/tsearch/deflex.h index 7fbd84adf11..f9d68471679 100644 --- a/contrib/tsearch/deflex.h +++ b/contrib/tsearch/deflex.h @@ -25,4 +25,5 @@ #define FILEPATH 19 extern const char *descr[]; + #endif diff --git a/contrib/tsearch/gistidx.h b/contrib/tsearch/gistidx.h index f4576a1d240..cb4d2f5a70c 100644 --- a/contrib/tsearch/gistidx.h +++ b/contrib/tsearch/gistidx.h @@ -62,4 +62,5 @@ typedef struct #define GETSIGN(x) ( (BITVECP)( (char*)x+GTHDRSIZE ) ) #define GETARR(x) ( (int4*)( (char*)x+GTHDRSIZE ) ) #define ARRNELEM(x) ( ( ((GISTTYPE*)x)->len - GTHDRSIZE )/sizeof(int4) ) + #endif diff --git a/contrib/tsearch/morph.h b/contrib/tsearch/morph.h index 1c64227fae0..24bb0efc8c5 100644 --- a/contrib/tsearch/morph.h +++ b/contrib/tsearch/morph.h @@ -6,4 +6,5 @@ void initmorph(void); char *lemmatize(char *word, int *len, int type); bool is_stoptype(int type); + #endif diff --git a/contrib/tsearch/parser.h b/contrib/tsearch/parser.h index 0e43e675fb2..f3aa0b8c06b 100644 --- a/contrib/tsearch/parser.h +++ b/contrib/tsearch/parser.h @@ -7,4 +7,5 @@ int tsearch_yylex(void); void start_parse_str(char *, int); void start_parse_fh(FILE *, int); void end_parse(void); + #endif diff --git a/contrib/tsearch/query.c b/contrib/tsearch/query.c index 90687d38cf0..4bda2617afe 100644 --- a/contrib/tsearch/query.c +++ b/contrib/tsearch/query.c @@ -104,7 +104,7 @@ gettoken_query(QPRS_STATE * state, int4 *val, int4 *lenval, char **strval) { switch (state->state) { - case WAITOPERAND: + case WAITOPERAND: if (*(state->buf) == '!') { (state->buf)++; @@ -408,7 +408,7 @@ rexecqtxt(PG_FUNCTION_ARGS) execqtxt, PG_GETARG_DATUM(1), PG_GETARG_DATUM(0) - ); + ); } Datum diff --git a/contrib/tsearch/query.h b/contrib/tsearch/query.h index a5f8d7deb8a..4b3664b2ae5 100644 --- a/contrib/tsearch/query.h +++ b/contrib/tsearch/query.h @@ -48,4 +48,5 @@ typedef struct bool execute(ITEM * curitem, void *checkval, bool calcnot, bool (*chkcond) (void *checkval, ITEM * val)); + #endif diff --git a/contrib/tsearch/rewrite.h b/contrib/tsearch/rewrite.h index c53e1c6daca..6b3543faca7 100644 --- a/contrib/tsearch/rewrite.h +++ b/contrib/tsearch/rewrite.h @@ -3,4 +3,5 @@ ITEM *clean_NOT(ITEM * ptr, int4 *len); ITEM *clean_fakeval(ITEM * ptr, int4 *len); + #endif diff --git a/contrib/tsearch/txtidx.c b/contrib/tsearch/txtidx.c index 6e1fe0edaeb..735e90c96a1 100644 --- a/contrib/tsearch/txtidx.c +++ b/contrib/tsearch/txtidx.c @@ -327,7 +327,7 @@ typedef struct { uint16 len; char *word; -} WORD; +} WORD; typedef struct { @@ -402,7 +402,7 @@ compareWORD(const void *a, const void *b) } static int -uniqueWORD(WORD * a, int4 l) +uniqueWORD(WORD *a, int4 l) { WORD *ptr, *res; diff --git a/contrib/tsearch/txtidx.h b/contrib/tsearch/txtidx.h index d33bdf9d6d3..3344186bdda 100644 --- a/contrib/tsearch/txtidx.h +++ b/contrib/tsearch/txtidx.h @@ -44,4 +44,5 @@ typedef struct } TI_IN_STATE; int4 gettoken_txtidx(TI_IN_STATE * state); + #endif diff --git a/src/backend/access/gist/giststrat.c b/src/backend/access/gist/giststrat.c index db38191d6a0..008006a42a3 100644 --- a/src/backend/access/gist/giststrat.c +++ b/src/backend/access/gist/giststrat.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/gist/Attic/giststrat.c,v 1.18 2001/10/25 05:49:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/gist/Attic/giststrat.c,v 1.19 2001/10/28 06:25:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -121,4 +121,5 @@ RelationInvokeGISTStrategy(Relation r, return (RelationInvokeStrategy(r, &GISTEvaluationData, attnum, s, left, right)); } + #endif diff --git a/src/backend/access/hash/hashstrat.c b/src/backend/access/hash/hashstrat.c index a765c2e2b19..76fb5d8f2fc 100644 --- a/src/backend/access/hash/hashstrat.c +++ b/src/backend/access/hash/hashstrat.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.19 2001/10/25 05:49:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.20 2001/10/28 06:25:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -80,4 +80,5 @@ _hash_invokestrat(Relation rel, return (RelationInvokeStrategy(rel, &HTEvaluationData, attno, strat, left, right)); } + #endif diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c index b03690257c8..5c3a6dc81ce 100644 --- a/src/backend/access/index/genam.c +++ b/src/backend/access/index/genam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.29 2001/10/25 05:49:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.30 2001/10/28 06:25:41 momjian Exp $ * * NOTES * many of the old access method routines have been turned into @@ -240,4 +240,5 @@ IndexScanRestorePosition(IndexScanDesc scan) scan->flags = 0x0; /* XXX should have a symbolic name */ } + #endif diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c index 88d1757e4cd..4fa9add7bde 100644 --- a/src/backend/access/index/istrat.c +++ b/src/backend/access/index/istrat.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.54 2001/10/25 05:49:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.55 2001/10/28 06:25:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -640,4 +640,5 @@ IndexStrategyDisplay(IndexStrategy indexStrategy, } } } + #endif /* defined(ISTRATDEBUG) */ diff --git a/src/backend/access/nbtree/nbtstrat.c b/src/backend/access/nbtree/nbtstrat.c index 533af33681a..321749de125 100644 --- a/src/backend/access/nbtree/nbtstrat.c +++ b/src/backend/access/nbtree/nbtstrat.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.15 2001/10/25 05:49:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.16 2001/10/28 06:25:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -134,4 +134,5 @@ _bt_invokestrat(Relation rel, return (RelationInvokeStrategy(rel, &BTEvaluationData, attno, strat, left, right)); } + #endif diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c index 0e8305bdfba..9843e0cb935 100644 --- a/src/backend/access/rtree/rtree.c +++ b/src/backend/access/rtree/rtree.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.66 2001/10/25 05:49:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.67 2001/10/28 06:25:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -763,7 +763,7 @@ rtpicksplit(Relation r, right_avail_space; int total_num_tuples, num_tuples_without_seeds, - max_after_split; /* in Guttman's lingo, (M - m) */ + max_after_split; /* in Guttman's lingo, (M - m) */ float diff; /* diff between cost of putting tuple left * or right */ SPLITCOST *cost_vector; @@ -1063,7 +1063,7 @@ rtpicksplit(Relation r, else { elog(ERROR, "rtpicksplit: failed to find a workable page split"); - choose_left = false; /* keep compiler quiet */ + choose_left = false; /* keep compiler quiet */ } if (choose_left) diff --git a/src/backend/access/rtree/rtstrat.c b/src/backend/access/rtree/rtstrat.c index 41de4a4e3e6..cfc0439aead 100644 --- a/src/backend/access/rtree/rtstrat.c +++ b/src/backend/access/rtree/rtstrat.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.18 2001/10/25 05:49:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.19 2001/10/28 06:25:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -119,9 +119,9 @@ static StrategyNumber RTNegateCommute[RTNStrategies] = { /* if you only have "contained-by", how do you determine equality? */ static uint16 RTContainedByTermData[] = { 2, /* make two comparisons */ - RTContainedByStrategyNumber,/* use "a contained-by b" */ + RTContainedByStrategyNumber, /* use "a contained-by b" */ 0x0, /* without any magic */ - RTContainedByStrategyNumber,/* then use contained-by, */ + RTContainedByStrategyNumber, /* then use contained-by, */ SK_COMMUTE /* swapping a and b */ }; diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c index c0149f0cdb6..7f38b47d767 100644 --- a/src/backend/access/transam/clog.c +++ b/src/backend/access/transam/clog.c @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/access/transam/clog.c,v 1.6 2001/10/25 20:37:29 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/clog.c,v 1.7 2001/10/28 06:25:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -120,13 +120,11 @@ typedef enum { - CLOG_PAGE_EMPTY,/* CLOG buffer is not in use */ - CLOG_PAGE_READ_IN_PROGRESS, /* CLOG page is being read - * in */ - CLOG_PAGE_CLEAN,/* CLOG page is valid and not dirty */ - CLOG_PAGE_DIRTY,/* CLOG page is valid but needs write */ - CLOG_PAGE_WRITE_IN_PROGRESS /* CLOG page is being - * written out in */ + CLOG_PAGE_EMPTY, /* CLOG buffer is not in use */ + CLOG_PAGE_READ_IN_PROGRESS, /* CLOG page is being read in */ + CLOG_PAGE_CLEAN, /* CLOG page is valid and not dirty */ + CLOG_PAGE_DIRTY, /* CLOG page is valid but needs write */ + CLOG_PAGE_WRITE_IN_PROGRESS /* CLOG page is being written out in */ } ClogPageStatus; /* diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c index 5a56f47e064..cd58ed7ad84 100644 --- a/src/backend/access/transam/varsup.c +++ b/src/backend/access/transam/varsup.c @@ -6,7 +6,7 @@ * Copyright (c) 2000, PostgreSQL Global Development Group * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.47 2001/10/25 05:49:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.48 2001/10/28 06:25:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -124,9 +124,9 @@ GetNewObjectId(void) /* * Check for wraparound of the OID counter. We *must* not return 0 * (InvalidOid); and as long as we have to check that, it seems a good - * idea to skip over everything below BootstrapObjectIdData too. - * (This basically just reduces the odds of OID collision right after - * a wrap occurs.) Note we are relying on unsigned comparison here. + * idea to skip over everything below BootstrapObjectIdData too. (This + * basically just reduces the odds of OID collision right after a wrap + * occurs.) Note we are relying on unsigned comparison here. */ if (ShmemVariableCache->nextOid < ((Oid) BootstrapObjectIdData)) { diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index f4dc01adfdb..857dc8777e4 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.113 2001/10/25 05:49:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.114 2001/10/28 06:25:42 momjian Exp $ * * NOTES * Transaction aborts can now occur two ways: @@ -994,7 +994,7 @@ CommitTransaction(void) AtCommit_Memory(); AtEOXact_Files(); - SharedBufferChanged = false; /* safest place to do it */ + SharedBufferChanged = false; /* safest place to do it */ /* Count transaction commit in statistics collector */ pgstat_count_xact_commit(); @@ -1097,7 +1097,7 @@ AbortTransaction(void) AtEOXact_Files(); AtAbort_Locks(); - SharedBufferChanged = false; /* safest place to do it */ + SharedBufferChanged = false; /* safest place to do it */ /* Count transaction abort in statistics collector */ pgstat_count_xact_rollback(); diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 8c162ab3f65..c0bfe968d25 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.79 2001/10/25 05:49:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.80 2001/10/28 06:25:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -955,7 +955,7 @@ AdvanceXLInsertBuffer(void) /* And fill the new page's header */ NewPage->xlp_magic = XLOG_PAGE_MAGIC; - /* NewPage->xlp_info = 0; *//* done by memset */ + /* NewPage->xlp_info = 0; */ /* done by memset */ NewPage->xlp_sui = ThisStartUpID; NewPage->xlp_pageaddr.xlogid = NewPageEndPtr.xlogid; NewPage->xlp_pageaddr.xrecoff = NewPageEndPtr.xrecoff - BLCKSZ; @@ -1762,7 +1762,7 @@ ReadRecord(XLogRecPtr *RecPtr, int emode, char *buffer) readFile = XLogFileOpen(readId, readSeg, (emode == LOG)); if (readFile < 0) goto next_record_is_invalid; - readOff = (uint32) (-1); /* force read to occur below */ + readOff = (uint32) (-1); /* force read to occur below */ } targetPageOff = ((RecPtr->xrecoff % XLogSegSize) / BLCKSZ) * BLCKSZ; diff --git a/src/backend/commands/_deadcode/recipe.h b/src/backend/commands/_deadcode/recipe.h index 11dafaefa7e..b09b9bbfffc 100644 --- a/src/backend/commands/_deadcode/recipe.h +++ b/src/backend/commands/_deadcode/recipe.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: recipe.h,v 1.4 2001/10/25 05:49:27 momjian Exp $ + * $Id: recipe.h,v 1.5 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,4 +16,5 @@ #include "nodes/parsenodes.h" extern void beginRecipe(RecipeStmt *stmt); + #endif /* RECIPE_H */ diff --git a/src/backend/commands/_deadcode/version.c b/src/backend/commands/_deadcode/version.c index 3a5170e86ae..81e7a8f91f8 100644 --- a/src/backend/commands/_deadcode/version.c +++ b/src/backend/commands/_deadcode/version.c @@ -10,7 +10,7 @@ * doesn't work! - jolly 8/19/95 * * - * $Id: version.c,v 1.27 2001/10/25 05:49:27 momjian Exp $ + * $Id: version.c,v 1.28 2001/10/28 06:25:43 momjian Exp $ * * NOTES * At the point the version is defined, 2 physical relations are created @@ -342,4 +342,5 @@ VersionReplace(char *vname, char *bname, char *snapshot) /* printf("%s\n",rule_buf); */ } + #endif diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c index 4d1792a1d36..4100e775573 100644 --- a/src/backend/commands/command.c +++ b/src/backend/commands/command.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.146 2001/10/25 05:49:24 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.147 2001/10/28 06:25:42 momjian Exp $ * * NOTES * The PerformAddAttribute() code, like most of the relation @@ -2083,7 +2083,7 @@ LockTableCommand(LockStmt *lockstmt) LockRelation(rel, lockstmt->mode); - heap_close(rel, NoLock); /* close rel, keep lock */ + heap_close(rel, NoLock); /* close rel, keep lock */ } } diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c index 334094fd471..30a175c659e 100644 --- a/src/backend/commands/define.c +++ b/src/backend/commands/define.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.63 2001/10/25 05:49:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.64 2001/10/28 06:25:42 momjian Exp $ * * DESCRIPTION * The "DefineFoo" routines take the parse tree and pick out the @@ -356,7 +356,7 @@ DefineOperator(char *oprName, List *parameters) { uint16 precedence = 0; /* operator precedence */ - bool canHash = false; /* operator hashes */ + bool canHash = false; /* operator hashes */ bool isLeftAssociative = true; /* operator is left * associative */ char *functionName = NULL; /* function for operator */ @@ -367,7 +367,7 @@ DefineOperator(char *oprName, char *negatorName = NULL; /* optional negator operator name */ char *restrictionName = NULL; /* optional restrict. sel. * procedure */ - char *joinName = NULL; /* optional join sel. procedure name */ + char *joinName = NULL; /* optional join sel. procedure name */ char *sortName1 = NULL; /* optional first sort operator */ char *sortName2 = NULL; /* optional second sort operator */ List *pl; @@ -446,7 +446,7 @@ DefineOperator(char *oprName, OperatorCreate(oprName, /* operator name */ typeName1, /* first type name */ typeName2, /* second type name */ - functionName,/* function for operator */ + functionName, /* function for operator */ precedence, /* operator precedence */ isLeftAssociative, /* operator is left associative */ commutatorName, /* optional commutator operator @@ -544,7 +544,7 @@ DefineType(char *typeName, List *parameters) char delimiter = DEFAULT_TYPDELIM; char *shadow_type; List *pl; - char alignment = 'i'; /* default alignment */ + char alignment = 'i'; /* default alignment */ char storage = 'p'; /* default TOAST storage method */ /* @@ -676,7 +676,7 @@ DefineType(char *typeName, List *parameters) -1, /* internal size */ -1, /* external size */ 'b', /* type-type (base type) */ - DEFAULT_TYPDELIM,/* array element delimiter */ + DEFAULT_TYPDELIM, /* array element delimiter */ "array_in", /* input procedure */ "array_out", /* output procedure */ "array_in", /* receive procedure */ diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index 10954912e7b..c1f76152c5c 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.65 2001/10/25 05:49:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.66 2001/10/28 06:25:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -766,7 +766,7 @@ init_params(CreateSeqStmt *seq, Form_pg_sequence new) if (new->increment_by > 0) new->max_value = SEQ_MAXVALUE; /* ascending seq */ else - new->max_value = -1; /* descending seq */ + new->max_value = -1; /* descending seq */ } else new->max_value = get_param(max_value); diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index a3103e7209c..bca8063acdc 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.85 2001/10/25 05:49:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.86 2001/10/28 06:25:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -201,13 +201,13 @@ CreateUser(CreateUserStmt *stmt) int max_id; List *item, *option; - char *password = NULL; /* PostgreSQL user password */ + char *password = NULL; /* PostgreSQL user password */ bool encrypt_password = Password_encryption; /* encrypt password? */ char encrypted_password[MD5_PASSWD_LEN + 1]; int sysid = 0; /* PgSQL system id (valid if havesysid) */ bool createdb = false; /* Can the user create databases? */ bool createuser = false; /* Can this user create users? */ - List *groupElts = NIL; /* The groups the user is a member of */ + List *groupElts = NIL; /* The groups the user is a member of */ char *validUntil = NULL; /* The time the login is valid * until */ DefElem *dpassword = NULL; @@ -447,11 +447,11 @@ AlterUser(AlterUserStmt *stmt) new_tuple; bool null; List *option; - char *password = NULL; /* PostgreSQL user password */ + char *password = NULL; /* PostgreSQL user password */ bool encrypt_password = Password_encryption; /* encrypt password? */ char encrypted_password[MD5_PASSWD_LEN + 1]; int createdb = -1; /* Can the user create databases? */ - int createuser = -1; /* Can this user create users? */ + int createuser = -1; /* Can this user create users? */ char *validUntil = NULL; /* The time the login is valid * until */ DefElem *dpassword = NULL; @@ -954,7 +954,7 @@ CreateGroup(CreateGroupStmt *stmt) userarray = palloc(ARR_OVERHEAD(1) + length(newlist) * sizeof(int32)); userarray->size = ARR_OVERHEAD(1) + length(newlist) * sizeof(int32); userarray->flags = 0; - ARR_NDIM(userarray) = 1; /* one dimensional array */ + ARR_NDIM(userarray) = 1; /* one dimensional array */ ARR_LBOUND(userarray)[0] = 1; /* axis starts at one */ ARR_DIMS(userarray)[0] = length(newlist); /* axis is this long */ /* fill the array */ @@ -1150,7 +1150,7 @@ AlterGroup(AlterGroupStmt *stmt, const char *tag) } } /* endif alter group add user */ - else if (stmt->action == -1)/* drop users from group */ + else if (stmt->action == -1) /* drop users from group */ { Datum datum; bool null; diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index fa5770b0e8d..99e5fac7027 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.210 2001/10/25 05:49:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.211 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,7 +68,7 @@ typedef VacPageData *VacPage; typedef struct VacPageListData { - BlockNumber empty_end_pages; /* Number of "empty" end-pages */ + BlockNumber empty_end_pages; /* Number of "empty" end-pages */ int num_pages; /* Number of pages in pagedesc */ int num_allocated_pages; /* Number of allocated pages in * pagedesc */ diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c index 8431dcdb0f4..dd8ef4d18d0 100644 --- a/src/backend/commands/vacuumlazy.c +++ b/src/backend/commands/vacuumlazy.c @@ -31,7 +31,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/vacuumlazy.c,v 1.9 2001/10/25 05:49:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/vacuumlazy.c,v 1.10 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -79,8 +79,8 @@ typedef struct LVRelStats BlockNumber nonempty_pages; /* actually, last nonempty page + 1 */ /* List of TIDs of tuples we intend to delete */ /* NB: this list is ordered by TID address */ - int num_dead_tuples; /* current # of entries */ - int max_dead_tuples; /* # slots allocated in array */ + int num_dead_tuples; /* current # of entries */ + int max_dead_tuples; /* # slots allocated in array */ ItemPointer dead_tuples; /* array of ItemPointerData */ /* Array or heap of per-page info about free space */ /* We use a simple array until it fills up, then convert to heap */ @@ -88,7 +88,7 @@ typedef struct LVRelStats int num_free_pages; /* current # of entries */ int max_free_pages; /* # slots allocated in arrays */ BlockNumber *free_pages; /* array or heap of block numbers */ - Size *free_spaceavail; /* array or heap of available space */ + Size *free_spaceavail; /* array or heap of available space */ } LVRelStats; diff --git a/src/backend/executor/execFlatten.c b/src/backend/executor/execFlatten.c index 8d1eaea4023..ecbe7b5d189 100644 --- a/src/backend/executor/execFlatten.c +++ b/src/backend/executor/execFlatten.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.15 2001/10/25 05:49:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.16 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -239,4 +239,5 @@ FjoinBumpOuterNodes(TargetEntry *tlist, } return false; } + #endif diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c index 2c63acb8b62..6878907b9a5 100644 --- a/src/backend/executor/execTuples.c +++ b/src/backend/executor/execTuples.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.49 2001/10/25 05:49:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.50 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -406,7 +406,7 @@ ExecClearTuple(TupleTableSlot *slot) /* slot in which to store tuple */ slot->val = (HeapTuple) NULL; - slot->ttc_shouldFree = true; /* probably useless code... */ + slot->ttc_shouldFree = true; /* probably useless code... */ /* * Drop the pin on the referenced buffer, if there is one. diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index fbe8e7f5bf1..7f73cdd26a9 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.46 2001/10/25 05:49:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.47 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,7 @@ */ typedef enum { - F_EXEC_START, F_EXEC_RUN, F_EXEC_DONE + F_EXEC_START, F_EXEC_RUN, F_EXEC_DONE } ExecStatus; typedef struct local_es diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index 3c5ebc4c8bc..318ebc6f6c9 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.63 2001/10/25 05:49:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.64 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -222,7 +222,7 @@ IndexNext(IndexScan *node) qual = lnext(qual); } if (!prev_matches) - return slot; /* OK to return tuple */ + return slot; /* OK to return tuple */ /* Duplicate tuple, so drop it and loop back for another */ ExecClearTuple(slot); } @@ -701,10 +701,10 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent) Expr *clause; /* one clause of index qual */ Oper *op; /* operator used in clause */ Node *leftop; /* expr on lhs of operator */ - Node *rightop; /* expr on rhs ... */ + Node *rightop; /* expr on rhs ... */ bits16 flags = 0; - int scanvar; /* which var identifies varattno */ + int scanvar; /* which var identifies varattno */ AttrNumber varattno = 0; /* att number used in scan */ Oid opid; /* operator id used in scan */ Datum scanvalue = 0; /* value used in scan (if const) */ diff --git a/src/backend/executor/nodeLimit.c b/src/backend/executor/nodeLimit.c index 1ce376418d5..d94e89ea63d 100644 --- a/src/backend/executor/nodeLimit.c +++ b/src/backend/executor/nodeLimit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeLimit.c,v 1.8 2001/10/25 05:49:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeLimit.c,v 1.9 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -76,8 +76,8 @@ ExecLimit(Limit *node) * * Similarly, when scanning backwards, we must re-fetch the last * tuple in the offset region before we can return NULL. Otherwise - * we won't be correctly aligned to start going forward again. - * So, although you might think we can quit when position equals + * we won't be correctly aligned to start going forward again. So, + * although you might think we can quit when position equals * offset + 1, we have to fetch a subplan tuple first, and then * exit when position = offset. */ diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index 8ac71b0cc96..b0c1eb90a7f 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.46 2001/10/25 05:49:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.47 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -429,7 +429,7 @@ ExecMergeJoin(MergeJoin *node) default: elog(ERROR, "ExecMergeJoin: unsupported join type %d", (int) node->join.jointype); - doFillOuter = false; /* keep compiler quiet */ + doFillOuter = false; /* keep compiler quiet */ doFillInner = false; break; } diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c index 1767379d675..d7ebec4985f 100644 --- a/src/backend/executor/nodeSeqscan.c +++ b/src/backend/executor/nodeSeqscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.32 2001/10/25 05:49:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.33 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -105,7 +105,7 @@ SeqNext(SeqScan *node) * tuple table slot is cleared. */ - slot = ExecStoreTuple(tuple,/* tuple to store */ + slot = ExecStoreTuple(tuple, /* tuple to store */ slot, /* slot to store in */ scandesc->rs_cbuf, /* buffer associated with * this tuple */ diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c index 380632a78b2..fb2e3d53d37 100644 --- a/src/backend/executor/nodeTidscan.c +++ b/src/backend/executor/nodeTidscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.20 2001/10/25 05:49:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.21 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -162,7 +162,7 @@ TidNext(TidScan *node) * with palloc() and so should not be pfree()'d. */ ExecStoreTuple(tuple, /* tuple to store */ - slot,/* slot to store in */ + slot, /* slot to store in */ buffer, /* buffer associated with tuple */ false); /* don't pfree */ diff --git a/src/backend/lib/lispsort.c b/src/backend/lib/lispsort.c index f06448b5785..b08ed5cf618 100644 --- a/src/backend/lib/lispsort.c +++ b/src/backend/lib/lispsort.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.15 2001/10/25 05:49:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.16 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -55,4 +55,5 @@ lisp_qsort(List *the_list, /* the list to be sorted */ return output; } + #endif diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 44fb1f390cf..1fd625b1ad4 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.70 2001/10/25 05:49:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.71 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -672,7 +672,7 @@ pam_passwd_conv_proc(int num_msg, const struct pam_message ** msg, struct pam_re sendAuthRequest(pam_port_cludge, AUTH_REQ_PASSWORD); if (pq_eof() == EOF || pq_getint(&len, 4) == EOF) { - return PAM_CONV_ERR; /* client didn't want to send password */ + return PAM_CONV_ERR; /* client didn't want to send password */ } initStringInfo(&buf); diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 6aafdc09139..3c66f1f280f 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.75 2001/10/25 05:49:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.76 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1261,4 +1261,5 @@ GetCharSetByHost(char *TableName, int host, const char *DataDir) pfree((struct CharsetItem *) ChArray[i]); } } + #endif /* CYR_RECODE */ diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c index 94b18d3752f..5d43a8e15e5 100644 --- a/src/backend/nodes/nodeFuncs.c +++ b/src/backend/nodes/nodeFuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.15 2001/10/25 05:49:31 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.16 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -114,4 +114,5 @@ non_null(Expr *c) else return false; } + #endif diff --git a/src/backend/optimizer/path/_deadcode/predmig.c b/src/backend/optimizer/path/_deadcode/predmig.c index 604de4b2735..00c353633d7 100644 --- a/src/backend/optimizer/path/_deadcode/predmig.c +++ b/src/backend/optimizer/path/_deadcode/predmig.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.11 2001/10/25 05:49:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.12 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -109,7 +109,7 @@ xfunc_do_predmig(Path root) ** Destructively modifies the join tree (via predicate pullup). */ static void -xfunc_predmig(JoinPath pathnode,/* root of the join tree */ +xfunc_predmig(JoinPath pathnode, /* root of the join tree */ Stream streamroot, Stream laststream,/* for recursive calls -- these are the * root of the stream under construction, @@ -469,7 +469,7 @@ xfunc_form_groups(Query *queryInfo, Stream root, Stream bottom) get_groupup((Stream) get_downstream(temp))) && get_grouprank(parent) < get_grouprank(temp)) { - progress = true; /* we formed a new group */ + progress = true; /* we formed a new group */ set_groupup(temp, true); set_groupcost(temp, get_groupcost(temp) + @@ -484,7 +484,7 @@ xfunc_form_groups(Query *queryInfo, Stream root, Stream bottom) } -/* ------------------- UTILITY FUNCTIONS ------------------------- */ +/* ------------------- UTILITY FUNCTIONS ------------------------- */ /* ** xfunc_free_stream diff --git a/src/backend/optimizer/path/_deadcode/xfunc.c b/src/backend/optimizer/path/_deadcode/xfunc.c index 07866a9e4d0..94a1d6b8f2d 100644 --- a/src/backend/optimizer/path/_deadcode/xfunc.c +++ b/src/backend/optimizer/path/_deadcode/xfunc.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.17 2001/10/25 05:49:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.18 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -265,7 +265,7 @@ RestrictInfo xfunc_pullup(Query *queryInfo, Path childpath, JoinPath parentpath, - RestrictInfo cinfo,/* clause to pull up */ + RestrictInfo cinfo, /* clause to pull up */ int whichchild, /* whether child is INNER or OUTER of join */ int clausetype) /* whether clause to pull is join or local */ { diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index 15f29847d31..dcea8907ed4 100644 --- a/src/backend/optimizer/path/allpaths.c +++ b/src/backend/optimizer/path/allpaths.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.80 2001/10/25 05:49:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.81 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -668,4 +668,5 @@ debug_print_rel(Query *root, RelOptInfo *rel) printf("\n"); fflush(stdout); } + #endif /* OPTIMIZER_DEBUG */ diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c index b713dc8ad8c..3f93c982672 100644 --- a/src/backend/optimizer/path/orindxpath.c +++ b/src/backend/optimizer/path/orindxpath.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.45 2001/10/25 05:49:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.46 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -175,7 +175,7 @@ best_or_subclause_indices(Query *root, pathnode->indexinfo = lappend(pathnode->indexinfo, best_indexinfo); pathnode->indexqual = lappend(pathnode->indexqual, best_indexqual); - if (slist == subclauses)/* first scan? */ + if (slist == subclauses) /* first scan? */ pathnode->path.startup_cost = best_startup_cost; pathnode->path.total_cost += best_total_cost; diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c index c7e13f2850f..6d688586684 100644 --- a/src/backend/optimizer/path/pathkeys.c +++ b/src/backend/optimizer/path/pathkeys.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.34 2001/10/25 05:49:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.35 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -317,7 +317,7 @@ compare_pathkeys(List *keys1, List *keys2) if (key1 == NIL && key2 == NIL) return PATHKEYS_EQUAL; if (key1 != NIL) - return PATHKEYS_BETTER1; /* key1 is longer */ + return PATHKEYS_BETTER1; /* key1 is longer */ return PATHKEYS_BETTER2; /* key2 is longer */ } @@ -367,7 +367,7 @@ compare_noncanonical_pathkeys(List *keys1, List *keys2) if (key1 == NIL && key2 == NIL) return PATHKEYS_EQUAL; if (key1 != NIL) - return PATHKEYS_BETTER1; /* key1 is longer */ + return PATHKEYS_BETTER1; /* key1 is longer */ return PATHKEYS_BETTER2; /* key2 is longer */ } diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index 30ddd8437cb..88c5499b302 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.110 2001/10/25 05:49:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.111 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1085,7 +1085,7 @@ fix_indxqual_operand(Node *node, int baserelid, IndexOptInfo *index, * the returned varattno must be 1. */ Assert(index->indproc != InvalidOid); - Assert(is_funcclause(node)); /* not a very thorough check, but easy */ + Assert(is_funcclause(node)); /* not a very thorough check, but easy */ /* classlist[0] is the only class of a functional index */ *opclass = index->classlist[0]; @@ -1895,4 +1895,5 @@ generate_fjoin(List *tlist) return newTlist; return tlist; /* do nothing for now - ay 10/94 */ } + #endif diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index d870b2786fb..d13035ca9ca 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.110 2001/10/25 05:49:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.111 2001/10/28 06:25:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -374,9 +374,9 @@ pull_up_subqueries(Query *parse, Node *jtnode) * target list entries for upper Var references wouldn't do the * right thing (the entries wouldn't go to NULL when they're * supposed to). Suppressing the pullup is an ugly, - * performance-losing hack, but I see no alternative for now. - * Find a better way to handle this when we redesign query trees - * --- tgl 4/30/01. + * performance-losing hack, but I see no alternative for now. Find + * a better way to handle this when we redesign query trees --- + * tgl 4/30/01. */ switch (j->jointype) { diff --git a/src/backend/optimizer/prep/prepkeyset.c b/src/backend/optimizer/prep/prepkeyset.c index 6ff40fdb082..180637d099e 100644 --- a/src/backend/optimizer/prep/prepkeyset.c +++ b/src/backend/optimizer/prep/prepkeyset.c @@ -216,4 +216,5 @@ inspectOpNode(Expr *expr) secondExpr = lsecond(expr->args); return (firstExpr && secondExpr && nodeTag(firstExpr) == T_Var && nodeTag(secondExpr) == T_Const); } + #endif /* ENABLE_KEY_SET_QUERY */ diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index 6949217decb..888edf578f0 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.67 2001/10/25 05:49:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.68 2001/10/28 06:25:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -711,7 +711,7 @@ adjust_inherited_attrs_mutator(Node *node, adjust_inherited_attrs_mutator((Node *) oldinfo->clause, context); newinfo->subclauseindices = NIL; - newinfo->eval_cost = -1; /* reset these too */ + newinfo->eval_cost = -1; /* reset these too */ newinfo->this_selec = -1; newinfo->left_pathkey = NIL; /* and these */ newinfo->right_pathkey = NIL; diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 9f95300e35b..5a4534644cb 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.204 2001/10/25 05:49:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.205 2001/10/28 06:25:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -859,7 +859,7 @@ transformColumnDefinition(ParseState *pstate, CreateStmtContext *cxt, constraint = makeNode(Constraint); constraint->contype = CONSTR_UNIQUE; - constraint->name = NULL; /* assign later */ + constraint->name = NULL; /* assign later */ column->constraints = lappend(column->constraints, constraint); constraint = makeNode(Constraint); diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c index d03c6b6403e..e2a79c47374 100644 --- a/src/backend/parser/parse_node.c +++ b/src/backend/parser/parse_node.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.56 2001/10/25 05:49:39 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.57 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -134,8 +134,8 @@ make_op(char *opname, Node *ltree, Node *rtree) right = make_operand(opname, rtree, rtypeId, opform->oprright); } - newop = makeOper(oprid(tup),/* opno */ - InvalidOid,/* opid */ + newop = makeOper(oprid(tup), /* opno */ + InvalidOid, /* opid */ opform->oprresult); /* operator result type */ result = makeNode(Expr); @@ -467,7 +467,7 @@ make_const(Value *value) case T_String: val = DirectFunctionCall1(textin, CStringGetDatum(strVal(value))); - typeid = UNKNOWNOID; /* will be coerced later */ + typeid = UNKNOWNOID; /* will be coerced later */ typelen = -1; /* variable len */ typebyval = false; break; diff --git a/src/backend/port/dynloader/aix.c b/src/backend/port/dynloader/aix.c index 46ef63a766d..a8fd72ff4cc 100644 --- a/src/backend/port/dynloader/aix.c +++ b/src/backend/port/dynloader/aix.c @@ -607,4 +607,5 @@ findMain(void) free(buf); return ret; } + #endif /* HAVE_DLOPEN */ diff --git a/src/backend/port/dynloader/aix.h b/src/backend/port/dynloader/aix.h index 203e56264a1..88f9592aad5 100644 --- a/src/backend/port/dynloader/aix.h +++ b/src/backend/port/dynloader/aix.h @@ -1,5 +1,5 @@ /* - * $Id: aix.h,v 1.7 2001/10/25 05:49:40 momjian Exp $ + * $Id: aix.h,v 1.8 2001/10/28 06:25:47 momjian Exp $ * * @(#)dlfcn.h 1.4 revision of 95/04/25 09:36:52 * This is an unpublished work copyright (c) 1992 HELIOS Software GmbH @@ -42,6 +42,7 @@ extern "C" void *dlsym(void *handle, const char *symbol); char *dlerror(void); int dlclose(void *handle); + #else void *dlopen(); void *dlsym(); @@ -60,4 +61,5 @@ extern "C" #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c index c16af323a1e..adfe9bb06dc 100644 --- a/src/backend/port/dynloader/bsdi.c +++ b/src/backend/port/dynloader/bsdi.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/dynloader/bsdi.c,v 1.16 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/dynloader/bsdi.c,v 1.17 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -94,4 +94,5 @@ pg_dlerror() { return dld_strerror(dld_errno); } + #endif /* not HAVE_DLOPEN */ diff --git a/src/backend/port/dynloader/bsdi.h b/src/backend/port/dynloader/bsdi.h index 7d38de82779..7d4c1ec7f9d 100644 --- a/src/backend/port/dynloader/bsdi.h +++ b/src/backend/port/dynloader/bsdi.h @@ -33,4 +33,5 @@ do { \ free(handle); \ } while (0) #endif /* not HAVE_DLOPEN */ + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/dgux.h b/src/backend/port/dynloader/dgux.h index 8246906702b..b7b5d576eee 100644 --- a/src/backend/port/dynloader/dgux.h +++ b/src/backend/port/dynloader/dgux.h @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dgux.h,v 1.11 2001/10/25 05:49:40 momjian Exp $ + * $Id: dgux.h,v 1.12 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,5 @@ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/freebsd.h b/src/backend/port/dynloader/freebsd.h index c7e36525ac3..022be0f39b9 100644 --- a/src/backend/port/dynloader/freebsd.h +++ b/src/backend/port/dynloader/freebsd.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: freebsd.h,v 1.11 2001/10/25 05:49:40 momjian Exp $ + * $Id: freebsd.h,v 1.12 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,4 +43,5 @@ char *BSD44_derived_dlerror(void); void *BSD44_derived_dlopen(const char *filename, int num); void *BSD44_derived_dlsym(void *handle, const char *name); void BSD44_derived_dlclose(void *handle); + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/irix5.h b/src/backend/port/dynloader/irix5.h index f5e53bfc1b4..a4a5d134b6c 100644 --- a/src/backend/port/dynloader/irix5.h +++ b/src/backend/port/dynloader/irix5.h @@ -30,4 +30,5 @@ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c index 796f22d3f21..565464c993a 100644 --- a/src/backend/port/dynloader/linux.c +++ b/src/backend/port/dynloader/linux.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.19 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.20 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -107,4 +107,5 @@ pg_dlerror() return dld_strerror(dld_errno); #endif } + #endif diff --git a/src/backend/port/dynloader/linux.h b/src/backend/port/dynloader/linux.h index 2077a6a6765..e0955deb5c2 100644 --- a/src/backend/port/dynloader/linux.h +++ b/src/backend/port/dynloader/linux.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: linux.h,v 1.14 2001/10/25 05:49:40 momjian Exp $ + * $Id: linux.h,v 1.15 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,4 +40,5 @@ do { \ #define pg_dlclose dlclose #define pg_dlerror dlerror #endif /* HAVE_DLOPEN */ + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/netbsd.h b/src/backend/port/dynloader/netbsd.h index 85cdfa3a85f..aa516053a53 100644 --- a/src/backend/port/dynloader/netbsd.h +++ b/src/backend/port/dynloader/netbsd.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: netbsd.h,v 1.6 2001/10/25 05:49:40 momjian Exp $ + * $Id: netbsd.h,v 1.7 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,4 +43,5 @@ char *BSD44_derived_dlerror(void); void *BSD44_derived_dlopen(const char *filename, int num); void *BSD44_derived_dlsym(void *handle, const char *name); void BSD44_derived_dlclose(void *handle); + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/nextstep.h b/src/backend/port/dynloader/nextstep.h index 510243a1ac9..d86c2c5cea1 100644 --- a/src/backend/port/dynloader/nextstep.h +++ b/src/backend/port/dynloader/nextstep.h @@ -22,4 +22,5 @@ char *next_dlerror(void); #define pg_dlerror next_dlerror /* port.c */ + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/openbsd.h b/src/backend/port/dynloader/openbsd.h index 899f2130115..c08c8b3b917 100644 --- a/src/backend/port/dynloader/openbsd.h +++ b/src/backend/port/dynloader/openbsd.h @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: openbsd.h,v 1.7 2001/10/25 05:49:40 momjian Exp $ + * $Id: openbsd.h,v 1.8 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,4 +41,5 @@ char *BSD44_derived_dlerror(void); void *BSD44_derived_dlopen(const char *filename, int num); void *BSD44_derived_dlsym(void *handle, const char *name); void BSD44_derived_dlclose(void *handle); + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/osf.h b/src/backend/port/dynloader/osf.h index e24ae4f85da..d411a895b15 100644 --- a/src/backend/port/dynloader/osf.h +++ b/src/backend/port/dynloader/osf.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: osf.h,v 1.4 2001/10/25 05:49:40 momjian Exp $ + * $Id: osf.h,v 1.5 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,4 +32,5 @@ #define pg_dlsym(h, f) ((PGFunction) dlsym(h, f)) #define pg_dlclose(h) dlclose(h) #define pg_dlerror() dlerror() + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/sco.h b/src/backend/port/dynloader/sco.h index 577706d27e0..c7db92d3e67 100644 --- a/src/backend/port/dynloader/sco.h +++ b/src/backend/port/dynloader/sco.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: sco.h,v 1.9 2001/10/25 05:49:40 momjian Exp $ + * $Id: sco.h,v 1.10 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,4 +32,5 @@ #define pg_dlerror dlerror /* port.c */ + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/solaris.h b/src/backend/port/dynloader/solaris.h index ca920923c4b..cc6b4dc776f 100644 --- a/src/backend/port/dynloader/solaris.h +++ b/src/backend/port/dynloader/solaris.h @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/backend/port/dynloader/solaris.h,v 1.5 2001/10/25 05:49:40 momjian Exp $ */ +/* $Header: /cvsroot/pgsql/src/backend/port/dynloader/solaris.h,v 1.6 2001/10/28 06:25:47 momjian Exp $ */ #ifndef DYNLOADER_SOLARIS_H #define DYNLOADER_SOLARIS_H @@ -10,4 +10,5 @@ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* DYNLOADER_SOLARIS_H */ diff --git a/src/backend/port/dynloader/sunos4.h b/src/backend/port/dynloader/sunos4.h index fee5f00a3be..f1e74afd47b 100644 --- a/src/backend/port/dynloader/sunos4.h +++ b/src/backend/port/dynloader/sunos4.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: sunos4.h,v 1.9 2001/10/25 05:49:40 momjian Exp $ + * $Id: sunos4.h,v 1.10 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,4 +30,5 @@ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/svr4.h b/src/backend/port/dynloader/svr4.h index af3d6d54f98..abce7465a53 100644 --- a/src/backend/port/dynloader/svr4.h +++ b/src/backend/port/dynloader/svr4.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: svr4.h,v 1.9 2001/10/25 05:49:40 momjian Exp $ + * $Id: svr4.h,v 1.10 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,4 +30,5 @@ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* DYNLOADER_H */ diff --git a/src/backend/port/dynloader/ultrix4.h b/src/backend/port/dynloader/ultrix4.h index 68504d0ac26..18edf7e0ba6 100644 --- a/src/backend/port/dynloader/ultrix4.h +++ b/src/backend/port/dynloader/ultrix4.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: ultrix4.h,v 1.8 2001/10/25 05:49:40 momjian Exp $ + * $Id: ultrix4.h,v 1.9 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -55,9 +55,9 @@ typedef struct ScnInfo typedef enum { - DL_NEEDRELOC, /* still need relocation */ - DL_RELOCATED, /* no relocation necessary */ - DL_INPROG /* relocation in progress */ + DL_NEEDRELOC, /* still need relocation */ + DL_RELOCATED, /* no relocation necessary */ + DL_INPROG /* relocation in progress */ } dlRStatus; typedef struct JmpTbl @@ -120,4 +120,5 @@ extern char *dl_error( /* void */ ); extern char **dl_undefinedSymbols( /* int *count */ ); extern void dl_printAllSymbols( /* void *handle */ ); extern void dl_setLibraries( /* char *libs */ ); + #endif /* _DL_HEADER_ */ diff --git a/src/backend/port/dynloader/univel.h b/src/backend/port/dynloader/univel.h index 694d87c3fae..83f0e2c82a5 100644 --- a/src/backend/port/dynloader/univel.h +++ b/src/backend/port/dynloader/univel.h @@ -30,4 +30,5 @@ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/unixware.h b/src/backend/port/dynloader/unixware.h index 0d0b80721dc..5c1b04cc694 100644 --- a/src/backend/port/dynloader/unixware.h +++ b/src/backend/port/dynloader/unixware.h @@ -30,4 +30,5 @@ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/win.h b/src/backend/port/dynloader/win.h index 0bc8cdb0624..d0d33189b79 100644 --- a/src/backend/port/dynloader/win.h +++ b/src/backend/port/dynloader/win.h @@ -30,4 +30,5 @@ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/isinf.c b/src/backend/port/isinf.c index f660b8a4437..96c42d20a95 100644 --- a/src/backend/port/isinf.c +++ b/src/backend/port/isinf.c @@ -1,4 +1,4 @@ -/* $Id: isinf.c,v 1.17 2001/10/25 05:49:40 momjian Exp $ */ +/* $Id: isinf.c,v 1.18 2001/10/28 06:25:47 momjian Exp $ */ #include "c.h" @@ -78,4 +78,5 @@ isinf(double x) return -1; return 0; } + #endif diff --git a/src/backend/port/nextstep/port.c b/src/backend/port/nextstep/port.c index 8f6deeb44fb..6ef1b126f4b 100644 --- a/src/backend/port/nextstep/port.c +++ b/src/backend/port/nextstep/port.c @@ -55,4 +55,5 @@ getcwd(char *buf, size_t size) { return getwd(buf); } + #endif diff --git a/src/backend/port/qnx4/ipc.h b/src/backend/port/qnx4/ipc.h index 291347de351..ebcfe7f19e9 100644 --- a/src/backend/port/qnx4/ipc.h +++ b/src/backend/port/qnx4/ipc.h @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/ipc.h,v 1.4 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/ipc.h,v 1.5 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,5 @@ /* Control Commands. */ #define IPC_RMID 0 /* remove identifier */ #define IPC_STAT 1 /* get shm status */ + #endif /* _SYS_IPC_H */ diff --git a/src/backend/port/qnx4/sem.c b/src/backend/port/qnx4/sem.c index ed70d45229a..58825d0f53c 100644 --- a/src/backend/port/qnx4/sem.c +++ b/src/backend/port/qnx4/sem.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.c,v 1.8 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.c,v 1.9 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -176,7 +176,7 @@ semget(key_t key, int nsems, int semflg) nsets = PROC_SEM_MAP_ENTRIES(MaxBackends); sem_info_size = sizeof(struct sem_info) + (nsets - 1) * sizeof(struct sem_set_info); ltrunc(fd, sem_info_size, SEEK_SET); - if (fstat(fd, &statbuf))/* would be strange : the only doc'ed */ + if (fstat(fd, &statbuf)) /* would be strange : the only doc'ed */ { /* error is EBADF */ close(fd); return -1; diff --git a/src/backend/port/qnx4/sem.h b/src/backend/port/qnx4/sem.h index 3ac7f6ff173..c5af05ec6be 100644 --- a/src/backend/port/qnx4/sem.h +++ b/src/backend/port/qnx4/sem.h @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.h,v 1.4 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.h,v 1.5 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,4 +64,5 @@ extern "C" #ifdef __cplusplus } #endif + #endif /* _SYS_SEM_H */ diff --git a/src/backend/port/qnx4/shm.h b/src/backend/port/qnx4/shm.h index 47d8a376588..85537e25e5a 100644 --- a/src/backend/port/qnx4/shm.h +++ b/src/backend/port/qnx4/shm.h @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/shm.h,v 1.4 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/shm.h,v 1.5 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,4 +39,5 @@ extern "C" #ifdef __cplusplus } #endif + #endif /* _SYS_SHM_H */ diff --git a/src/backend/port/sunos4/float.h b/src/backend/port/sunos4/float.h index 438deaf6ad1..2be9b70a772 100644 --- a/src/backend/port/sunos4/float.h +++ b/src/backend/port/sunos4/float.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: float.h,v 1.7 2001/10/25 05:49:40 momjian Exp $ + * $Id: float.h,v 1.8 2001/10/28 06:25:47 momjian Exp $ * * NOTES * These come straight out of ANSI X3.159-1989 (p.18) and @@ -27,4 +27,5 @@ #define DBL_DIG 15 #define DBL_MIN 2.2250738585072014e-308 #define DBL_MAX 1.7976931348623157e+308 + #endif /* FLOAT_H */ diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 1659f097522..1f232bfc301 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.252 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.253 2001/10/28 06:25:47 momjian Exp $ * * NOTES * @@ -1092,7 +1092,7 @@ ProcessStartupPacket(Port *port, bool SSLdone) { elog(DEBUG, "failed to send SSL negotiation response: %s", strerror(errno)); - return STATUS_ERROR; /* close the connection */ + return STATUS_ERROR; /* close the connection */ } #ifdef USE_SSL diff --git a/src/backend/regex/engine.c b/src/backend/regex/engine.c index 79b71415ed3..7e77054eecf 100644 --- a/src/backend/regex/engine.c +++ b/src/backend/regex/engine.c @@ -685,7 +685,7 @@ backref(struct match * m, pg_wchar *start, pg_wchar *stop, return dp; /* that one missed, try next one */ if (OP(m->g->strip[esub]) == O_CH) - return NULL; /* there is none */ + return NULL; /* there is none */ esub++; assert(OP(m->g->strip[esub]) == OOR2); ssub = esub + 1; diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c index 3b433b20f45..878b75af2c5 100644 --- a/src/backend/regex/regcomp.c +++ b/src/backend/regex/regcomp.c @@ -1017,7 +1017,7 @@ bothcases(struct parse * p, int ch) pg_wchar *oldend = p->end; pg_wchar bracket[3]; - assert(othercase(ch) != ch); /* p_bracket() would recurse */ + assert(othercase(ch) != ch); /* p_bracket() would recurse */ p->next = bracket; p->end = bracket + 2; bracket[0] = ch; @@ -1107,7 +1107,7 @@ repeat(struct parse * p, case REP(0, N): /* as x{1,n}? */ case REP(0, INF): /* as x{1,}? */ /* KLUDGE: emit y? as (y|) until subtle bug gets fixed */ - INSERT(OCH_, start); /* offset is wrong... */ + INSERT(OCH_, start); /* offset is wrong... */ repeat(p, start + 1, 1, to); ASTERN(OOR1, start); AHEAD(start); /* ... fix it */ @@ -1577,7 +1577,7 @@ findmust(struct parse * p, struct re_guts * g) switch (OP(s)) { case OCHAR: /* sequence member */ - if (newlen == 0)/* new sequence */ + if (newlen == 0) /* new sequence */ newstart = scan - 1; newlen++; break; diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c index 5ed1f9f9752..f7c0f3ac8f4 100644 --- a/src/backend/regex/regerror.c +++ b/src/backend/regex/regerror.c @@ -55,7 +55,7 @@ static struct rerr int code; char *name; char *explain; -} rerrs[] = +} rerrs[] = { { diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c index 63e0ced180f..1ca42ea8fa6 100644 --- a/src/backend/rewrite/rewriteManip.c +++ b/src/backend/rewrite/rewriteManip.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.59 2001/10/25 05:49:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.60 2001/10/28 06:25:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -995,4 +995,5 @@ HandleRIRAttributeRule(Query *parsetree, query_tree_mutator(parsetree, HandleRIRAttributeRule_mutator, (void *) &context, true); } + #endif /* NOT_USED */ diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c index eb4ce0330ca..ab6f4f7837e 100644 --- a/src/backend/storage/buffer/buf_table.c +++ b/src/backend/storage/buffer/buf_table.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.25 2001/10/25 05:49:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.26 2001/10/28 06:25:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -152,4 +152,5 @@ DBG_LookupListCheck(int nlookup) hash_stats("Shared", SharedBufHash); } + #endif diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c index 073d3ae4fc2..6e8e0f9b8bb 100644 --- a/src/backend/storage/buffer/freelist.c +++ b/src/backend/storage/buffer/freelist.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.26 2001/10/25 05:49:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.27 2001/10/28 06:25:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -309,4 +309,5 @@ PrintBufferFreeList() buf = &(BufferDescriptors[buf->freeNext]); } } + #endif diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c index bb8b8f39a7a..14379cd1ef5 100644 --- a/src/backend/storage/file/buffile.c +++ b/src/backend/storage/file/buffile.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/file/buffile.c,v 1.11 2001/10/25 05:49:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/file/buffile.c,v 1.12 2001/10/28 06:25:49 momjian Exp $ * * NOTES: * @@ -572,4 +572,5 @@ BufFileTellBlock(BufFile *file) blknum += file->curFile * RELSEG_SIZE; return blknum; } + #endif diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 3c6722863ec..8936685f941 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.85 2001/10/25 05:49:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.86 2001/10/28 06:25:49 momjian Exp $ * * NOTES: * @@ -118,11 +118,11 @@ typedef struct vfd unsigned short fdstate; /* bitflags for VFD's state */ /* these are the assigned bits in fdstate: */ -#define FD_DIRTY (1 << 0)/* written to, but not yet fsync'd */ -#define FD_TEMPORARY (1 << 1)/* should be unlinked when closed */ +#define FD_DIRTY (1 << 0) /* written to, but not yet fsync'd */ +#define FD_TEMPORARY (1 << 1) /* should be unlinked when closed */ File nextFree; /* link to next free VFD, if in freelist */ - File lruMoreRecently; /* doubly linked recency-of-use list */ + File lruMoreRecently; /* doubly linked recency-of-use list */ File lruLessRecently; long seekPos; /* current logical file position */ char *fileName; /* name of file, or NULL for unused VFD */ diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c index 1956b92d68d..8ae99061015 100644 --- a/src/backend/storage/freespace/freespace.c +++ b/src/backend/storage/freespace/freespace.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/freespace/freespace.c,v 1.8 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/freespace/freespace.c,v 1.9 2001/10/28 06:25:49 momjian Exp $ * * * NOTES: @@ -1116,4 +1116,5 @@ DumpFreeSpace(void) fprintf(stderr, "DumpFreeSpace: %d chunks in list, but numFreeChunks = %d\n", nChunks, FreeSpaceMap->numFreeChunks); } + #endif /* FREESPACE_DEBUG */ diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index d083d071bd6..558645e8b9b 100644 --- a/src/backend/storage/ipc/ipc.c +++ b/src/backend/storage/ipc/ipc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.72 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.73 2001/10/28 06:25:49 momjian Exp $ * * NOTES * @@ -94,9 +94,9 @@ static struct ONEXIT { void (*function) (); Datum arg; -} on_proc_exit_list[MAX_ON_EXITS], +} on_proc_exit_list[MAX_ON_EXITS], - on_shmem_exit_list[MAX_ON_EXITS]; +on_shmem_exit_list[MAX_ON_EXITS]; static int on_proc_exit_index, on_shmem_exit_index; @@ -745,7 +745,7 @@ PrivateMemoryCreate(uint32 size) fprintf(stderr, "PrivateMemoryCreate: malloc(%u) failed\n", size); proc_exit(1); } - MemSet(memAddress, 0, size); /* keep Purify quiet */ + MemSet(memAddress, 0, size); /* keep Purify quiet */ /* Register on-exit routine to release storage */ on_shmem_exit(PrivateMemoryDelete, PointerGetDatum(memAddress)); diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c index 4f677887420..4fbb6211608 100644 --- a/src/backend/storage/ipc/shmqueue.c +++ b/src/backend/storage/ipc/shmqueue.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.17 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.18 2001/10/28 06:25:50 momjian Exp $ * * NOTES * @@ -253,4 +253,5 @@ dumpQ(SHM_QUEUE *q, char *s) strcat(buf, elem); elog(SHMQUEUE_DEBUG_ELOG, "%s: %s", s, buf); } + #endif /* SHMQUEUE_DEBUG */ diff --git a/src/backend/storage/lmgr/deadlock.c b/src/backend/storage/lmgr/deadlock.c index e7a0c6e8556..70867b65642 100644 --- a/src/backend/storage/lmgr/deadlock.c +++ b/src/backend/storage/lmgr/deadlock.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.7 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.8 2001/10/28 06:25:50 momjian Exp $ * * Interface: * @@ -756,4 +756,5 @@ PrintLockQueue(LOCK *lock, const char *info) printf("\n"); fflush(stdout); } + #endif diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index a33b633d2d6..a7ddd92dda4 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.101 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.102 2001/10/28 06:25:50 momjian Exp $ * * NOTES * Outside modules can create a lock table and acquire/release @@ -54,15 +54,15 @@ static void LockCountMyLocks(SHMEM_OFFSET lockOffset, PROC *proc, static char *lock_mode_names[] = { - "INVALID", - "AccessShareLock", - "RowShareLock", - "RowExclusiveLock", - "ShareUpdateExclusiveLock", - "ShareLock", - "ShareRowExclusiveLock", - "ExclusiveLock", - "AccessExclusiveLock" + "INVALID", + "AccessShareLock", + "RowShareLock", + "RowExclusiveLock", + "ShareUpdateExclusiveLock", + "ShareLock", + "ShareRowExclusiveLock", + "ExclusiveLock", + "AccessExclusiveLock" }; @@ -1463,4 +1463,5 @@ DumpAllLocks(void) elog(DEBUG, "DumpAllLocks: holder->tag.lock = NULL"); } } + #endif /* LOCK_DEBUG */ diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 503312b53df..1b0058eaeff 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.113 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.114 2001/10/28 06:25:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -653,7 +653,7 @@ ProcSleep(LOCKMETHODTABLE *lockMethodTable, MyProc->waitHolder = holder; MyProc->waitLockMode = lockmode; - MyProc->errType = STATUS_OK; /* initialize result for success */ + MyProc->errType = STATUS_OK; /* initialize result for success */ /* * If we detected deadlock, give up without waiting. This must agree diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c index 84934b3b026..86c5bac6d97 100644 --- a/src/backend/storage/lmgr/s_lock.c +++ b/src/backend/storage/lmgr/s_lock.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/s_lock.c,v 1.3 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/s_lock.c,v 1.4 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -248,8 +248,6 @@ tas_dummy() /* really means: extern int tas(slock_t #if defined(NEED_I386_TAS_ASM) /* non gcc i386 based things */ #endif /* NEED_I386_TAS_ASM */ - - #endif /* not __GNUC__ */ @@ -292,4 +290,5 @@ main() exit(3); } + #endif /* S_LOCK_TEST */ diff --git a/src/backend/storage/lmgr/spin.c b/src/backend/storage/lmgr/spin.c index 59a7b4414c5..0c13062dcbc 100644 --- a/src/backend/storage/lmgr/spin.c +++ b/src/backend/storage/lmgr/spin.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/spin.c,v 1.5 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/spin.c,v 1.6 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -186,4 +186,5 @@ tas_sema(volatile slock_t *lock) /* Note that TAS macros return 0 if *success* */ return !IpcSemaphoreTryLock(lock->semId, lock->sem); } + #endif /* !HAS_TEST_AND_SET */ diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c index 3fc1958b538..ada46e68172 100644 --- a/src/backend/storage/page/bufpage.c +++ b/src/backend/storage/page/bufpage.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.39 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.40 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -389,7 +389,7 @@ PageGetFreeSpace(Page page) if (space < sizeof(ItemIdData)) return 0; - space -= sizeof(ItemIdData); /* XXX not always appropriate */ + space -= sizeof(ItemIdData); /* XXX not always appropriate */ return space; } diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index c8fd7829888..c9139ef18e7 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.88 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.89 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,7 +58,7 @@ typedef struct _MdfdVec int mdfd_nextFree; /* link to next freelist member, if free */ #ifndef LET_OS_MANAGE_FILESIZE - struct _MdfdVec *mdfd_chain; /* for large relations */ + struct _MdfdVec *mdfd_chain; /* for large relations */ #endif } MdfdVec; diff --git a/src/backend/storage/smgr/mm.c b/src/backend/storage/smgr/mm.c index 789083fba2b..fab130cd373 100644 --- a/src/backend/storage/smgr/mm.c +++ b/src/backend/storage/smgr/mm.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.28 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.29 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -561,4 +561,5 @@ MMShmemSize() return size; } + #endif /* STABLE_MEMORY_STORAGE */ diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c index 61b1b55821c..5ed8896938a 100644 --- a/src/backend/tcop/dest.c +++ b/src/backend/tcop/dest.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.45 2001/10/25 05:49:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.46 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -278,7 +278,7 @@ NullCommand(CommandDest dest) /* * tell the fe that we saw an empty query string */ - pq_putbytes("I", 2); /* note we send I and \0 */ + pq_putbytes("I", 2); /* note we send I and \0 */ break; case Debug: diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c index c710d2c3d43..39ec8fa5424 100644 --- a/src/backend/tcop/fastpath.c +++ b/src/backend/tcop/fastpath.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.50 2001/10/25 05:49:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.51 2001/10/28 06:25:51 momjian Exp $ * * NOTES * This cruft is the server side of PQfn. @@ -74,7 +74,7 @@ * ---------------- */ static void -SendFunctionResult(Datum retval,/* actual return value */ +SendFunctionResult(Datum retval, /* actual return value */ bool retbyval, int retlen) /* the length according to the catalogs */ { diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index e839e47f1c3..3fb46d73e28 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.239 2001/10/25 05:49:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.240 2001/10/28 06:25:51 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -324,7 +324,7 @@ ReadCommand(StringInfo inBuf) */ List * pg_parse_and_rewrite(char *query_string, /* string to execute */ - Oid *typev,/* parameter types */ + Oid *typev, /* parameter types */ int nargs) /* number of parameters */ { List *raw_parsetree_list; @@ -1502,7 +1502,7 @@ PostgresMain(int argc, char *argv[], const char *username) pqsignal(SIGHUP, SigHupHandler); /* set flag to read config file */ pqsignal(SIGINT, QueryCancelHandler); /* cancel current query */ pqsignal(SIGTERM, die); /* cancel current query and exit */ - pqsignal(SIGQUIT, quickdie); /* hard crash time */ + pqsignal(SIGQUIT, quickdie); /* hard crash time */ pqsignal(SIGALRM, HandleDeadLock); /* check for deadlock after * timeout */ @@ -1642,7 +1642,7 @@ PostgresMain(int argc, char *argv[], const char *username) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.239 $ $Date: 2001/10/25 05:49:43 $\n"); + puts("$Revision: 1.240 $ $Date: 2001/10/28 06:25:51 $\n"); } /* @@ -2049,4 +2049,5 @@ assertTest(int val) return val; } #endif + #endif diff --git a/src/backend/tioga/Arr_TgRecipe.h b/src/backend/tioga/Arr_TgRecipe.h index 346f74c293c..9404635715b 100644 --- a/src/backend/tioga/Arr_TgRecipe.h +++ b/src/backend/tioga/Arr_TgRecipe.h @@ -126,4 +126,5 @@ typedef struct Arr_TgNodePtr AppendVarray((Varray *) (A), (void *) (V), (CopyingFunct) copyTgNodePtr) #define deleteArr_TgNodePtr(A) FreeVarray(A) + #endif /* _ARR_TgNodePtr_ */ diff --git a/src/backend/tioga/Varray.h b/src/backend/tioga/Varray.h index c81a7f28eff..aed53855a41 100644 --- a/src/backend/tioga/Varray.h +++ b/src/backend/tioga/Varray.h @@ -44,4 +44,5 @@ typedef void (*CopyingFunct) (void *from, void *to); extern Varray *NewVarray(size_t nobj, size_t size); extern int AppendVarray(Varray * array, void *value, CopyingFunct copy); + #endif /* _VARRAY_H_ */ diff --git a/src/backend/tioga/tgRecipe.h b/src/backend/tioga/tgRecipe.h index f22e4bc8b51..960daafd310 100644 --- a/src/backend/tioga/tgRecipe.h +++ b/src/backend/tioga/tgRecipe.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: tgRecipe.h,v 1.18 2001/10/25 05:49:43 momjian Exp $ + * $Id: tgRecipe.h,v 1.19 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,44 +29,30 @@ typedef struct y; } Point; /* this should match whatever is in - * - * - * - * - * - * - * - * - * - * - * - * - * - * * geo-decls.h */ #endif /* TIOGA_FRONTEND */ typedef enum { - TG_INGRED, - TG_EYE, - TG_RECIPE + TG_INGRED, + TG_EYE, + TG_RECIPE } TgElemType; typedef enum { - TG_SQL, - TG_C, - TG_RECIPE_GRAPH, - TG_COMPILED + TG_SQL, + TG_C, + TG_RECIPE_GRAPH, + TG_COMPILED } TgSrcLangType; typedef enum { - TG_INGRED_NODE, - TG_EYE_NODE, - TG_RECIPE_NODE, - TG_TEE_NODE /* tee nodes are not stored in the db we + TG_INGRED_NODE, + TG_EYE_NODE, + TG_RECIPE_NODE, + TG_TEE_NODE /* tee nodes are not stored in the db we * create them when we read the recipe * back */ } TgNodeType; diff --git a/src/backend/utils/adt/ascii.c b/src/backend/utils/adt/ascii.c index c08960ca208..8617470de99 100644 --- a/src/backend/utils/adt/ascii.c +++ b/src/backend/utils/adt/ascii.c @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- * ascii.c * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.10 2001/10/25 05:49:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.11 2001/10/28 06:25:51 momjian Exp $ * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group * @@ -190,4 +190,5 @@ to_ascii_default(PG_FUNCTION_ARGS) ) ); } + #endif /* MULTIBYTE */ diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 06b249a8e13..fd6653c8fa7 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.75 2001/10/25 05:49:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.76 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -251,7 +251,7 @@ static datetkn deltatktbl[] = { {DDAY, UNITS, DTK_DAY}, /* "day" relative */ {"days", UNITS, DTK_DAY}, /* "days" relative */ {"dec", UNITS, DTK_DECADE}, /* "decade" relative */ - {"decs", UNITS, DTK_DECADE},/* "decades" relative */ + {"decs", UNITS, DTK_DECADE}, /* "decades" relative */ {DDECADE, UNITS, DTK_DECADE}, /* "decade" relative */ {"decades", UNITS, DTK_DECADE}, /* "decades" relative */ {"h", UNITS, DTK_HOUR}, /* "hour" relative */ @@ -268,8 +268,8 @@ static datetkn deltatktbl[] = { {"millisecon", UNITS, DTK_MILLISEC}, /* relative */ {"mils", UNITS, DTK_MILLENNIUM}, /* "millennia" relative */ {"min", UNITS, DTK_MINUTE}, /* "minute" relative */ - {"mins", UNITS, DTK_MINUTE},/* "minutes" relative */ - {"mins", UNITS, DTK_MINUTE},/* "minutes" relative */ + {"mins", UNITS, DTK_MINUTE}, /* "minutes" relative */ + {"mins", UNITS, DTK_MINUTE}, /* "minutes" relative */ {DMINUTE, UNITS, DTK_MINUTE}, /* "minute" relative */ {"minutes", UNITS, DTK_MINUTE}, /* "minutes" relative */ {"mon", UNITS, DTK_MONTH}, /* "months" relative */ @@ -281,7 +281,7 @@ static datetkn deltatktbl[] = { {DMILLISEC, UNITS, DTK_MILLISEC}, {"mseconds", UNITS, DTK_MILLISEC}, {"msecs", UNITS, DTK_MILLISEC}, - {"qtr", UNITS, DTK_QUARTER},/* "quarter" relative */ + {"qtr", UNITS, DTK_QUARTER}, /* "quarter" relative */ {DQUARTER, UNITS, DTK_QUARTER}, /* "quarter" relative */ {"reltime", IGNORE, 0}, /* pre-v6.1 "Undefined Reltime" */ {"s", UNITS, DTK_SECOND}, @@ -290,11 +290,11 @@ static datetkn deltatktbl[] = { {"seconds", UNITS, DTK_SECOND}, {"secs", UNITS, DTK_SECOND}, {DTIMEZONE, UNITS, DTK_TZ}, /* "timezone" time offset */ - {"timezone", UNITS, DTK_TZ},/* "timezone" time offset */ + {"timezone", UNITS, DTK_TZ}, /* "timezone" time offset */ {"timezone_h", UNITS, DTK_TZ_HOUR}, /* timezone hour units */ {"timezone_m", UNITS, DTK_TZ_MINUTE}, /* timezone minutes units */ {"undefined", RESERV, DTK_INVALID}, /* pre-v6.1 invalid time */ - {"us", UNITS, DTK_MICROSEC},/* "microsecond" relative */ + {"us", UNITS, DTK_MICROSEC}, /* "microsecond" relative */ {"usec", UNITS, DTK_MICROSEC}, /* "microsecond" relative */ {DMICROSEC, UNITS, DTK_MICROSEC}, /* "microsecond" relative */ {"useconds", UNITS, DTK_MICROSEC}, /* "microseconds" relative */ diff --git a/src/backend/utils/adt/encode.c b/src/backend/utils/adt/encode.c index e5308aca27a..2a59c25b35a 100644 --- a/src/backend/utils/adt/encode.c +++ b/src/backend/utils/adt/encode.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/encode.c,v 1.4 2001/10/25 05:49:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/encode.c,v 1.5 2001/10/28 06:25:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -495,7 +495,7 @@ static struct { const char *name; struct pg_encoding enc; -} enclist[] = +} enclist[] = { { diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index c7dc220d078..fb575c8bb94 100644 --- a/src/backend/utils/adt/float.c +++ b/src/backend/utils/adt/float.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.75 2001/10/25 05:49:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.76 2001/10/28 06:25:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1897,7 +1897,7 @@ float84ge(PG_FUNCTION_ARGS) static const double one = 1.0, TWO52[2] = { 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ - -4.50359962737049600000e+15,/* 0xC3300000, 0x00000000 */ + -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */ }; static double @@ -1981,4 +1981,5 @@ cbrt(double x) return isneg ? -tmpres : tmpres; } + #endif /* !HAVE_CBRT */ diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 0957783a4ad..270abc161e4 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- * formatting.c * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.42 2001/10/25 05:49:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.43 2001/10/28 06:25:52 momjian Exp $ * * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group @@ -521,132 +521,132 @@ static KeySuffix DCH_suff[] = { typedef enum { - DCH_A_D, - DCH_A_M, - DCH_AD, - DCH_AM, - DCH_B_C, - DCH_BC, - DCH_CC, - DCH_DAY, - DCH_DDD, - DCH_DD, - DCH_DY, - DCH_Day, - DCH_Dy, - DCH_D, - DCH_FX, /* global suffix */ - DCH_HH24, - DCH_HH12, - DCH_HH, - DCH_IW, - DCH_J, - DCH_MI, - DCH_MM, - DCH_MONTH, - DCH_MON, - DCH_MS, - DCH_Month, - DCH_Mon, - DCH_P_M, - DCH_PM, - DCH_Q, - DCH_RM, - DCH_SSSS, - DCH_SS, - DCH_TZ, - DCH_US, - DCH_WW, - DCH_W, - DCH_Y_YYY, - DCH_YYYY, - DCH_YYY, - DCH_YY, - DCH_Y, - DCH_a_d, - DCH_a_m, - DCH_ad, - DCH_am, - DCH_b_c, - DCH_bc, - DCH_cc, - DCH_day, - DCH_ddd, - DCH_dd, - DCH_dy, - DCH_d, - DCH_fx, - DCH_hh24, - DCH_hh12, - DCH_hh, - DCH_iw, - DCH_j, - DCH_mi, - DCH_mm, - DCH_month, - DCH_mon, - DCH_ms, - DCH_p_m, - DCH_pm, - DCH_q, - DCH_rm, - DCH_ssss, - DCH_ss, - DCH_tz, - DCH_us, - DCH_ww, - DCH_w, - DCH_y_yyy, - DCH_yyyy, - DCH_yyy, - DCH_yy, - DCH_y, + DCH_A_D, + DCH_A_M, + DCH_AD, + DCH_AM, + DCH_B_C, + DCH_BC, + DCH_CC, + DCH_DAY, + DCH_DDD, + DCH_DD, + DCH_DY, + DCH_Day, + DCH_Dy, + DCH_D, + DCH_FX, /* global suffix */ + DCH_HH24, + DCH_HH12, + DCH_HH, + DCH_IW, + DCH_J, + DCH_MI, + DCH_MM, + DCH_MONTH, + DCH_MON, + DCH_MS, + DCH_Month, + DCH_Mon, + DCH_P_M, + DCH_PM, + DCH_Q, + DCH_RM, + DCH_SSSS, + DCH_SS, + DCH_TZ, + DCH_US, + DCH_WW, + DCH_W, + DCH_Y_YYY, + DCH_YYYY, + DCH_YYY, + DCH_YY, + DCH_Y, + DCH_a_d, + DCH_a_m, + DCH_ad, + DCH_am, + DCH_b_c, + DCH_bc, + DCH_cc, + DCH_day, + DCH_ddd, + DCH_dd, + DCH_dy, + DCH_d, + DCH_fx, + DCH_hh24, + DCH_hh12, + DCH_hh, + DCH_iw, + DCH_j, + DCH_mi, + DCH_mm, + DCH_month, + DCH_mon, + DCH_ms, + DCH_p_m, + DCH_pm, + DCH_q, + DCH_rm, + DCH_ssss, + DCH_ss, + DCH_tz, + DCH_us, + DCH_ww, + DCH_w, + DCH_y_yyy, + DCH_yyyy, + DCH_yyy, + DCH_yy, + DCH_y, /* last */ - _DCH_last_ + _DCH_last_ } DCH_poz; typedef enum { - NUM_COMMA, - NUM_DEC, - NUM_0, - NUM_9, - NUM_B, - NUM_C, - NUM_D, - NUM_E, - NUM_FM, - NUM_G, - NUM_L, - NUM_MI, - NUM_PL, - NUM_PR, - NUM_RN, - NUM_SG, - NUM_SP, - NUM_S, - NUM_TH, - NUM_V, - NUM_b, - NUM_c, - NUM_d, - NUM_e, - NUM_fm, - NUM_g, - NUM_l, - NUM_mi, - NUM_pl, - NUM_pr, - NUM_rn, - NUM_sg, - NUM_sp, - NUM_s, - NUM_th, - NUM_v, + NUM_COMMA, + NUM_DEC, + NUM_0, + NUM_9, + NUM_B, + NUM_C, + NUM_D, + NUM_E, + NUM_FM, + NUM_G, + NUM_L, + NUM_MI, + NUM_PL, + NUM_PR, + NUM_RN, + NUM_SG, + NUM_SP, + NUM_S, + NUM_TH, + NUM_V, + NUM_b, + NUM_c, + NUM_d, + NUM_e, + NUM_fm, + NUM_g, + NUM_l, + NUM_mi, + NUM_pl, + NUM_pr, + NUM_rn, + NUM_sg, + NUM_sp, + NUM_s, + NUM_th, + NUM_v, /* last */ - _NUM_last_ + _NUM_last_ } NUM_poz; /* ---------- @@ -861,7 +861,7 @@ typedef struct NUMProc *last_relevant, /* last relevant number after decimal * point */ - *L_negative_sign,/* Locale */ + *L_negative_sign, /* Locale */ *L_positive_sign, *decimal, *L_thousands_sep, diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c index cc3c8a791f7..75da7170e3a 100644 --- a/src/backend/utils/adt/name.c +++ b/src/backend/utils/adt/name.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.32 2001/10/25 05:49:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.33 2001/10/28 06:25:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -240,4 +240,5 @@ NameComputeLength(Name name) ; return (uint32) length; } + #endif diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index 4e7398448b8..f447caa66c1 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -5,7 +5,7 @@ * * 1998 Jan Wieck * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.46 2001/10/25 05:49:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.47 2001/10/28 06:25:52 momjian Exp $ * * ---------- */ @@ -517,7 +517,7 @@ numeric_round(PG_FUNCTION_ARGS) if (i < 0) { - Assert(i == -1); /* better not have added more than 1 digit */ + Assert(i == -1); /* better not have added more than 1 digit */ Assert(arg.digits > arg.buf); arg.digits--; arg.ndigits++; diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index bb7f8944417..ebba29a01ec 100644 --- a/src/backend/utils/adt/numutils.c +++ b/src/backend/utils/adt/numutils.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.46 2001/10/25 05:49:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.47 2001/10/28 06:25:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -475,4 +475,5 @@ atof1(char *str, double *val) *val = v; return 0; } + #endif diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index 17abbbd5a3f..28d282e60d7 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -4,7 +4,7 @@ * The PostgreSQL locale utils. * * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/pg_locale.c,v 1.11 2001/10/25 05:49:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/pg_locale.c,v 1.12 2001/10/28 06:25:52 momjian Exp $ * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group * @@ -196,4 +196,5 @@ PGLC_localeconv(void) CurrentLocaleConvValid = true; return &CurrentLocaleConv; } + #endif /* USE_LOCALE */ diff --git a/src/backend/utils/adt/quote.c b/src/backend/utils/adt/quote.c index 45e4c1133dc..39a1ec4df16 100644 --- a/src/backend/utils/adt/quote.c +++ b/src/backend/utils/adt/quote.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/quote.c,v 1.5 2001/10/25 05:49:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/quote.c,v 1.6 2001/10/28 06:25:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -289,4 +289,5 @@ do_quote_literal(text *lptr) return result; } + #endif diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index e7d319e9b65..71756271119 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.100 2001/10/25 05:49:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.101 2001/10/28 06:25:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1102,7 +1102,7 @@ booltestsel(Query *root, BooleanTest *clause, int varRelid) default: elog(ERROR, "booltestsel: unexpected booltesttype %d", (int) clause->booltesttype); - selec = 0.0; /* Keep compiler quiet */ + selec = 0.0; /* Keep compiler quiet */ break; } @@ -1143,7 +1143,7 @@ booltestsel(Query *root, BooleanTest *clause, int varRelid) default: elog(ERROR, "booltestsel: unexpected booltesttype %d", (int) clause->booltesttype); - selec = 0.0; /* Keep compiler quiet */ + selec = 0.0; /* Keep compiler quiet */ break; } } @@ -2037,7 +2037,7 @@ convert_string_datum(Datum value, Oid typid) #ifdef USE_LOCALE /* Guess that transformed string is not much bigger than original */ - xfrmsize = strlen(val) + 32; /* arbitrary pad value here... */ + xfrmsize = strlen(val) + 32; /* arbitrary pad value here... */ xfrmstr = (char *) palloc(xfrmsize); xfrmlen = strxfrm(xfrmstr, val, xfrmsize); if (xfrmlen >= xfrmsize) @@ -2758,7 +2758,7 @@ regex_selectivity_sub(char *patt, int pattlen, bool case_insensitive) if (patt[pos] == '(') { if (paren_depth == 0) - paren_pos = pos; /* remember start of parenthesized item */ + paren_pos = pos; /* remember start of parenthesized item */ paren_depth++; } else if (patt[pos] == ')' && paren_depth > 0) diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fe347fe5fbd..efac9a73a95 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.84 2001/10/25 05:49:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.85 2001/10/28 06:25:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,7 @@ #include "utils/syscache.h" - /* #define CACHEDEBUG *//* turns DEBUG elogs on */ + /* #define CACHEDEBUG */ /* turns DEBUG elogs on */ /* * Constants related to size of the catcache. diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 1073841f9d1..9f1698df64d 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.147 2001/10/25 05:49:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.148 2001/10/28 06:25:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -379,7 +379,7 @@ scan_pg_rel_ind(RelationBuildDescInfo buildinfo) default: elog(ERROR, "ScanPgRelation: bad buildinfo"); - return_tuple = NULL; /* keep compiler quiet */ + return_tuple = NULL; /* keep compiler quiet */ } heap_close(pg_class_desc, AccessShareLock); diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c index d12cbcbbf1d..904b32ac29a 100644 --- a/src/backend/utils/hash/dynahash.c +++ b/src/backend/utils/hash/dynahash.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.39 2001/10/25 05:49:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.40 2001/10/28 06:25:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -630,7 +630,7 @@ hash_search(HTAB *hashp, { /* no free elements. allocate another chunk of buckets */ if (!element_alloc(hashp)) - return NULL; /* out of memory */ + return NULL; /* out of memory */ currBucket = hctl->freeList; Assert(currBucket != NULL); } diff --git a/src/backend/utils/hash/pg_crc.c b/src/backend/utils/hash/pg_crc.c index 86a714aa40b..4ed8c665286 100644 --- a/src/backend/utils/hash/pg_crc.c +++ b/src/backend/utils/hash/pg_crc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/hash/pg_crc.c,v 1.4 2001/10/25 05:49:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/hash/pg_crc.c,v 1.5 2001/10/28 06:25:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -413,4 +413,5 @@ const uint64 crc_table[256] = { INT64CONST(0x5DEDC41A34BBEEB2), INT64CONST(0x1F1D25F19D51D821), INT64CONST(0xD80C07CD676F8394), INT64CONST(0x9AFCE626CE85B507) }; + #endif /* INT64_IS_BUSTED */ diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index edec4a8329b..3dc6deb0cb4 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.95 2001/10/25 05:49:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.96 2001/10/28 06:25:54 momjian Exp $ * * *------------------------------------------------------------------------- @@ -409,7 +409,7 @@ ShutdownPostgres(void) * has to happen before bufmgr shutdown, so having smgr register a * callback for it wouldn't work. */ - smgrDoPendingDeletes(false); /* delete as though aborting xact */ + smgrDoPendingDeletes(false); /* delete as though aborting xact */ } diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c index a3ff9aaf8f2..3a890a674cb 100644 --- a/src/backend/utils/mb/conv.c +++ b/src/backend/utils/mb/conv.c @@ -6,7 +6,7 @@ * WIN1250 client encoding support contributed by Pavel Behal * SJIS UDC (NEC selection IBM kanji) support contributed by Eiji Tokuya * - * $Id: conv.c,v 1.33 2001/10/25 05:49:51 momjian Exp $ + * $Id: conv.c,v 1.34 2001/10/28 06:25:54 momjian Exp $ * * */ @@ -63,7 +63,6 @@ #include "Unicode/utf8_to_alt.map" #include "Unicode/utf8_to_koi8r.map" #include "Unicode/utf8_to_win1251.map" - #endif /* UNICODE_CONVERSION */ /* @@ -619,7 +618,7 @@ big52mic(unsigned char *big5, unsigned char *p, int len) { if (lc == LC_CNS11643_3 || lc == LC_CNS11643_4) { - *p++ = 0x9d; /* LCPRV2 */ + *p++ = 0x9d; /* LCPRV2 */ } *p++ = lc; /* Plane No. */ *p++ = (cnsBuf >> 8) & 0x00ff; @@ -1677,7 +1676,7 @@ pg_enconv pg_enconv_tbl[] = { { PG_SQL_ASCII, ascii2mic, mic2ascii, ascii2utf, utf2ascii - } , + }, { PG_EUC_JP, euc_jp2mic, mic2euc_jp, euc_jp_to_utf, utf_to_euc_jp }, @@ -1765,7 +1764,7 @@ pg_enconv pg_enconv_tbl[] = { { PG_SQL_ASCII, ascii2mic, mic2ascii, 0, 0 - } , + }, { PG_EUC_JP, euc_jp2mic, mic2euc_jp, 0, 0 }, @@ -1845,4 +1844,5 @@ pg_enconv pg_enconv_tbl[] = PG_WIN1250, win12502mic, mic2win1250, 0, 0 }, }; + #endif /* UNICODE_CONVERSION */ diff --git a/src/backend/utils/mb/encnames.c b/src/backend/utils/mb/encnames.c index 7667e478aab..84446a26403 100644 --- a/src/backend/utils/mb/encnames.c +++ b/src/backend/utils/mb/encnames.c @@ -2,7 +2,7 @@ * Encoding names and routines for work with it. All * in this file is shared bedween FE and BE. * - * $Id: encnames.c,v 1.5 2001/10/25 05:49:51 momjian Exp $ + * $Id: encnames.c,v 1.6 2001/10/28 06:25:56 momjian Exp $ */ #ifdef FRONTEND #include "postgres_fe.h" @@ -38,7 +38,7 @@ pg_encname pg_encname_tbl[] = { { "alt", PG_ALT - } , /* IBM866 */ + }, /* IBM866 */ { "big5", PG_BIG5 }, /* Big5; Chinese for Taiwan Multi-byte set */ @@ -191,7 +191,7 @@ pg_enc2name pg_enc2name_tbl[] = { { "SQL_ASCII", PG_SQL_ASCII - } , + }, { "EUC_JP", PG_EUC_JP }, @@ -418,4 +418,5 @@ PG_encoding_to_char(PG_FUNCTION_ARGS) return DirectFunctionCall1(namein, CStringGetDatum(encoding_name)); } + #endif diff --git a/src/backend/utils/mb/wchar.c b/src/backend/utils/mb/wchar.c index 9d778d00418..4f6a54c8ee5 100644 --- a/src/backend/utils/mb/wchar.c +++ b/src/backend/utils/mb/wchar.c @@ -1,7 +1,7 @@ /* * conversion functions between pg_wchar and multi-byte streams. * Tatsuo Ishii - * $Id: wchar.c,v 1.25 2001/10/25 05:49:51 momjian Exp $ + * $Id: wchar.c,v 1.26 2001/10/28 06:25:56 momjian Exp $ * * WIN1250 client encoding updated by Pavel Behal * @@ -602,4 +602,5 @@ pg_database_encoding_max_length(void) { return pg_wchar_table[GetDatabaseEncoding()].maxmblen; } + #endif diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index ff57dc92bbe..52aa0e0387f 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -4,7 +4,7 @@ * Support for grand unified configuration scheme, including SET * command, configuration file, and command line options. * - * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.56 2001/10/25 05:49:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.57 2001/10/28 06:25:56 momjian Exp $ * * Copyright 2000 by PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. @@ -95,11 +95,11 @@ bool Password_encryption = false; */ enum config_type { - PGC_NONE = 0, - PGC_BOOL, - PGC_INT, - PGC_REAL, - PGC_STRING + PGC_NONE = 0, + PGC_BOOL, + PGC_INT, + PGC_REAL, + PGC_STRING }; @@ -194,7 +194,7 @@ static struct config_bool { { "enable_seqscan", PGC_USERSET, &enable_seqscan, true, NULL - } , + }, { "enable_indexscan", PGC_USERSET, &enable_indexscan, true, NULL }, @@ -353,34 +353,34 @@ static struct config_int { { "geqo_threshold", PGC_USERSET, &geqo_rels, - DEFAULT_GEQO_RELS, 2, INT_MAX, NULL, NULL - } , + DEFAULT_GEQO_RELS, 2, INT_MAX, NULL, NULL + }, { "geqo_pool_size", PGC_USERSET, &Geqo_pool_size, - DEFAULT_GEQO_POOL_SIZE, 0, MAX_GEQO_POOL_SIZE, NULL, NULL + DEFAULT_GEQO_POOL_SIZE, 0, MAX_GEQO_POOL_SIZE, NULL, NULL }, { "geqo_effort", PGC_USERSET, &Geqo_effort, - 1, 1, INT_MAX, NULL, NULL + 1, 1, INT_MAX, NULL, NULL }, { "geqo_generations", PGC_USERSET, &Geqo_generations, - 0, 0, INT_MAX, NULL, NULL + 0, 0, INT_MAX, NULL, NULL }, { "geqo_random_seed", PGC_USERSET, &Geqo_random_seed, - -1, INT_MIN, INT_MAX, NULL, NULL + -1, INT_MIN, INT_MAX, NULL, NULL }, { "deadlock_timeout", PGC_POSTMASTER, &DeadlockTimeout, - 1000, 0, INT_MAX, NULL, NULL + 1000, 0, INT_MAX, NULL, NULL }, #ifdef ENABLE_SYSLOG { "syslog", PGC_SIGHUP, &Use_syslog, - 0, 0, 2, NULL, NULL + 0, 0, 2, NULL, NULL }, #endif @@ -391,116 +391,116 @@ static struct config_int */ { "max_connections", PGC_POSTMASTER, &MaxBackends, - DEF_MAXBACKENDS, 1, INT_MAX, NULL, NULL + DEF_MAXBACKENDS, 1, INT_MAX, NULL, NULL }, { "shared_buffers", PGC_POSTMASTER, &NBuffers, - DEF_NBUFFERS, 16, INT_MAX, NULL, NULL + DEF_NBUFFERS, 16, INT_MAX, NULL, NULL }, { "port", PGC_POSTMASTER, &PostPortNumber, - DEF_PGPORT, 1, 65535, NULL, NULL + DEF_PGPORT, 1, 65535, NULL, NULL }, { "unix_socket_permissions", PGC_POSTMASTER, &Unix_socket_permissions, - 0777, 0000, 0777, NULL, NULL + 0777, 0000, 0777, NULL, NULL }, { "sort_mem", PGC_USERSET, &SortMem, - 512, 4 * BLCKSZ / 1024, INT_MAX, NULL, NULL + 512, 4 * BLCKSZ / 1024, INT_MAX, NULL, NULL }, { "vacuum_mem", PGC_USERSET, &VacuumMem, - 8192, 1024, INT_MAX, NULL, NULL + 8192, 1024, INT_MAX, NULL, NULL }, { "max_files_per_process", PGC_BACKEND, &max_files_per_process, - 1000, 25, INT_MAX, NULL, NULL + 1000, 25, INT_MAX, NULL, NULL }, { "debug_level", PGC_USERSET, &DebugLvl, - 0, 0, 16, NULL, NULL + 0, 0, 16, NULL, NULL }, #ifdef LOCK_DEBUG { "trace_lock_oidmin", PGC_SUSET, &Trace_lock_oidmin, - BootstrapObjectIdData, 1, INT_MAX, NULL, NULL + BootstrapObjectIdData, 1, INT_MAX, NULL, NULL }, { "trace_lock_table", PGC_SUSET, &Trace_lock_table, - 0, 0, INT_MAX, NULL, NULL + 0, 0, INT_MAX, NULL, NULL }, #endif { "max_expr_depth", PGC_USERSET, &max_expr_depth, - DEFAULT_MAX_EXPR_DEPTH, 10, INT_MAX, NULL, NULL + DEFAULT_MAX_EXPR_DEPTH, 10, INT_MAX, NULL, NULL }, { "max_fsm_relations", PGC_POSTMASTER, &MaxFSMRelations, - 100, 10, INT_MAX, NULL, NULL + 100, 10, INT_MAX, NULL, NULL }, { "max_fsm_pages", PGC_POSTMASTER, &MaxFSMPages, - 10000, 1000, INT_MAX, NULL, NULL + 10000, 1000, INT_MAX, NULL, NULL }, { "max_locks_per_transaction", PGC_POSTMASTER, &max_locks_per_xact, - 64, 10, INT_MAX, NULL, NULL + 64, 10, INT_MAX, NULL, NULL }, { "authentication_timeout", PGC_SIGHUP, &AuthenticationTimeout, - 60, 1, 600, NULL, NULL + 60, 1, 600, NULL, NULL }, { "pre_auth_delay", PGC_SIGHUP, &PreAuthDelay, - 0, 0, 60, NULL, NULL + 0, 0, 60, NULL, NULL }, { "checkpoint_segments", PGC_SIGHUP, &CheckPointSegments, - 3, 1, INT_MAX, NULL, NULL + 3, 1, INT_MAX, NULL, NULL }, { "checkpoint_timeout", PGC_SIGHUP, &CheckPointTimeout, - 300, 30, 3600, NULL, NULL + 300, 30, 3600, NULL, NULL }, { "wal_buffers", PGC_POSTMASTER, &XLOGbuffers, - 8, 4, INT_MAX, NULL, NULL + 8, 4, INT_MAX, NULL, NULL }, { "wal_files", PGC_SIGHUP, &XLOGfiles, - 0, 0, 64, NULL, NULL + 0, 0, 64, NULL, NULL }, { "wal_debug", PGC_SUSET, &XLOG_DEBUG, - 0, 0, 16, NULL, NULL + 0, 0, 16, NULL, NULL }, { "commit_delay", PGC_USERSET, &CommitDelay, - 0, 0, 100000, NULL, NULL + 0, 0, 100000, NULL, NULL }, { "commit_siblings", PGC_USERSET, &CommitSiblings, - 5, 1, 1000, NULL, NULL + 5, 1, 1000, NULL, NULL }, { @@ -514,29 +514,29 @@ static struct config_real { { "effective_cache_size", PGC_USERSET, &effective_cache_size, - DEFAULT_EFFECTIVE_CACHE_SIZE, 0, DBL_MAX, NULL, NULL - } , + DEFAULT_EFFECTIVE_CACHE_SIZE, 0, DBL_MAX, NULL, NULL + }, { "random_page_cost", PGC_USERSET, &random_page_cost, - DEFAULT_RANDOM_PAGE_COST, 0, DBL_MAX, NULL, NULL + DEFAULT_RANDOM_PAGE_COST, 0, DBL_MAX, NULL, NULL }, { "cpu_tuple_cost", PGC_USERSET, &cpu_tuple_cost, - DEFAULT_CPU_TUPLE_COST, 0, DBL_MAX, NULL, NULL + DEFAULT_CPU_TUPLE_COST, 0, DBL_MAX, NULL, NULL }, { "cpu_index_tuple_cost", PGC_USERSET, &cpu_index_tuple_cost, - DEFAULT_CPU_INDEX_TUPLE_COST, 0, DBL_MAX, NULL, NULL + DEFAULT_CPU_INDEX_TUPLE_COST, 0, DBL_MAX, NULL, NULL }, { "cpu_operator_cost", PGC_USERSET, &cpu_operator_cost, - DEFAULT_CPU_OPERATOR_COST, 0, DBL_MAX, NULL, NULL + DEFAULT_CPU_OPERATOR_COST, 0, DBL_MAX, NULL, NULL }, { "geqo_selection_bias", PGC_USERSET, &Geqo_selection_bias, - DEFAULT_GEQO_SELECTION_BIAS, MIN_GEQO_SELECTION_BIAS, - MAX_GEQO_SELECTION_BIAS, NULL, NULL + DEFAULT_GEQO_SELECTION_BIAS, MIN_GEQO_SELECTION_BIAS, + MAX_GEQO_SELECTION_BIAS, NULL, NULL }, { @@ -550,49 +550,49 @@ static struct config_string { { "default_transaction_isolation", PGC_USERSET, &default_iso_level_string, - "read committed", check_defaultxactisolevel, assign_defaultxactisolevel - } , + "read committed", check_defaultxactisolevel, assign_defaultxactisolevel + }, { "dynamic_library_path", PGC_SUSET, &Dynamic_library_path, - "$libdir", NULL, NULL + "$libdir", NULL, NULL }, { "krb_server_keyfile", PGC_POSTMASTER, &pg_krb_server_keyfile, - PG_KRB_SRVTAB, NULL, NULL + PG_KRB_SRVTAB, NULL, NULL }, #ifdef ENABLE_SYSLOG { "syslog_facility", PGC_POSTMASTER, &Syslog_facility, - "LOCAL0", check_facility, NULL + "LOCAL0", check_facility, NULL }, { "syslog_ident", PGC_POSTMASTER, &Syslog_ident, - "postgres", NULL, NULL + "postgres", NULL, NULL }, #endif { "unix_socket_group", PGC_POSTMASTER, &Unix_socket_group, - "", NULL, NULL + "", NULL, NULL }, { "unix_socket_directory", PGC_POSTMASTER, &UnixSocketDir, - "", NULL, NULL + "", NULL, NULL }, { "virtual_host", PGC_POSTMASTER, &VirtualHost, - "", NULL, NULL + "", NULL, NULL }, { "wal_sync_method", PGC_SIGHUP, &XLOG_sync_method, - XLOG_sync_method_default, check_xlog_sync_method, - assign_xlog_sync_method + XLOG_sync_method_default, check_xlog_sync_method, + assign_xlog_sync_method }, { diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c index 65d2e10cdb2..f1bd25036b3 100644 --- a/src/backend/utils/misc/ps_status.c +++ b/src/backend/utils/misc/ps_status.c @@ -5,7 +5,7 @@ * to contain some useful information. Mechanism differs wildly across * platforms. * - * $Header: /cvsroot/pgsql/src/backend/utils/misc/ps_status.c,v 1.8 2001/10/25 05:49:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/ps_status.c,v 1.9 2001/10/28 06:25:57 momjian Exp $ * * Copyright 2000 by PostgreSQL Global Development Group * various details abducted from various places @@ -126,7 +126,7 @@ save_ps_display_args(int argc, char *argv[]) end_of_area = argv[i] + strlen(argv[i]); } - if (end_of_area == NULL)/* probably can't happen? */ + if (end_of_area == NULL) /* probably can't happen? */ { ps_buffer = NULL; ps_buffer_size = 0; diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c index 24fd0d17931..f45fb63fd82 100644 --- a/src/backend/utils/mmgr/aset.c +++ b/src/backend/utils/mmgr/aset.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.42 2001/10/25 05:49:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.43 2001/10/28 06:25:57 momjian Exp $ * * NOTE: * This is a new (Feb. 05, 1999) implementation of the allocation set @@ -1082,4 +1082,5 @@ AllocSetCheck(MemoryContext context) name, block); } } + #endif /* MEMORY_CONTEXT_CHECKING */ diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index 5cf8e3ad1dc..796be9d6c7f 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -78,7 +78,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplesort.c,v 1.19 2001/10/25 05:49:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplesort.c,v 1.20 2001/10/28 06:25:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -104,13 +104,12 @@ */ typedef enum { - TSS_INITIAL, /* Loading tuples; still within memory + TSS_INITIAL, /* Loading tuples; still within memory * limit */ - TSS_BUILDRUNS, /* Loading tuples; writing to tape */ - TSS_SORTEDINMEM,/* Sort completed entirely in memory */ - TSS_SORTEDONTAPE, /* Sort completed, final run is on - * tape */ - TSS_FINALMERGE /* Performing final merge on-the-fly */ + TSS_BUILDRUNS, /* Loading tuples; writing to tape */ + TSS_SORTEDINMEM, /* Sort completed entirely in memory */ + TSS_SORTEDONTAPE, /* Sort completed, final run is on tape */ + TSS_FINALMERGE /* Performing final merge on-the-fly */ } TupSortStatus; /* diff --git a/src/backend/utils/sort/tuplestore.c b/src/backend/utils/sort/tuplestore.c index 6e241c480f4..b7e35d5a18e 100644 --- a/src/backend/utils/sort/tuplestore.c +++ b/src/backend/utils/sort/tuplestore.c @@ -26,7 +26,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplestore.c,v 1.4 2001/10/25 05:49:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplestore.c,v 1.5 2001/10/28 06:25:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,11 +43,11 @@ */ typedef enum { - TSS_INITIAL, /* Loading tuples; still within memory + TSS_INITIAL, /* Loading tuples; still within memory * limit */ - TSS_WRITEFILE, /* Loading tuples; writing to temp file */ - TSS_READMEM, /* Reading tuples; entirely in memory */ - TSS_READFILE /* Reading tuples from temp file */ + TSS_WRITEFILE, /* Loading tuples; writing to temp file */ + TSS_READMEM, /* Reading tuples; entirely in memory */ + TSS_READFILE /* Reading tuples from temp file */ } TupStoreStatus; /* diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c index 194959f6ccf..59194948496 100644 --- a/src/backend/utils/time/tqual.c +++ b/src/backend/utils/time/tqual.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.43 2001/10/25 05:49:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.44 2001/10/28 06:25:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -324,7 +324,7 @@ HeapTupleSatisfiesUpdate(HeapTuple tuple) { if (th->t_infomask & HEAP_MARKED_FOR_UPDATE) return HeapTupleMayBeUpdated; - return HeapTupleUpdated; /* updated by other */ + return HeapTupleUpdated; /* updated by other */ } if (TransactionIdIsCurrentTransactionId(th->t_xmax)) diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h index 3c359ff99f5..b81b029e293 100644 --- a/src/bin/pg_dump/pg_backup.h +++ b/src/bin/pg_dump/pg_backup.h @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup.h,v 1.16 2001/10/25 05:49:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup.h,v 1.17 2001/10/28 06:25:58 momjian Exp $ * * Modifications - 28-Jun-2000 - pjw@rhyme.com.au * @@ -56,11 +56,11 @@ typedef enum _archiveFormat { - archUnknown = 0, - archCustom = 1, - archFiles = 2, - archTar = 3, - archNull = 4 + archUnknown = 0, + archCustom = 1, + archFiles = 2, + archTar = 3, + archNull = 4 } ArchiveFormat; /* @@ -196,4 +196,5 @@ extern int archprintf(Archive *AH, const char *fmt,...) /* This extension allows gcc to check the format string */ __attribute__((format(printf, 2, 3))); + #endif diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h index 1d099452ee5..2a2cacd5a95 100644 --- a/src/bin/pg_dump/pg_backup_archiver.h +++ b/src/bin/pg_dump/pg_backup_archiver.h @@ -17,7 +17,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.38 2001/10/25 05:49:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.39 2001/10/28 06:25:58 momjian Exp $ * * Modifications - 28-Jun-2000 - pjw@rhyme.com.au * - Initial version. @@ -118,8 +118,8 @@ typedef int (*TocSortCompareFn) (const void *te1, const void *te2); typedef enum _archiveMode { - archModeWrite, - archModeRead + archModeWrite, + archModeRead } ArchiveMode; typedef struct _outputContext @@ -130,10 +130,10 @@ typedef struct _outputContext typedef enum { - SQL_SCAN = 0, - SQL_IN_SQL_COMMENT, - SQL_IN_EXT_COMMENT, - SQL_IN_QUOTE + SQL_SCAN = 0, + SQL_IN_SQL_COMMENT, + SQL_IN_EXT_COMMENT, + SQL_IN_QUOTE } sqlparseState; typedef struct @@ -221,7 +221,7 @@ typedef struct _archiveHandle int loFd; /* BLOB fd */ int writingBlob; /* Flag */ - int createdBlobXref; /* Flag */ + int createdBlobXref; /* Flag */ int blobCount; /* # of blobs restored */ int lastID; /* Last internal ID for a TOC entry */ @@ -318,4 +318,5 @@ int ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH); int ahprintf(ArchiveHandle *AH, const char *fmt,...) __attribute__((format(printf, 2, 3))); void ahlog(ArchiveHandle *AH, int level, const char *fmt,...) __attribute__((format(printf, 3, 4))); + #endif diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c index 4f99c967816..557ccbecbdc 100644 --- a/src/bin/pg_dump/pg_backup_tar.c +++ b/src/bin/pg_dump/pg_backup_tar.c @@ -16,7 +16,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.19 2001/10/25 05:49:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.20 2001/10/28 06:25:58 momjian Exp $ * * Modifications - 28-Jun-2000 - pjw@rhyme.com.au * @@ -699,7 +699,7 @@ _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt) StartRestoreBlobs(AH); - th = tarOpen(AH, NULL, 'r'); /* Open next file */ + th = tarOpen(AH, NULL, 'r'); /* Open next file */ while (th != NULL) { ctx->FH = th; @@ -1020,7 +1020,7 @@ static void _tarAddFile(ArchiveHandle *AH, TAR_MEMBER *th) { lclContext *ctx = (lclContext *) AH->formatData; - FILE *tmp = th->tmpFH; /* Grab it for convenience */ + FILE *tmp = th->tmpFH; /* Grab it for convenience */ char buf[32768]; int cnt; int len = 0; diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 9307a52d08a..5c2c9045559 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -22,7 +22,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.235 2001/10/25 05:49:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.236 2001/10/28 06:25:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -65,8 +65,8 @@ typedef enum _formatLiteralOptions { - CONV_ALL = 0, - PASS_LFTAB = 3 /* NOTE: 1 and 2 are reserved in case we + CONV_ALL = 0, + PASS_LFTAB = 3 /* NOTE: 1 and 2 are reserved in case we * want to make a mask. */ /* We could make this a bit mask for control chars, but I don't */ /* see any value in making it more complex...the current code */ @@ -571,7 +571,7 @@ dumpClasses(const TableInfo *tblinfo, const int numTables, Archive *fout, if (tblinfo[i].viewdef != NULL) continue; - if (tblinfo[i].sequence)/* already dumped */ + if (tblinfo[i].sequence) /* already dumped */ continue; if (!onlytable || (strcmp(classname, onlytable) == 0) || (strlen(onlytable) == 0)) @@ -892,10 +892,10 @@ main(int argc, char **argv) /* * Option letters were getting scarce, so I invented this - * new scheme: '-X feature' turns on some feature. - * Compare to the -f option in GCC. You should also add - * an equivalent GNU-style option --feature. Features - * that require arguments should use '-X feature=foo'. + * new scheme: '-X feature' turns on some feature. Compare + * to the -f option in GCC. You should also add an + * equivalent GNU-style option --feature. Features that + * require arguments should use '-X feature=foo'. */ case 'X': if (strcmp(optarg, "use-set-session-authorization") == 0) @@ -4105,7 +4105,7 @@ dumpTables(Archive *fout, TableInfo *tblinfo, int numTables, for (i = 0; i < numTables; i++) { - if (tblinfo[i].sequence)/* already dumped */ + if (tblinfo[i].sequence) /* already dumped */ continue; if (!tablename || (!strcmp(tblinfo[i].relname, tablename)) || (strlen(tablename) == 0)) diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h index a08105ca355..19728a1461b 100644 --- a/src/bin/pg_dump/pg_dump.h +++ b/src/bin/pg_dump/pg_dump.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_dump.h,v 1.74 2001/10/25 05:49:53 momjian Exp $ + * $Id: pg_dump.h,v 1.75 2001/10/28 06:25:58 momjian Exp $ * * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2 * @@ -224,11 +224,11 @@ extern void dumpSchemaIdx(Archive *fout, typedef enum _OidOptions { - zeroAsOpaque = 1, - zeroAsAny = 2, - zeroAsStar = 4, - zeroAsNone = 8, - useBaseTypeName = 1024 + zeroAsOpaque = 1, + zeroAsAny = 2, + zeroAsStar = 4, + zeroAsNone = 8, + useBaseTypeName = 1024 } OidOptions; extern char *findTypeByOid(TypeInfo *tinfo, int numTypes, const char *oid, OidOptions opts); @@ -279,4 +279,5 @@ extern void dumpIndexes(Archive *fout, IndInfo *indinfo, int numIndexes, TableInfo *tbinfo, int numTables, const char *tablename); extern const char *fmtId(const char *identifier, bool force_quotes); extern void exit_nicely(void); + #endif /* PG_DUMP_H */ diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 004b8bacafa..72e64a8900b 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.61 2001/10/25 05:49:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.62 2001/10/28 06:25:58 momjian Exp $ */ #include "postgres_fe.h" #include "command.h" @@ -56,7 +56,7 @@ static backslashResult exec_command(const char *cmd, enum option_type { - OT_NORMAL, OT_SQLID, OT_FILEPIPE + OT_NORMAL, OT_SQLID, OT_FILEPIPE }; static char *scan_option(char **string, enum option_type type, char *quote, bool semicolon); static char *unescape(const unsigned char *source, size_t len); diff --git a/src/bin/psql/command.h b/src/bin/psql/command.h index 8141201eea2..5064bf505f0 100644 --- a/src/bin/psql/command.h +++ b/src/bin/psql/command.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/command.h,v 1.11 2001/10/25 05:49:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/command.h,v 1.12 2001/10/28 06:25:58 momjian Exp $ */ #ifndef COMMAND_H #define COMMAND_H @@ -16,12 +16,12 @@ typedef enum _backslashResult { - CMD_UNKNOWN = 0,/* not done parsing yet (internal only) */ - CMD_SEND, /* query complete; send off */ - CMD_SKIP_LINE, /* keep building query */ - CMD_TERMINATE, /* quit program */ - CMD_NEWEDIT, /* query buffer was changed (e.g., via \e) */ - CMD_ERROR /* the execution of the backslash command + CMD_UNKNOWN = 0, /* not done parsing yet (internal only) */ + CMD_SEND, /* query complete; send off */ + CMD_SKIP_LINE, /* keep building query */ + CMD_TERMINATE, /* quit program */ + CMD_NEWEDIT, /* query buffer was changed (e.g., via \e) */ + CMD_ERROR /* the execution of the backslash command * resulted in an error */ } backslashResult; @@ -40,4 +40,5 @@ bool do_pset(const char *param, const char *value, printQueryOpt *popt, bool quiet); + #endif /* COMMAND_H */ diff --git a/src/bin/psql/common.h b/src/bin/psql/common.h index 617e4d5a844..bdaa2ec98e1 100644 --- a/src/bin/psql/common.h +++ b/src/bin/psql/common.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.15 2001/10/25 05:49:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.16 2001/10/28 06:25:58 momjian Exp $ */ #ifndef COMMON_H #define COMMON_H @@ -36,4 +36,5 @@ extern void handle_sigint(SIGNAL_ARGS); extern PGresult *PSQLexec(const char *query); extern bool SendQuery(const char *query); + #endif /* COMMON_H */ diff --git a/src/bin/psql/copy.h b/src/bin/psql/copy.h index 3bda9913f3b..c22146707ae 100644 --- a/src/bin/psql/copy.h +++ b/src/bin/psql/copy.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/copy.h,v 1.10 2001/10/25 05:49:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/copy.h,v 1.11 2001/10/28 06:25:58 momjian Exp $ */ #ifndef COPY_H #define COPY_H @@ -19,4 +19,5 @@ bool do_copy(const char *args); bool handleCopyOut(PGconn *conn, FILE *copystream); bool handleCopyIn(PGconn *conn, FILE *copystream, const char *prompt); + #endif diff --git a/src/bin/psql/describe.h b/src/bin/psql/describe.h index 2fc05f9d324..d79bf3988ba 100644 --- a/src/bin/psql/describe.h +++ b/src/bin/psql/describe.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.11 2001/10/25 05:49:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.12 2001/10/28 06:25:58 momjian Exp $ */ #ifndef DESCRIBE_H #define DESCRIBE_H @@ -39,4 +39,5 @@ bool listAllDbs(bool desc); /* \dt, \di, \ds, \dS, etc. */ bool listTables(const char *infotype, const char *name, bool desc); + #endif /* DESCRIBE_H */ diff --git a/src/bin/psql/help.h b/src/bin/psql/help.h index 36cf326a01c..16d09480bf5 100644 --- a/src/bin/psql/help.h +++ b/src/bin/psql/help.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/help.h,v 1.7 2001/10/25 05:49:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/help.h,v 1.8 2001/10/28 06:25:58 momjian Exp $ */ #ifndef HELP_H #define HELP_H @@ -15,4 +15,5 @@ void slashUsage(void); void helpSQL(const char *topic); void print_copyright(void); + #endif diff --git a/src/bin/psql/input.h b/src/bin/psql/input.h index 86caad4f0e0..db8af0de130 100644 --- a/src/bin/psql/input.h +++ b/src/bin/psql/input.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.13 2001/10/25 05:49:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.14 2001/10/28 06:25:58 momjian Exp $ */ #ifndef INPUT_H #define INPUT_H @@ -39,4 +39,5 @@ char *gets_fromFile(FILE *source); void initializeInput(int flags); bool saveHistory(char *fname); + #endif /* INPUT_H */ diff --git a/src/bin/psql/large_obj.h b/src/bin/psql/large_obj.h index 85e708b1a4b..2af4bcbf9f8 100644 --- a/src/bin/psql/large_obj.h +++ b/src/bin/psql/large_obj.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.h,v 1.9 2001/10/25 05:49:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.h,v 1.10 2001/10/28 06:25:58 momjian Exp $ */ #ifndef LARGE_OBJ_H #define LARGE_OBJ_H @@ -12,4 +12,5 @@ bool do_lo_export(const char *loid_arg, const char *filename_arg); bool do_lo_import(const char *filename_arg, const char *comment_arg); bool do_lo_unlink(const char *loid_arg); bool do_lo_list(void); + #endif /* LARGE_OBJ_H */ diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c index f728e4df1f1..3de66712b56 100644 --- a/src/bin/psql/mainloop.c +++ b/src/bin/psql/mainloop.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.41 2001/10/25 05:49:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.42 2001/10/28 06:25:58 momjian Exp $ */ #include "postgres_fe.h" #include "mainloop.h" @@ -393,7 +393,7 @@ MainLoop(FILE *source) line = new; len = strlen(new); - goto rescan; /* reparse the just substituted */ + goto rescan; /* reparse the just substituted */ } else { diff --git a/src/bin/psql/mainloop.h b/src/bin/psql/mainloop.h index 55e0a65fb1f..eadccc1363a 100644 --- a/src/bin/psql/mainloop.h +++ b/src/bin/psql/mainloop.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.h,v 1.11 2001/10/25 05:49:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.h,v 1.12 2001/10/28 06:25:58 momjian Exp $ */ #ifndef MAINLOOP_H #define MAINLOOP_H @@ -17,4 +17,5 @@ extern sigjmp_buf main_loop_jmp; #endif int MainLoop(FILE *source); + #endif /* MAINLOOP_H */ diff --git a/src/bin/psql/mbprint.c b/src/bin/psql/mbprint.c index 1ca86f0e509..b0478eeef8d 100644 --- a/src/bin/psql/mbprint.c +++ b/src/bin/psql/mbprint.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/mbprint.c,v 1.2 2001/10/25 05:49:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/mbprint.c,v 1.3 2001/10/28 06:25:58 momjian Exp $ */ #include "postgres_fe.h" @@ -349,4 +349,5 @@ pg_wcswidth(unsigned char *pwcs, int len) { return len; } + #endif diff --git a/src/bin/psql/mbprint.h b/src/bin/psql/mbprint.h index 4d0cab1b9dc..7a831358068 100644 --- a/src/bin/psql/mbprint.h +++ b/src/bin/psql/mbprint.h @@ -1,4 +1,4 @@ -/* $Id: mbprint.h,v 1.2 2001/10/25 05:49:54 momjian Exp $ */ +/* $Id: mbprint.h,v 1.3 2001/10/28 06:25:58 momjian Exp $ */ #ifndef MBPRINT_H #define MBPRINT_H @@ -13,4 +13,5 @@ unsigned char *mbvalidate(unsigned char *pwcs); #endif /* MULTIBYTE */ int pg_wcswidth(unsigned char *pwcs, int len); + #endif /* MBPRINT_H */ diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h index d469149b694..6223b2721ca 100644 --- a/src/bin/psql/print.h +++ b/src/bin/psql/print.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/print.h,v 1.10 2001/10/25 05:49:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/print.h,v 1.11 2001/10/28 06:25:58 momjian Exp $ */ #ifndef PRINT_H #define PRINT_H @@ -12,12 +12,11 @@ enum printFormat { - PRINT_NOTHING = 0, /* to make sure someone - * initializes this */ - PRINT_UNALIGNED, - PRINT_ALIGNED, - PRINT_HTML, - PRINT_LATEX + PRINT_NOTHING = 0, /* to make sure someone initializes this */ + PRINT_UNALIGNED, + PRINT_ALIGNED, + PRINT_HTML, + PRINT_LATEX /* add your favourite output format here ... */ }; diff --git a/src/bin/psql/prompt.h b/src/bin/psql/prompt.h index 4c2b0a693ba..965f4bb55e0 100644 --- a/src/bin/psql/prompt.h +++ b/src/bin/psql/prompt.h @@ -3,21 +3,22 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/prompt.h,v 1.9 2001/10/25 05:49:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/prompt.h,v 1.10 2001/10/28 06:25:58 momjian Exp $ */ #ifndef PROMPT_H #define PROMPT_H typedef enum _promptStatus { - PROMPT_READY, - PROMPT_CONTINUE, - PROMPT_COMMENT, - PROMPT_SINGLEQUOTE, - PROMPT_DOUBLEQUOTE, - PROMPT_PAREN, - PROMPT_COPY + PROMPT_READY, + PROMPT_CONTINUE, + PROMPT_COMMENT, + PROMPT_SINGLEQUOTE, + PROMPT_DOUBLEQUOTE, + PROMPT_PAREN, + PROMPT_COPY } promptStatus_t; char *get_prompt(promptStatus_t status); + #endif /* PROMPT_H */ diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h index 1be01f445c3..21faca32332 100644 --- a/src/bin/psql/settings.h +++ b/src/bin/psql/settings.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/settings.h,v 1.11 2001/10/25 05:49:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/settings.h,v 1.12 2001/10/28 06:25:58 momjian Exp $ */ #ifndef SETTINGS_H #define SETTINGS_H @@ -69,4 +69,5 @@ extern PsqlSettings pset; #define EXIT_BADCONN 2 #define EXIT_USER 3 + #endif diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 75d04551c33..c1d2dbc993d 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.52 2001/10/25 05:49:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.53 2001/10/28 06:25:58 momjian Exp $ */ #include "postgres_fe.h" @@ -56,11 +56,11 @@ PsqlSettings pset; */ enum _actions { - ACT_NOTHING = 0, - ACT_SINGLE_SLASH, - ACT_LIST_DB, - ACT_SINGLE_QUERY, - ACT_FILE + ACT_NOTHING = 0, + ACT_SINGLE_SLASH, + ACT_LIST_DB, + ACT_SINGLE_QUERY, + ACT_FILE }; struct adhoc_opts @@ -695,4 +695,5 @@ printSSLInfo(void) printf(gettext("SSL connection (cipher: %s, bits: %i)\n\n"), SSL_get_cipher(ssl), sslbits); } + #endif diff --git a/src/bin/psql/stringutils.h b/src/bin/psql/stringutils.h index 2d7bdaa86b9..1feb2e4d068 100644 --- a/src/bin/psql/stringutils.h +++ b/src/bin/psql/stringutils.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/stringutils.h,v 1.15 2001/10/25 05:49:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/stringutils.h,v 1.16 2001/10/28 06:25:58 momjian Exp $ */ #ifndef STRINGUTILS_H #define STRINGUTILS_H @@ -17,4 +17,5 @@ extern char *strtokx(const char *s, char *was_quoted, unsigned int *token_pos, int encoding); + #endif /* STRINGUTILS_H */ diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index 500ded13fef..c7998d1d6d1 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.39 2001/10/25 05:49:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.40 2001/10/28 06:25:58 momjian Exp $ */ /*---------------------------------------------------------------------- @@ -1113,4 +1113,5 @@ dequote_file_name(char *text, char quote_char) return s; } #endif /* 0 */ + #endif /* USE_READLINE */ diff --git a/src/bin/psql/tab-complete.h b/src/bin/psql/tab-complete.h index 7200fd6feb8..fdf40d64f55 100644 --- a/src/bin/psql/tab-complete.h +++ b/src/bin/psql/tab-complete.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.h,v 1.7 2001/10/25 05:49:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.h,v 1.8 2001/10/28 06:25:59 momjian Exp $ */ #ifndef TAB_COMPLETE_H #define TAB_COMPLETE_H @@ -11,4 +11,5 @@ #include "postgres_fe.h" void initialize_readline(void); + #endif diff --git a/src/include/access/attnum.h b/src/include/access/attnum.h index 2339c290308..83173548cb5 100644 --- a/src/include/access/attnum.h +++ b/src/include/access/attnum.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: attnum.h,v 1.13 2001/10/25 05:49:55 momjian Exp $ + * $Id: attnum.h,v 1.14 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -59,4 +59,5 @@ typedef int16 AttrNumber; */ #define AttrOffsetGetAttrNumber(attributeOffset) \ ((AttrNumber) (1 + attributeOffset)) + #endif /* ATTNUM_H */ diff --git a/src/include/access/clog.h b/src/include/access/clog.h index 60589e8bfc9..5710c978286 100644 --- a/src/include/access/clog.h +++ b/src/include/access/clog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: clog.h,v 1.3 2001/10/25 05:49:55 momjian Exp $ + * $Id: clog.h,v 1.4 2001/10/28 06:25:59 momjian Exp $ */ #ifndef CLOG_H #define CLOG_H @@ -46,4 +46,5 @@ extern void TruncateCLOG(TransactionId oldestXact); extern void clog_redo(XLogRecPtr lsn, XLogRecord *record); extern void clog_undo(XLogRecPtr lsn, XLogRecord *record); extern void clog_desc(char *buf, uint8 xl_info, char *rec); + #endif /* CLOG_H */ diff --git a/src/include/access/genam.h b/src/include/access/genam.h index 633fb21dfa7..88c1c06699b 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.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: genam.h,v 1.28 2001/10/25 05:49:55 momjian Exp $ + * $Id: genam.h,v 1.29 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,4 +63,5 @@ extern struct FmgrInfo *index_getprocinfo(Relation irel, AttrNumber attnum, extern IndexScanDesc RelationGetIndexScan(Relation relation, bool scanFromEnd, uint16 numberOfKeys, ScanKey key); extern void IndexScanEnd(IndexScanDesc scan); + #endif /* GENAM_H */ diff --git a/src/include/access/gist.h b/src/include/access/gist.h index e7cff61ee8c..14d45ff2585 100644 --- a/src/include/access/gist.h +++ b/src/include/access/gist.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: gist.h,v 1.33 2001/10/25 05:49:55 momjian Exp $ + * $Id: gist.h,v 1.34 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -184,4 +184,5 @@ extern void gist_desc(char *buf, uint8 xl_info, char *rec); /* gistget.c */ extern Datum gistgettuple(PG_FUNCTION_ARGS); + #endif /* GIST_H */ diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h index ade886b0773..a96c4d5f96e 100644 --- a/src/include/access/gistscan.h +++ b/src/include/access/gistscan.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: gistscan.h,v 1.17 2001/10/25 05:49:55 momjian Exp $ + * $Id: gistscan.h,v 1.18 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,5 @@ extern Datum gistrestrpos(PG_FUNCTION_ARGS); extern Datum gistendscan(PG_FUNCTION_ARGS); extern void gistadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum); extern void AtEOXact_gist(void); + #endif /* GISTSCAN_H */ diff --git a/src/include/access/hash.h b/src/include/access/hash.h index 11950f56644..5d02855e76d 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.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: hash.h,v 1.40 2001/10/25 05:49:55 momjian Exp $ + * $Id: hash.h,v 1.41 2001/10/28 06:25:59 momjian Exp $ * * NOTES * modeled after Margo Seltzer's hash implementation for unix. @@ -81,8 +81,8 @@ typedef struct HashPageOpaqueData bits16 hasho_flag; /* is this page a bucket or ovfl */ Bucket hasho_bucket; /* bucket number this pg belongs to */ OverflowPageAddress hasho_oaddr; /* ovfl address of this ovfl pg */ - BlockNumber hasho_nextblkno; /* next ovfl blkno */ - BlockNumber hasho_prevblkno; /* previous ovfl (or bucket) blkno */ + BlockNumber hasho_nextblkno; /* next ovfl blkno */ + BlockNumber hasho_prevblkno; /* previous ovfl (or bucket) blkno */ } HashPageOpaqueData; typedef HashPageOpaqueData *HashPageOpaque; @@ -150,12 +150,12 @@ typedef struct HashMetaPageData uint16 hashm_bshift; /* bucket shift */ uint16 hashm_bmsize; /* bitmap array size (bytes) - must be a * power of 2 */ - uint32 hashm_maxbucket; /* ID of maximum bucket in use */ + uint32 hashm_maxbucket; /* ID of maximum bucket in use */ uint32 hashm_highmask; /* mask to modulo into entire table */ uint32 hashm_lowmask; /* mask to modulo into lower half of table */ uint32 hashm_ovflpoint;/* pageno. from which ovflpgs being * allocated */ - uint32 hashm_lastfreed; /* last ovflpage freed */ + uint32 hashm_lastfreed; /* last ovflpage freed */ uint32 hashm_nmaps; /* Initial number of bitmaps */ uint32 hashm_spares[NCACHED]; /* spare pages available at * splitpoints */ @@ -327,4 +327,5 @@ extern void _hash_checkpage(Page page, int flags); extern void hash_redo(XLogRecPtr lsn, XLogRecord *record); extern void hash_undo(XLogRecPtr lsn, XLogRecord *record); extern void hash_desc(char *buf, uint8 xl_info, char *rec); + #endif /* HASH_H */ diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index ae51658305d..61fa3afea56 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.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: heapam.h,v 1.69 2001/10/25 05:49:55 momjian Exp $ + * $Id: heapam.h,v 1.70 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -245,4 +245,5 @@ extern HeapTuple heap_addheader(int natts, Size structlen, void *structure); /* in common/heap/stats.c */ extern void PrintHeapAccessStatistics(HeapAccessStatistics stats); extern void initam(void); + #endif /* HEAPAM_H */ diff --git a/src/include/access/hio.h b/src/include/access/hio.h index c6a5eac0e7e..924b3494ea9 100644 --- a/src/include/access/hio.h +++ b/src/include/access/hio.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: hio.h,v 1.20 2001/10/25 05:49:55 momjian Exp $ + * $Id: hio.h,v 1.21 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,5 @@ extern void RelationPutHeapTuple(Relation relation, Buffer buffer, HeapTuple tuple); extern Buffer RelationGetBufferForTuple(Relation relation, Size len, Buffer otherBuffer); + #endif /* HIO_H */ diff --git a/src/include/access/htup.h b/src/include/access/htup.h index 257b9d8a4ab..ed3afc2e743 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.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: htup.h,v 1.49 2001/10/25 05:49:55 momjian Exp $ + * $Id: htup.h,v 1.50 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -275,4 +275,5 @@ typedef HeapTupleData *HeapTuple; #define HeapTupleHasExtended(tuple) \ ((((HeapTuple)(tuple))->t_data->t_infomask & HEAP_HASEXTENDED) != 0) + #endif /* HTUP_H */ diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h index b724bfaa5e6..57b21510199 100644 --- a/src/include/access/ibit.h +++ b/src/include/access/ibit.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: ibit.h,v 1.16 2001/10/25 05:49:55 momjian Exp $ + * $Id: ibit.h,v 1.17 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,5 @@ typedef IndexAttributeBitMapData *IndexAttributeBitMap; * True iff attribute bit map is valid. */ #define IndexAttributeBitMapIsValid(bits) PointerIsValid(bits) + #endif /* IBIT_H */ diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h index 514bec38447..58ee91c07ac 100644 --- a/src/include/access/iqual.h +++ b/src/include/access/iqual.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: iqual.h,v 1.16 2001/10/25 05:49:55 momjian Exp $ + * $Id: iqual.h,v 1.17 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,5 @@ extern int NIndexTupleProcessed; extern bool index_keytest(IndexTuple tuple, TupleDesc tupdesc, int scanKeySize, ScanKey key); + #endif /* IQUAL_H */ diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h index 6f94b8ccc6e..7b88b2f2acd 100644 --- a/src/include/access/istrat.h +++ b/src/include/access/istrat.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: istrat.h,v 1.21 2001/10/25 05:49:55 momjian Exp $ + * $Id: istrat.h,v 1.22 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,4 +63,5 @@ extern void IndexSupportInitialize(IndexStrategy indexStrategy, StrategyNumber maxStrategyNumber, StrategyNumber maxSupportNumber, AttrNumber maxAttributeNumber); + #endif /* ISTRAT_H */ diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index b0e1dd305de..82a4cb285f4 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.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: nbtree.h,v 1.57 2001/10/25 05:49:55 momjian Exp $ + * $Id: nbtree.h,v 1.58 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,11 +44,11 @@ typedef struct BTPageOpaqueData typedef BTPageOpaqueData *BTPageOpaque; /* Bits defined in btpo_flags */ -#define BTP_LEAF (1 << 0)/* leaf page, if not internal page */ -#define BTP_ROOT (1 << 1)/* root page (has no parent) */ -#define BTP_FREE (1 << 2)/* page not in use */ -#define BTP_META (1 << 3)/* meta-page */ -#define BTP_REORDER (1 << 4)/* items need reordering */ +#define BTP_LEAF (1 << 0) /* leaf page, if not internal page */ +#define BTP_ROOT (1 << 1) /* root page (has no parent) */ +#define BTP_FREE (1 << 2) /* page not in use */ +#define BTP_META (1 << 3) /* meta-page */ +#define BTP_REORDER (1 << 4) /* items need reordering */ /* @@ -68,7 +68,7 @@ typedef struct BTMetaPageData ((BTMetaPageData *) &((PageHeader) p)->pd_linp[0]) #define BTREE_METAPAGE 0 /* first page is meta */ -#define BTREE_MAGIC 0x053162/* magic number of btree pages */ +#define BTREE_MAGIC 0x053162 /* magic number of btree pages */ #define BTreeInvalidParent(opaque) \ (opaque->btpo_parent == InvalidBlockNumber || \ @@ -223,14 +223,14 @@ typedef BTStackData *BTStack; * XLOG allows to store some information in high 4 bits of log * record xl_info field */ -#define XLOG_BTREE_DELETE 0x00/* delete btitem */ -#define XLOG_BTREE_INSERT 0x10/* add btitem without split */ -#define XLOG_BTREE_SPLIT 0x20/* add btitem with split */ -#define XLOG_BTREE_SPLEFT 0x30/* as above + flag that new btitem */ +#define XLOG_BTREE_DELETE 0x00 /* delete btitem */ +#define XLOG_BTREE_INSERT 0x10 /* add btitem without split */ +#define XLOG_BTREE_SPLIT 0x20 /* add btitem with split */ +#define XLOG_BTREE_SPLEFT 0x30 /* as above + flag that new btitem */ /* goes to the left sibling */ -#define XLOG_BTREE_NEWROOT 0x40/* new root page */ +#define XLOG_BTREE_NEWROOT 0x40 /* new root page */ -#define XLOG_BTREE_LEAF 0x80/* leaf/internal page was changed */ +#define XLOG_BTREE_LEAF 0x80 /* leaf/internal page was changed */ /* * All what we need to find changed index tuple @@ -398,4 +398,5 @@ extern BTSpool *_bt_spoolinit(Relation index, bool isunique); extern void _bt_spooldestroy(BTSpool *btspool); extern void _bt_spool(BTItem btitem, BTSpool *btspool); extern void _bt_leafbuild(BTSpool *btspool, BTSpool *spool2); + #endif /* NBTREE_H */ diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h index 0f1dbed15b1..68420cd1b98 100644 --- a/src/include/access/printtup.h +++ b/src/include/access/printtup.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: printtup.h,v 1.16 2001/10/25 05:49:55 momjian Exp $ + * $Id: printtup.h,v 1.17 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,5 @@ extern void spi_printtup(HeapTuple tuple, TupleDesc tupdesc, extern bool getTypeOutputInfo(Oid type, Oid *typOutput, Oid *typElem, bool *typIsVarlena); + #endif /* PRINTTUP_H */ diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h index 87e1b36c3fb..e79ad6cdf6d 100644 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.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: relscan.h,v 1.23 2001/10/25 05:49:55 momjian Exp $ + * $Id: relscan.h,v 1.24 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,4 +75,5 @@ typedef IndexScanDesc *IndexScanDescPtr; * True iff the index scan is valid. */ #define IndexScanIsValid(scan) PointerIsValid(scan) + #endif /* RELSCAN_H */ diff --git a/src/include/access/rmgr.h b/src/include/access/rmgr.h index 106370858d1..3ea234f83ef 100644 --- a/src/include/access/rmgr.h +++ b/src/include/access/rmgr.h @@ -3,7 +3,7 @@ * * Resource managers definition * - * $Id: rmgr.h,v 1.7 2001/10/25 05:49:55 momjian Exp $ + * $Id: rmgr.h,v 1.8 2001/10/28 06:25:59 momjian Exp $ */ #ifndef RMGR_H #define RMGR_H @@ -24,4 +24,5 @@ typedef uint8 RmgrId; #define RM_GIST_ID 14 #define RM_SEQ_ID 15 #define RM_MAX_ID RM_SEQ_ID + #endif /* RMGR_H */ diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h index b9737ceeecd..6e605e7016a 100644 --- a/src/include/access/rtree.h +++ b/src/include/access/rtree.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: rtree.h,v 1.25 2001/10/25 05:49:55 momjian Exp $ + * $Id: rtree.h,v 1.26 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -134,4 +134,5 @@ extern void AtEOXact_rtree(void); /* rtstrat.c */ extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum, RegProcedure proc); + #endif /* RTREE_H */ diff --git a/src/include/access/rtscan.h b/src/include/access/rtscan.h index 5cfba8e08f7..af169d007b0 100644 --- a/src/include/access/rtscan.h +++ b/src/include/access/rtscan.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: rtscan.h,v 1.11 2001/10/25 05:49:55 momjian Exp $ + * $Id: rtscan.h,v 1.12 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,4 +19,5 @@ #include "utils/rel.h" void rtadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum); + #endif /* RTSCAN_H */ diff --git a/src/include/access/sdir.h b/src/include/access/sdir.h index 3caa8b3ae42..05a72b50324 100644 --- a/src/include/access/sdir.h +++ b/src/include/access/sdir.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: sdir.h,v 1.10 2001/10/25 05:49:55 momjian Exp $ + * $Id: sdir.h,v 1.11 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,9 +21,9 @@ */ typedef enum ScanDirection { - BackwardScanDirection = -1, - NoMovementScanDirection = 0, - ForwardScanDirection = 1 + BackwardScanDirection = -1, + NoMovementScanDirection = 0, + ForwardScanDirection = 1 } ScanDirection; /* @@ -54,4 +54,5 @@ typedef enum ScanDirection */ #define ScanDirectionIsForward(direction) \ ((bool) ((direction) == ForwardScanDirection)) + #endif /* SDIR_H */ diff --git a/src/include/access/skey.h b/src/include/access/skey.h index 45061e38ffe..8a2dc2c3fb5 100644 --- a/src/include/access/skey.h +++ b/src/include/access/skey.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: skey.h,v 1.18 2001/10/25 05:49:55 momjian Exp $ + * $Id: skey.h,v 1.19 2001/10/28 06:25:59 momjian Exp $ * * Note: * Needs more accessor/assignment routines. @@ -47,4 +47,5 @@ extern void ScanKeyEntryInitialize(ScanKey entry, bits16 flags, extern void ScanKeyEntryInitializeWithInfo(ScanKey entry, bits16 flags, AttrNumber attributeNumber, FmgrInfo *finfo, MemoryContext mcxt, Datum argument); + #endif /* SKEY_H */ diff --git a/src/include/access/strat.h b/src/include/access/strat.h index 7c376ac37c2..9470c5664fc 100644 --- a/src/include/access/strat.h +++ b/src/include/access/strat.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: strat.h,v 1.23 2001/10/25 05:49:55 momjian Exp $ + * $Id: strat.h,v 1.24 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -86,4 +86,5 @@ typedef struct IndexStrategyData } IndexStrategyData; /* VARIABLE LENGTH STRUCTURE */ typedef IndexStrategyData *IndexStrategy; + #endif /* STRAT_H */ diff --git a/src/include/access/transam.h b/src/include/access/transam.h index e8fc34fd909..2e22b69fa7d 100644 --- a/src/include/access/transam.h +++ b/src/include/access/transam.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: transam.h,v 1.42 2001/10/25 05:49:55 momjian Exp $ + * $Id: transam.h,v 1.43 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -121,4 +121,5 @@ extern bool AMI_OVERRIDE; /* in varsup.c */ extern VariableCache ShmemVariableCache; + #endif /* TRAMSAM_H */ diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index afb96c37a3e..e4f9dd0d3a7 100644 --- a/src/include/access/tupdesc.h +++ b/src/include/access/tupdesc.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: tupdesc.h,v 1.31 2001/10/25 05:49:55 momjian Exp $ + * $Id: tupdesc.h,v 1.32 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -74,4 +74,5 @@ extern bool TupleDescInitEntry(TupleDesc desc, bool attisset); extern TupleDesc BuildDescForRelation(List *schema, char *relname); + #endif /* TUPDESC_H */ diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h index 97fb618ce1b..0d5606390dd 100644 --- a/src/include/access/tupmacs.h +++ b/src/include/access/tupmacs.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: tupmacs.h,v 1.18 2001/10/25 05:49:55 momjian Exp $ + * $Id: tupmacs.h,v 1.19 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -179,4 +179,5 @@ } \ } while (0) #endif /* SIZEOF_DATUM == 8 */ + #endif diff --git a/src/include/access/valid.h b/src/include/access/valid.h index d1e32602a3c..4b051531472 100644 --- a/src/include/access/valid.h +++ b/src/include/access/valid.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: valid.h,v 1.24 2001/10/25 05:49:55 momjian Exp $ + * $Id: valid.h,v 1.25 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -130,4 +130,5 @@ do \ (tuple)->t_data = NULL; \ } \ } while (0) + #endif /* VALID_H */ diff --git a/src/include/access/xact.h b/src/include/access/xact.h index f85e21eee4a..c6297aa01c9 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.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: xact.h,v 1.39 2001/10/25 05:49:55 momjian Exp $ + * $Id: xact.h,v 1.40 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -134,4 +134,5 @@ extern Datum xidin(PG_FUNCTION_ARGS); extern Datum xidout(PG_FUNCTION_ARGS); extern Datum xideq(PG_FUNCTION_ARGS); extern Datum xid_age(PG_FUNCTION_ARGS); + #endif /* XACT_H */ diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index 04bb18b2e5d..b3f54097a9f 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xlog.h,v 1.26 2001/10/25 05:49:56 momjian Exp $ + * $Id: xlog.h,v 1.27 2001/10/28 06:25:59 momjian Exp $ */ #ifndef XLOG_H #define XLOG_H @@ -215,4 +215,5 @@ extern XLogRecPtr GetUndoRecPtr(void); extern bool check_xlog_sync_method(const char *method); extern void assign_xlog_sync_method(const char *method); + #endif /* XLOG_H */ diff --git a/src/include/access/xlogdefs.h b/src/include/access/xlogdefs.h index c2d1f2168e6..5e14710aa7c 100644 --- a/src/include/access/xlogdefs.h +++ b/src/include/access/xlogdefs.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: xlogdefs.h,v 1.5 2001/10/25 05:49:56 momjian Exp $ + * $Id: xlogdefs.h,v 1.6 2001/10/28 06:25:59 momjian Exp $ */ #ifndef XLOG_DEFS_H #define XLOG_DEFS_H @@ -55,4 +55,5 @@ typedef struct XLogRecPtr * pg_clog after shutdown, in future. */ typedef uint32 StartUpID; + #endif /* XLOG_DEFS_H */ diff --git a/src/include/access/xlogutils.h b/src/include/access/xlogutils.h index b49bcbe1341..9a96b0f6ed6 100644 --- a/src/include/access/xlogutils.h +++ b/src/include/access/xlogutils.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xlogutils.h,v 1.9 2001/10/25 05:49:56 momjian Exp $ + * $Id: xlogutils.h,v 1.10 2001/10/28 06:25:59 momjian Exp $ */ #ifndef XLOG_UTILS_H #define XLOG_UTILS_H @@ -25,4 +25,5 @@ extern void XLogCloseRelationCache(void); extern Relation XLogOpenRelation(bool redo, RmgrId rmid, RelFileNode rnode); extern Buffer XLogReadBuffer(bool extend, Relation reln, BlockNumber blkno); + #endif diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h index 0388e9ecda3..63fd93e483b 100644 --- a/src/include/bootstrap/bootstrap.h +++ b/src/include/bootstrap/bootstrap.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: bootstrap.h,v 1.24 2001/10/25 05:49:56 momjian Exp $ + * $Id: bootstrap.h,v 1.25 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,4 +62,5 @@ extern void Int_yyerror(const char *str); #define BS_XLOG_STARTUP 2 #define BS_XLOG_CHECKPOINT 3 #define BS_XLOG_SHUTDOWN 4 + #endif /* BOOTSTRAP_H */ diff --git a/src/include/c.h b/src/include/c.h index 0d129180a51..10385c04bf4 100644 --- a/src/include/c.h +++ b/src/include/c.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: c.h,v 1.106 2001/10/25 05:49:54 momjian Exp $ + * $Id: c.h,v 1.107 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -645,4 +645,5 @@ extern int vsnprintf(char *str, size_t count, const char *fmt, va_list args); * end of c.h * ---------------- */ + #endif /* C_H */ diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h index 30ae2bbd2e5..182c3039116 100644 --- a/src/include/catalog/catalog.h +++ b/src/include/catalog/catalog.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: catalog.h,v 1.18 2001/10/25 05:49:56 momjian Exp $ + * $Id: catalog.h,v 1.19 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,4 +25,5 @@ extern bool IsSystemRelationName(const char *relname); extern bool IsSharedSystemRelationName(const char *relname); extern Oid newoid(void); + #endif /* CATALOG_H */ diff --git a/src/include/catalog/catname.h b/src/include/catalog/catname.h index a00d6fd9505..b50e6a00b98 100644 --- a/src/include/catalog/catname.h +++ b/src/include/catalog/catname.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: catname.h,v 1.21 2001/10/25 05:49:56 momjian Exp $ + * $Id: catname.h,v 1.22 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,4 +43,5 @@ #define TriggerRelationName "pg_trigger" extern char *SharedSystemRelationNames[]; + #endif /* CATNAME_H */ diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index dedd4695162..27be36fed03 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catversion.h,v 1.101 2001/10/25 14:10:06 tgl Exp $ + * $Id: catversion.h,v 1.102 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -54,4 +54,5 @@ /* yyyymmddN */ #define CATALOG_VERSION_NO 200110251 + #endif diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h index e849ae28d69..cf3c8de0ea5 100644 --- a/src/include/catalog/heap.h +++ b/src/include/catalog/heap.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: heap.h,v 1.39 2001/10/25 05:49:56 momjian Exp $ + * $Id: heap.h,v 1.40 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -52,4 +52,5 @@ extern Form_pg_attribute SystemAttributeDefinition(AttrNumber attno, extern Form_pg_attribute SystemAttributeByName(const char *attname, bool relhasoids); + #endif /* HEAP_H */ diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index 82f30ea4c3a..9fc4fa66fbc 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.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: index.h,v 1.41 2001/10/25 05:49:56 momjian Exp $ + * $Id: index.h,v 1.42 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -71,4 +71,5 @@ extern double IndexBuildHeapScan(Relation heapRelation, extern bool reindex_index(Oid indexId, bool force, bool inplace); extern bool activate_indexes_of_a_table(Oid relid, bool activate); extern bool reindex_relation(Oid relid, bool force); + #endif /* INDEX_H */ diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h index 11d56f5d9f8..d75364e41da 100644 --- a/src/include/catalog/indexing.h +++ b/src/include/catalog/indexing.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: indexing.h,v 1.54 2001/10/25 05:49:56 momjian Exp $ + * $Id: indexing.h,v 1.55 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -196,4 +196,5 @@ DECLARE_UNIQUE_INDEX(pg_type_typname_index on pg_type using btree(typname name_o /* last step of initialization script: build the indices declared above */ BUILD_INDICES + #endif /* INDEXING_H */ diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h index 5aa5dc3c378..f20ac5332a7 100644 --- a/src/include/catalog/pg_aggregate.h +++ b/src/include/catalog/pg_aggregate.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_aggregate.h,v 1.33 2001/10/25 05:49:56 momjian Exp $ + * $Id: pg_aggregate.h,v 1.34 2001/10/28 06:25:59 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -164,4 +164,5 @@ extern void AggregateCreate(char *aggName, extern Datum AggNameGetInitVal(char *aggName, Oid basetype, bool *isNull); + #endif /* PG_AGGREGATE_H */ diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h index 21859dda6c6..3037911124c 100644 --- a/src/include/catalog/pg_am.h +++ b/src/include/catalog/pg_am.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_am.h,v 1.19 2001/10/25 05:49:56 momjian Exp $ + * $Id: pg_am.h,v 1.20 2001/10/28 06:25:59 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -107,4 +107,5 @@ DATA(insert OID = 405 ( hash PGUID 1 1 0 f f f t hashgettuple hashinsert hashbe DESCR("hash index access method"); DATA(insert OID = 783 ( gist PGUID 100 7 0 f t f f gistgettuple gistinsert gistbeginscan gistrescan gistendscan gistmarkpos gistrestrpos gistbuild gistbulkdelete gistcostestimate )); DESCR("GiST index access method"); + #endif /* PG_AM_H */ diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h index 97331dbbc21..9b2c0709a52 100644 --- a/src/include/catalog/pg_amop.h +++ b/src/include/catalog/pg_amop.h @@ -16,7 +16,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_amop.h,v 1.43 2001/10/25 05:49:56 momjian Exp $ + * $Id: pg_amop.h,v 1.44 2001/10/28 06:25:59 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -425,4 +425,5 @@ DATA(insert ( 2001 1 f 1550 )); DATA(insert ( 2004 1 f 1062 )); /* timestamp_ops */ DATA(insert ( 2040 1 f 2060 )); + #endif /* PG_AMOP_H */ diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h index 38a98d28fda..dda8fbc3a50 100644 --- a/src/include/catalog/pg_amproc.h +++ b/src/include/catalog/pg_amproc.h @@ -14,7 +14,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_amproc.h,v 1.32 2001/10/25 05:49:56 momjian Exp $ + * $Id: pg_amproc.h,v 1.33 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -129,4 +129,5 @@ DATA(insert ( 1999 1 452 )); DATA(insert ( 2001 1 1696 )); DATA(insert ( 2004 1 456 )); DATA(insert ( 2040 1 452 )); + #endif /* PG_AMPROC_H */ diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h index 8ed26ccdfca..7a3759f6428 100644 --- a/src/include/catalog/pg_attribute.h +++ b/src/include/catalog/pg_attribute.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_attribute.h,v 1.77 2001/10/25 05:49:56 momjian Exp $ + * $Id: pg_attribute.h,v 1.78 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -485,4 +485,5 @@ DATA(insert ( 1259 tableoid 26 0 4 -7 0 -1 -1 t p f i f f)); * ---------------- */ DATA(insert ( 376 xactlockfoo 26 0 4 1 0 -1 -1 t p f i f f)); + #endif /* PG_ATTRIBUTE_H */ diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h index e6dfb30f642..f5e86ec212f 100644 --- a/src/include/catalog/pg_class.h +++ b/src/include/catalog/pg_class.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_class.h,v 1.55 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_class.h,v 1.56 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -167,4 +167,5 @@ DESCR(""); #define RELKIND_UNCATALOGED 'u' /* temporary heap */ #define RELKIND_TOASTVALUE 't' /* moved off huge values */ #define RELKIND_VIEW 'v' /* view */ + #endif /* PG_CLASS_H */ diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h index b701e2b5112..a0646f7b2e1 100644 --- a/src/include/catalog/pg_control.h +++ b/src/include/catalog/pg_control.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_control.h,v 1.4 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_control.h,v 1.5 2001/10/28 06:26:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,11 +51,11 @@ typedef struct CheckPoint /* System status indicator */ typedef enum DBState { - DB_STARTUP = 0, - DB_SHUTDOWNED, - DB_SHUTDOWNING, - DB_IN_RECOVERY, - DB_IN_PRODUCTION + DB_STARTUP = 0, + DB_SHUTDOWNED, + DB_SHUTDOWNING, + DB_IN_RECOVERY, + DB_IN_PRODUCTION } DBState; #define LOCALE_NAME_BUFLEN 128 @@ -110,4 +110,5 @@ typedef struct ControlFileData char lc_collate[LOCALE_NAME_BUFLEN]; char lc_ctype[LOCALE_NAME_BUFLEN]; } ControlFileData; + #endif /* PG_CONTROL_H */ diff --git a/src/include/catalog/pg_database.h b/src/include/catalog/pg_database.h index 439e4fcc3dc..1efad4ee0f9 100644 --- a/src/include/catalog/pg_database.h +++ b/src/include/catalog/pg_database.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_database.h,v 1.19 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_database.h,v 1.20 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -78,4 +78,5 @@ DATAMARKOID(= 2) #define RecoveryDb 2 #undef DATAMARKOID + #endif /* PG_DATABASE_H */ diff --git a/src/include/catalog/pg_description.h b/src/include/catalog/pg_description.h index e8b304ba3be..d6c49357f38 100644 --- a/src/include/catalog/pg_description.h +++ b/src/include/catalog/pg_description.h @@ -22,7 +22,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_description.h,v 1.14 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_description.h,v 1.15 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -83,4 +83,5 @@ typedef FormData_pg_description *Form_pg_description; * there is no initialization here. The initial contents are extracted * by genbki.sh and loaded during initdb. */ + #endif /* PG_DESCRIPTION_H */ diff --git a/src/include/catalog/pg_group.h b/src/include/catalog/pg_group.h index 1c4ef4e97fb..f66cecc5ccc 100644 --- a/src/include/catalog/pg_group.h +++ b/src/include/catalog/pg_group.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: pg_group.h,v 1.11 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_group.h,v 1.12 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -40,4 +40,5 @@ typedef FormData_pg_group *Form_pg_group; #define Anum_pg_group_groname 1 #define Anum_pg_group_grosysid 2 #define Anum_pg_group_grolist 3 + #endif /* PG_GROUP_H */ diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h index 3a0a60ffd6d..0dc7c0c0d25 100644 --- a/src/include/catalog/pg_index.h +++ b/src/include/catalog/pg_index.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_index.h,v 1.25 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_index.h,v 1.26 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -71,4 +71,5 @@ typedef FormData_pg_index *Form_pg_index; #define Anum_pg_index_indisprimary 8 #define Anum_pg_index_indreference 9 #define Anum_pg_index_indpred 10 + #endif /* PG_INDEX_H */ diff --git a/src/include/catalog/pg_largeobject.h b/src/include/catalog/pg_largeobject.h index 2369e15ff29..54a3c4eca2c 100644 --- a/src/include/catalog/pg_largeobject.h +++ b/src/include/catalog/pg_largeobject.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_largeobject.h,v 1.10 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_largeobject.h,v 1.11 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -58,4 +58,5 @@ typedef FormData_pg_largeobject *Form_pg_largeobject; extern void LargeObjectCreate(Oid loid); extern void LargeObjectDrop(Oid loid); extern bool LargeObjectExists(Oid loid); + #endif /* PG_LARGEOBJECT_H */ diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h index b8e4625c153..7832b924259 100644 --- a/src/include/catalog/pg_opclass.h +++ b/src/include/catalog/pg_opclass.h @@ -26,7 +26,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_opclass.h,v 1.41 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_opclass.h,v 1.42 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -136,4 +136,5 @@ DATA(insert OID = 2003 ( 403 varchar_ops 1043 t 0 )); DATA(insert OID = 2004 ( 405 varchar_ops 1043 t 0 )); DATA(insert OID = 2039 ( 403 timestamp_ops 1114 t 0 )); DATA(insert OID = 2040 ( 405 timestamp_ops 1114 t 0 )); + #endif /* PG_OPCLASS_H */ diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h index 8966c1f3205..45ed8f0ae05 100644 --- a/src/include/catalog/pg_operator.h +++ b/src/include/catalog/pg_operator.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_operator.h,v 1.97 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_operator.h,v 1.98 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -856,4 +856,5 @@ extern void OperatorCreate(char *operatorName, bool canHash, char *leftSortName, char *rightSortName); + #endif /* PG_OPERATOR_H */ diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index a504206ba49..82504373539 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.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: pg_proc.h,v 1.219 2001/10/25 14:10:06 tgl Exp $ + * $Id: pg_proc.h,v 1.220 2001/10/28 06:26:04 momjian Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -2888,4 +2888,5 @@ extern Oid ProcedureCreate(char *procedureName, int32 percall_cpu, int32 outin_ratio, List *argList); + #endif /* PG_PROC_H */ diff --git a/src/include/catalog/pg_relcheck.h b/src/include/catalog/pg_relcheck.h index 6ec5addb807..86268f578e9 100644 --- a/src/include/catalog/pg_relcheck.h +++ b/src/include/catalog/pg_relcheck.h @@ -51,4 +51,5 @@ typedef FormData_pg_relcheck *Form_pg_relcheck; #define Anum_pg_relcheck_rcname 2 #define Anum_pg_relcheck_rcbin 3 #define Anum_pg_relcheck_rcsrc 4 + #endif /* PG_RELCHECK_H */ diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h index 5870ed4e83f..7fac72b00f5 100644 --- a/src/include/catalog/pg_rewrite.h +++ b/src/include/catalog/pg_rewrite.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_rewrite.h,v 1.15 2001/10/25 05:49:58 momjian Exp $ + * $Id: pg_rewrite.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -63,4 +63,5 @@ typedef FormData_pg_rewrite *Form_pg_rewrite; #define Anum_pg_rewrite_is_instead 5 #define Anum_pg_rewrite_ev_qual 6 #define Anum_pg_rewrite_ev_action 7 + #endif /* PG_REWRITE_H */ diff --git a/src/include/catalog/pg_shadow.h b/src/include/catalog/pg_shadow.h index 8198b2a44ad..a0a95d8c3b8 100644 --- a/src/include/catalog/pg_shadow.h +++ b/src/include/catalog/pg_shadow.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_shadow.h,v 1.15 2001/10/25 05:49:58 momjian Exp $ + * $Id: pg_shadow.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -72,4 +72,5 @@ typedef FormData_pg_shadow *Form_pg_shadow; DATA(insert ( "POSTGRES" PGUID t t t t _null_ _null_ )); #define BOOTSTRAP_USESYSID 1 + #endif /* PG_SHADOW_H */ diff --git a/src/include/catalog/pg_statistic.h b/src/include/catalog/pg_statistic.h index 920e29c4396..25e56bbdbcd 100644 --- a/src/include/catalog/pg_statistic.h +++ b/src/include/catalog/pg_statistic.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_statistic.h,v 1.13 2001/10/25 05:49:58 momjian Exp $ + * $Id: pg_statistic.h,v 1.14 2001/10/28 06:26:06 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -205,4 +205,5 @@ typedef FormData_pg_statistic *Form_pg_statistic; * their actual tuple positions. The coefficient ranges from +1 to -1. */ #define STATISTIC_KIND_CORRELATION 3 + #endif /* PG_STATISTIC_H */ diff --git a/src/include/catalog/pg_trigger.h b/src/include/catalog/pg_trigger.h index b63fe7d2693..220c32f1198 100644 --- a/src/include/catalog/pg_trigger.h +++ b/src/include/catalog/pg_trigger.h @@ -92,4 +92,5 @@ typedef FormData_pg_trigger *Form_pg_trigger; #define TRIGGER_FOR_INSERT(type) (type & TRIGGER_TYPE_INSERT) #define TRIGGER_FOR_DELETE(type) (type & TRIGGER_TYPE_DELETE) #define TRIGGER_FOR_UPDATE(type) (type & TRIGGER_TYPE_UPDATE) + #endif /* PG_TRIGGER_H */ diff --git a/src/include/commands/async.h b/src/include/commands/async.h index ccc6a3636bd..3b9fc3c75f2 100644 --- a/src/include/commands/async.h +++ b/src/include/commands/async.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: async.h,v 1.18 2001/10/25 05:49:58 momjian Exp $ + * $Id: async.h,v 1.19 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,4 +35,5 @@ extern void Async_NotifyHandler(SIGNAL_ARGS); */ extern void EnableNotifyInterrupt(void); extern void DisableNotifyInterrupt(void); + #endif /* ASYNC_H */ diff --git a/src/include/commands/cluster.h b/src/include/commands/cluster.h index cafb18ff54d..e832b880d7a 100644 --- a/src/include/commands/cluster.h +++ b/src/include/commands/cluster.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $Id: cluster.h,v 1.10 2001/10/25 05:49:58 momjian Exp $ + * $Id: cluster.h,v 1.11 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,4 +24,5 @@ * functions */ extern void cluster(char *oldrelname, char *oldindexname); + #endif /* CLUSTER_H */ diff --git a/src/include/commands/command.h b/src/include/commands/command.h index 95530fda35a..ef9aa86ee97 100644 --- a/src/include/commands/command.h +++ b/src/include/commands/command.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: command.h,v 1.29 2001/10/25 05:49:58 momjian Exp $ + * $Id: command.h,v 1.30 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -71,4 +71,5 @@ extern void AlterTableOwner(const char *relationName, const char *newOwnerName); * LOCK */ extern void LockTableCommand(LockStmt *lockstmt); + #endif /* COMMAND_H */ diff --git a/src/include/commands/comment.h b/src/include/commands/comment.h index 410c6dc7f68..371f918b6e8 100644 --- a/src/include/commands/comment.h +++ b/src/include/commands/comment.h @@ -31,4 +31,5 @@ extern void CommentObject(int objtype, char *objname, char *objproperty, extern void DeleteComments(Oid oid, Oid classoid); extern void CreateComments(Oid oid, Oid classoid, int32 subid, char *comment); + #endif /* COMMENT_H */ diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h index 04ca68668df..19aced3e6af 100644 --- a/src/include/commands/copy.h +++ b/src/include/commands/copy.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: copy.h,v 1.14 2001/10/25 05:49:58 momjian Exp $ + * $Id: copy.h,v 1.15 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,4 +18,5 @@ extern int copy_lineno; void DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe, char *filename, char *delim, char *null_print); + #endif /* COPY_H */ diff --git a/src/include/commands/creatinh.h b/src/include/commands/creatinh.h index fd1db12fd95..2b4cf731011 100644 --- a/src/include/commands/creatinh.h +++ b/src/include/commands/creatinh.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: creatinh.h,v 1.15 2001/10/25 05:49:58 momjian Exp $ + * $Id: creatinh.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,4 +19,5 @@ extern void DefineRelation(CreateStmt *stmt, char relkind); extern void RemoveRelation(char *name); extern void TruncateRelation(char *name); + #endif /* CREATINH_H */ diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h index 3489b9d2792..bb8f2828c9d 100644 --- a/src/include/commands/dbcommands.h +++ b/src/include/commands/dbcommands.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: dbcommands.h,v 1.17 2001/10/25 05:49:58 momjian Exp $ + * $Id: dbcommands.h,v 1.18 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,5 @@ extern void createdb(const char *dbname, const char *dbpath, const char *dbtemplate, int encoding); extern void dropdb(const char *dbname); + #endif /* DBCOMMANDS_H */ diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h index 52b760a4bf8..9b83f2f0253 100644 --- a/src/include/commands/defrem.h +++ b/src/include/commands/defrem.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: defrem.h,v 1.26 2001/10/25 05:49:58 momjian Exp $ + * $Id: defrem.h,v 1.27 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -48,4 +48,5 @@ extern void RemoveOperator(char *operatorName, char *typeName1, char *typeName2); extern void RemoveType(char *typeName); extern void RemoveAggregate(char *aggName, char *aggType); + #endif /* DEFREM_H */ diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h index 013ae16596e..f52b75641ea 100644 --- a/src/include/commands/explain.h +++ b/src/include/commands/explain.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $Id: explain.h,v 1.13 2001/10/25 05:49:58 momjian Exp $ + * $Id: explain.h,v 1.14 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,5 @@ #include "tcop/dest.h" extern void ExplainQuery(Query *query, bool verbose, bool analyze, CommandDest dest); + #endif /* EXPLAIN_H */ diff --git a/src/include/commands/proclang.h b/src/include/commands/proclang.h index 29dcb32a127..42276055e6c 100644 --- a/src/include/commands/proclang.h +++ b/src/include/commands/proclang.h @@ -13,4 +13,5 @@ extern void CreateProceduralLanguage(CreatePLangStmt *stmt); extern void DropProceduralLanguage(DropPLangStmt *stmt); + #endif /* PROCLANG_H */ diff --git a/src/include/commands/rename.h b/src/include/commands/rename.h index 18b6d1e2bb7..6717c47453f 100644 --- a/src/include/commands/rename.h +++ b/src/include/commands/rename.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: rename.h,v 1.11 2001/10/25 05:49:58 momjian Exp $ + * $Id: rename.h,v 1.12 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern void renameatt(char *relname, extern void renamerel(const char *oldrelname, const char *newrelname); + #endif /* RENAME_H */ diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h index a128491212b..4b7a73b377f 100644 --- a/src/include/commands/sequence.h +++ b/src/include/commands/sequence.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sequence.h,v 1.17 2001/10/25 05:49:58 momjian Exp $ + * $Id: sequence.h,v 1.18 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -89,4 +89,5 @@ extern void CloseSequences(void); extern void seq_redo(XLogRecPtr lsn, XLogRecord *rptr); extern void seq_undo(XLogRecPtr lsn, XLogRecord *rptr); extern void seq_desc(char *buf, uint8 xl_info, char *rec); + #endif /* SEQUENCE_H */ diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h index 6ab58804132..c24fff9d2f6 100644 --- a/src/include/commands/trigger.h +++ b/src/include/commands/trigger.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: trigger.h,v 1.28 2001/10/25 05:49:58 momjian Exp $ + * $Id: trigger.h,v 1.29 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -160,4 +160,5 @@ extern void DeferredTriggerSetState(ConstraintsSetStmt *stmt); * */ extern bool RI_FKey_keyequal_upd(TriggerData *trigdata); + #endif /* TRIGGER_H */ diff --git a/src/include/commands/user.h b/src/include/commands/user.h index 080c8f0c785..03e8fc6e266 100644 --- a/src/include/commands/user.h +++ b/src/include/commands/user.h @@ -3,7 +3,7 @@ * user.h * * - * $Id: user.h,v 1.14 2001/10/25 05:49:58 momjian Exp $ + * $Id: user.h,v 1.15 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern void AlterGroup(AlterGroupStmt *stmt, const char *tag); extern void DropGroup(DropGroupStmt *stmt); extern Datum update_pg_pwd(PG_FUNCTION_ARGS); + #endif /* USER_H */ diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h index ed873c86402..b575f79e994 100644 --- a/src/include/commands/vacuum.h +++ b/src/include/commands/vacuum.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: vacuum.h,v 1.41 2001/10/25 05:49:58 momjian Exp $ + * $Id: vacuum.h,v 1.42 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,4 +56,5 @@ extern void lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt); /* in commands/analyze.c */ extern void analyze_rel(Oid relid, VacuumStmt *vacstmt); + #endif /* VACUUM_H */ diff --git a/src/include/commands/variable.h b/src/include/commands/variable.h index c1eb655d9da..6ab15a43a36 100644 --- a/src/include/commands/variable.h +++ b/src/include/commands/variable.h @@ -2,7 +2,7 @@ * Headers for handling of 'SET var TO', 'SHOW var' and 'RESET var' * statements * - * $Id: variable.h,v 1.15 2001/10/25 05:49:59 momjian Exp $ + * $Id: variable.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ * */ #ifndef VARIABLE_H @@ -14,4 +14,5 @@ extern void ResetPGVariable(const char *name); extern void set_default_datestyle(void); extern void set_default_client_encoding(void); + #endif /* VARIABLE_H */ diff --git a/src/include/commands/version.h b/src/include/commands/version.h index 18e9a3b2f38..dedd5cfa458 100644 --- a/src/include/commands/version.h +++ b/src/include/commands/version.h @@ -7,10 +7,11 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: version.h,v 1.10 2001/10/25 05:49:59 momjian Exp $ + * $Id: version.h,v 1.11 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef VERSION_H #define VERSION_H + #endif /* VERSION_H */ diff --git a/src/include/commands/view.h b/src/include/commands/view.h index d75464ec09d..74c21b80e51 100644 --- a/src/include/commands/view.h +++ b/src/include/commands/view.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: view.h,v 1.11 2001/10/25 05:49:59 momjian Exp $ + * $Id: view.h,v 1.12 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,4 +18,5 @@ extern void DefineView(char *view_name, Query *view_parse); extern void RemoveView(char *view_name); + #endif /* VIEW_H */ diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h index 92ca247d29e..45e4f76b351 100644 --- a/src/include/executor/execdebug.h +++ b/src/include/executor/execdebug.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: execdebug.h,v 1.17 2001/10/25 05:49:59 momjian Exp $ + * $Id: execdebug.h,v 1.18 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -297,4 +297,5 @@ extern int NIndexTupleInserted; extern long NDirectFileRead; extern long NDirectFileWrite; + #endif /* ExecDebugIncluded */ diff --git a/src/include/executor/execdefs.h b/src/include/executor/execdefs.h index 857e3db2c82..0a5fb38f18b 100644 --- a/src/include/executor/execdefs.h +++ b/src/include/executor/execdefs.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: execdefs.h,v 1.9 2001/10/25 05:49:59 momjian Exp $ + * $Id: execdefs.h,v 1.10 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -50,4 +50,5 @@ #define EXEC_MJ_SKIPINNER_ADVANCE 13 #define EXEC_MJ_ENDOUTER 14 #define EXEC_MJ_ENDINNER 15 + #endif /* EXECDEFS_H */ diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h index 4232f6d2b46..297de04846d 100644 --- a/src/include/executor/execdesc.h +++ b/src/include/executor/execdesc.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execdesc.h,v 1.15 2001/10/25 05:49:59 momjian Exp $ + * $Id: execdesc.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,4 +36,5 @@ typedef struct QueryDesc /* in pquery.c */ extern QueryDesc *CreateQueryDesc(Query *parsetree, Plan *plantree, CommandDest dest); + #endif /* EXECDESC_H */ diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 05f31e10b55..c47fec77ae0 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.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: executor.h,v 1.59 2001/10/25 05:49:59 momjian Exp $ + * $Id: executor.h,v 1.60 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -177,4 +177,5 @@ extern void ExecOpenIndices(ResultRelInfo *resultRelInfo); extern void ExecCloseIndices(ResultRelInfo *resultRelInfo); extern void ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid, EState *estate, bool is_update); + #endif /* EXECUTOR_H */ diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h index dc98d50f2c0..f436f06e381 100644 --- a/src/include/executor/functions.h +++ b/src/include/executor/functions.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: functions.h,v 1.16 2001/10/25 05:49:59 momjian Exp $ + * $Id: functions.h,v 1.17 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,5 @@ #include "fmgr.h" extern Datum fmgr_sql(PG_FUNCTION_ARGS); + #endif /* FUNCTIONS_H */ diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h index 9f8b7417947..d573a5ef47d 100644 --- a/src/include/executor/hashjoin.h +++ b/src/include/executor/hashjoin.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: hashjoin.h,v 1.23 2001/10/25 05:49:59 momjian Exp $ + * $Id: hashjoin.h,v 1.24 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -92,4 +92,5 @@ typedef struct HashTableData } HashTableData; typedef HashTableData *HashJoinTable; + #endif /* HASHJOIN_H */ diff --git a/src/include/executor/instrument.h b/src/include/executor/instrument.h index 152d5444a78..dbbc03fa8be 100644 --- a/src/include/executor/instrument.h +++ b/src/include/executor/instrument.h @@ -6,7 +6,7 @@ * * Copyright (c) 2001, PostgreSQL Global Development Group * - * $Id: instrument.h,v 1.2 2001/10/25 05:49:59 momjian Exp $ + * $Id: instrument.h,v 1.3 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,4 +35,5 @@ extern Instrumentation *InstrAlloc(void); extern void InstrStartNode(Instrumentation *instr); extern void InstrStopNode(Instrumentation *instr, bool returnedTuple); extern void InstrEndLoop(Instrumentation *instr); + #endif /* INSTRUMENT_H */ diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h index 90643c58ccd..e016005f8e5 100644 --- a/src/include/executor/nodeAgg.h +++ b/src/include/executor/nodeAgg.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: nodeAgg.h,v 1.13 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeAgg.h,v 1.14 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern bool ExecInitAgg(Agg *node, EState *estate, Plan *parent); extern int ExecCountSlotsAgg(Agg *node); extern void ExecEndAgg(Agg *node); extern void ExecReScanAgg(Agg *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODEAGG_H */ diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h index 3cd54021a55..60f0f0a0a88 100644 --- a/src/include/executor/nodeAppend.h +++ b/src/include/executor/nodeAppend.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: nodeAppend.h,v 1.14 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeAppend.h,v 1.15 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern int ExecCountSlotsAppend(Append *node); extern TupleTableSlot *ExecProcAppend(Append *node); extern void ExecEndAppend(Append *node); extern void ExecReScanAppend(Append *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODEAPPEND_H */ diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h index ed6fe7ab0ff..5ec7de171d4 100644 --- a/src/include/executor/nodeGroup.h +++ b/src/include/executor/nodeGroup.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: nodeGroup.h,v 1.19 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeGroup.h,v 1.20 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,4 +32,5 @@ extern bool execTuplesMatch(HeapTuple tuple1, extern FmgrInfo *execTuplesMatchPrepare(TupleDesc tupdesc, int numCols, AttrNumber *matchColIdx); + #endif /* NODEGROUP_H */ diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index 731208905d2..18d316fd16a 100644 --- a/src/include/executor/nodeHash.h +++ b/src/include/executor/nodeHash.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: nodeHash.h,v 1.21 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeHash.h,v 1.22 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,4 +36,5 @@ extern void ExecChooseHashTableSize(double ntuples, int tupwidth, int *virtualbuckets, int *physicalbuckets, int *numbatches); + #endif /* NODEHASH_H */ diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h index f3e04b3df1f..4ebfea08119 100644 --- a/src/include/executor/nodeHashjoin.h +++ b/src/include/executor/nodeHashjoin.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: nodeHashjoin.h,v 1.20 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeHashjoin.h,v 1.21 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,5 @@ extern int ExecCountSlotsHashJoin(HashJoin *node); extern void ExecEndHashJoin(HashJoin *node); extern void ExecHashJoinSaveTuple(HeapTuple heapTuple, BufFile *file); extern void ExecReScanHashJoin(HashJoin *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODEHASHJOIN_H */ diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h index bae08bd0461..656e1f2ff34 100644 --- a/src/include/executor/nodeIndexscan.h +++ b/src/include/executor/nodeIndexscan.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: nodeIndexscan.h,v 1.12 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeIndexscan.h,v 1.13 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,4 +25,5 @@ extern void ExecUpdateIndexScanKeys(IndexScan *node, ExprContext *econtext); extern bool ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent); extern int ExecCountSlotsIndexScan(IndexScan *node); extern void ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODEINDEXSCAN_H */ diff --git a/src/include/executor/nodeLimit.h b/src/include/executor/nodeLimit.h index 6b0acd4baa0..ab9224e1a35 100644 --- a/src/include/executor/nodeLimit.h +++ b/src/include/executor/nodeLimit.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: nodeLimit.h,v 1.3 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeLimit.h,v 1.4 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern bool ExecInitLimit(Limit *node, EState *estate, Plan *parent); extern int ExecCountSlotsLimit(Limit *node); extern void ExecEndLimit(Limit *node); extern void ExecReScanLimit(Limit *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODELIMIT_H */ diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h index e8e23dfeaa5..9392d536c96 100644 --- a/src/include/executor/nodeMaterial.h +++ b/src/include/executor/nodeMaterial.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: nodeMaterial.h,v 1.15 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeMaterial.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,5 @@ extern void ExecEndMaterial(Material *node); extern void ExecMaterialMarkPos(Material *node); extern void ExecMaterialRestrPos(Material *node); extern void ExecMaterialReScan(Material *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODEMATERIAL_H */ diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h index 94c4ef302e8..49ad0804a00 100644 --- a/src/include/executor/nodeMergejoin.h +++ b/src/include/executor/nodeMergejoin.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: nodeMergejoin.h,v 1.14 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeMergejoin.h,v 1.15 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern bool ExecInitMergeJoin(MergeJoin *node, EState *estate, Plan *parent); extern int ExecCountSlotsMergeJoin(MergeJoin *node); extern void ExecEndMergeJoin(MergeJoin *node); extern void ExecReScanMergeJoin(MergeJoin *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODEMERGEJOIN_H; */ diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h index 7f0ae110243..9d72a115fab 100644 --- a/src/include/executor/nodeNestloop.h +++ b/src/include/executor/nodeNestloop.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: nodeNestloop.h,v 1.15 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeNestloop.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,5 @@ extern int ExecCountSlotsNestLoop(NestLoop *node); extern void ExecEndNestLoop(NestLoop *node); extern void ExecReScanNestLoop(NestLoop *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODENESTLOOP_H */ diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h index 7ee4fb712bc..ba33e94a303 100644 --- a/src/include/executor/nodeResult.h +++ b/src/include/executor/nodeResult.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: nodeResult.h,v 1.12 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeResult.h,v 1.13 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern bool ExecInitResult(Result *node, EState *estate, Plan *parent); extern int ExecCountSlotsResult(Result *node); extern void ExecEndResult(Result *node); extern void ExecReScanResult(Result *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODERESULT_H */ diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h index b0ebbc325b7..4994de6a235 100644 --- a/src/include/executor/nodeSeqscan.h +++ b/src/include/executor/nodeSeqscan.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: nodeSeqscan.h,v 1.12 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeSeqscan.h,v 1.13 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,5 @@ extern void ExecEndSeqScan(SeqScan *node); extern void ExecSeqReScan(SeqScan *node, ExprContext *exprCtxt, Plan *parent); extern void ExecSeqMarkPos(SeqScan *node); extern void ExecSeqRestrPos(SeqScan *node); + #endif /* NODESEQSCAN_H */ diff --git a/src/include/executor/nodeSetOp.h b/src/include/executor/nodeSetOp.h index 86ac187cbf0..0deb0cecc3a 100644 --- a/src/include/executor/nodeSetOp.h +++ b/src/include/executor/nodeSetOp.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: nodeSetOp.h,v 1.3 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeSetOp.h,v 1.4 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern bool ExecInitSetOp(SetOp *node, EState *estate, Plan *parent); extern int ExecCountSlotsSetOp(SetOp *node); extern void ExecEndSetOp(SetOp *node); extern void ExecReScanSetOp(SetOp *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODESETOP_H */ diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h index a667f9bb347..b1a76d69abf 100644 --- a/src/include/executor/nodeSort.h +++ b/src/include/executor/nodeSort.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: nodeSort.h,v 1.12 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeSort.h,v 1.13 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,5 @@ extern void ExecEndSort(Sort *node); extern void ExecSortMarkPos(Sort *node); extern void ExecSortRestrPos(Sort *node); extern void ExecReScanSort(Sort *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODESORT_H */ diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h index 0b12f3d61d2..f7c46c3ca92 100644 --- a/src/include/executor/nodeSubplan.h +++ b/src/include/executor/nodeSubplan.h @@ -15,4 +15,5 @@ extern bool ExecInitSubPlan(SubPlan *node, EState *estate, Plan *parent); extern void ExecReScanSetParamPlan(SubPlan *node, Plan *parent); extern void ExecSetParamPlan(SubPlan *node, ExprContext *econtext); extern void ExecEndSubPlan(SubPlan *node); + #endif /* NODESUBPLAN_H */ diff --git a/src/include/executor/nodeSubqueryscan.h b/src/include/executor/nodeSubqueryscan.h index acbc98aa54a..aebe249d590 100644 --- a/src/include/executor/nodeSubqueryscan.h +++ b/src/include/executor/nodeSubqueryscan.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: nodeSubqueryscan.h,v 1.3 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeSubqueryscan.h,v 1.4 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern void ExecEndSubqueryScan(SubqueryScan *node); extern bool ExecInitSubqueryScan(SubqueryScan *node, EState *estate, Plan *parent); extern int ExecCountSlotsSubqueryScan(SubqueryScan *node); extern void ExecSubqueryReScan(SubqueryScan *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODESUBQUERYSCAN_H */ diff --git a/src/include/executor/nodeTidscan.h b/src/include/executor/nodeTidscan.h index c9cd06b141f..d24ee7689c0 100644 --- a/src/include/executor/nodeTidscan.h +++ b/src/include/executor/nodeTidscan.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: nodeTidscan.h,v 1.6 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeTidscan.h,v 1.7 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,5 @@ extern void ExecTidMarkPos(TidScan *node); extern bool ExecInitTidScan(TidScan *node, EState *estate, Plan *parent); extern int ExecCountSlotsTidScan(TidScan *node); extern void ExecTidReScan(TidScan *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODETIDSCAN_H */ diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h index 40fc0d29554..5e358654e05 100644 --- a/src/include/executor/nodeUnique.h +++ b/src/include/executor/nodeUnique.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: nodeUnique.h,v 1.12 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeUnique.h,v 1.13 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern bool ExecInitUnique(Unique *node, EState *estate, Plan *parent); extern int ExecCountSlotsUnique(Unique *node); extern void ExecEndUnique(Unique *node); extern void ExecReScanUnique(Unique *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODEUNIQUE_H */ diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index 26531a49fc1..282063d892d 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -2,7 +2,7 @@ * * spi.h * - * $Id: spi.h,v 1.29 2001/10/25 05:49:59 momjian Exp $ + * $Id: spi.h,v 1.30 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -112,4 +112,5 @@ extern void SPI_cursor_move(Portal portal, bool forward, int count); extern void SPI_cursor_close(Portal portal); extern void AtEOXact_SPI(void); + #endif /* SPI_H */ diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h index d7f036506b0..a710a3b73ff 100644 --- a/src/include/executor/spi_priv.h +++ b/src/include/executor/spi_priv.h @@ -3,7 +3,7 @@ * spi.c * Server Programming Interface private declarations * - * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.9 2001/10/25 05:49:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.10 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,4 +35,5 @@ typedef struct #define _SPI_CPLAN_CURCXT 0 #define _SPI_CPLAN_PROCXT 1 #define _SPI_CPLAN_TOPCXT 2 + #endif /* SPI_PRIV_H */ diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index 06f1387fe90..d241457d71b 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.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: tuptable.h,v 1.19 2001/10/25 05:49:59 momjian Exp $ + * $Id: tuptable.h,v 1.20 2001/10/28 06:26:06 momjian Exp $ * * NOTES * The tuple table interface is getting pretty ugly. @@ -80,4 +80,5 @@ typedef struct TupleTableData } TupleTableData; typedef TupleTableData *TupleTable; + #endif /* TUPTABLE_H */ diff --git a/src/include/fmgr.h b/src/include/fmgr.h index c50e4cdff62..6e2084ed440 100644 --- a/src/include/fmgr.h +++ b/src/include/fmgr.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fmgr.h,v 1.16 2001/10/25 05:49:54 momjian Exp $ + * $Id: fmgr.h,v 1.17 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -383,4 +383,5 @@ extern void load_file(char *filename); * DEPRECATED, DO NOT USE IN NEW CODE */ extern char *fmgr(Oid procedureId,...); + #endif /* FMGR_H */ diff --git a/src/include/lib/dllist.h b/src/include/lib/dllist.h index 61335920790..01970575e58 100644 --- a/src/include/lib/dllist.h +++ b/src/include/lib/dllist.h @@ -34,7 +34,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dllist.h,v 1.17 2001/10/25 05:49:59 momjian Exp $ + * $Id: dllist.h,v 1.18 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -66,7 +66,7 @@ extern void DLFreeList(Dllist *list); /* free up a list and all the extern Dlelem *DLNewElem(void *val); extern void DLInitElem(Dlelem *e, void *val); extern void DLFreeElem(Dlelem *e); -extern void DLRemove(Dlelem *e); /* removes node from list */ +extern void DLRemove(Dlelem *e); /* removes node from list */ extern void DLAddHead(Dllist *list, Dlelem *node); extern void DLAddTail(Dllist *list, Dlelem *node); extern Dlelem *DLRemHead(Dllist *list); /* remove and return the head */ @@ -81,4 +81,5 @@ extern void DLMoveToFront(Dlelem *e); /* move node to front of its list */ #define DLGetListHdr(elem) ((elem)->dle_list) #define DLE_VAL(elem) ((elem)->dle_val) + #endif /* DLLIST_H */ diff --git a/src/include/lib/lispsort.h b/src/include/lib/lispsort.h index 13228cfd2a0..99c7cec3083 100644 --- a/src/include/lib/lispsort.h +++ b/src/include/lib/lispsort.h @@ -7,10 +7,11 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lispsort.h,v 1.8 2001/10/25 05:49:59 momjian Exp $ + * $Id: lispsort.h,v 1.9 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef LISPSORT_H #define LISPSORT_H + #endif /* LISPSORT_H */ diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h index fc6e2031a9f..f2935e53e7f 100644 --- a/src/include/lib/stringinfo.h +++ b/src/include/lib/stringinfo.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: stringinfo.h,v 1.21 2001/10/25 05:49:59 momjian Exp $ + * $Id: stringinfo.h,v 1.22 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -110,4 +110,5 @@ extern void appendStringInfoChar(StringInfo str, char ch); */ extern void appendBinaryStringInfo(StringInfo str, const char *data, int datalen); + #endif /* STRINGINFO_H */ diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h index 0ef455a8825..c679f7dd6f6 100644 --- a/src/include/libpq/auth.h +++ b/src/include/libpq/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: auth.h,v 1.18 2001/10/25 05:49:59 momjian Exp $ + * $Id: auth.h,v 1.19 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,5 @@ void ClientAuthentication(Port *port); #define PG_KRB5_VERSION "PGVER5.1" extern char *pg_krb_server_keyfile; + #endif /* AUTH_H */ diff --git a/src/include/libpq/be-fsstubs.h b/src/include/libpq/be-fsstubs.h index e53b60a3d8f..08f2c634add 100644 --- a/src/include/libpq/be-fsstubs.h +++ b/src/include/libpq/be-fsstubs.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: be-fsstubs.h,v 1.13 2001/10/25 05:49:59 momjian Exp $ + * $Id: be-fsstubs.h,v 1.14 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,4 +46,5 @@ extern int lo_write(int fd, char *buf, int len); * Cleanup LOs at xact commit/abort [ Pascal André <andre@via.ecp.fr> ] */ extern void lo_commit(bool isCommit); + #endif /* BE_FSSTUBS_H */ diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h index 4f91e207fd0..39d677e166b 100644 --- a/src/include/libpq/crypt.h +++ b/src/include/libpq/crypt.h @@ -33,4 +33,5 @@ extern bool EncryptMD5(const char *passwd, const char *salt, #define isMD5(passwd) (strncmp((passwd),"md5",3) == 0 && \ strlen(passwd) == MD5_PASSWD_LEN) + #endif diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index f29e2a72541..e38889aecb0 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.29 2001/10/25 05:49:59 momjian Exp $ + * $Id: hba.h,v 1.30 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,16 +31,16 @@ typedef enum UserAuth { - uaReject, - uaKrb4, - uaKrb5, - uaTrust, - uaIdent, - uaPassword, - uaCrypt, - uaMD5 + uaReject, + uaKrb4, + uaKrb5, + uaTrust, + uaIdent, + uaPassword, + uaCrypt, + uaMD5 #ifdef USE_PAM - ,uaPAM + ,uaPAM #endif /* USE_PAM */ } UserAuth; @@ -49,4 +49,5 @@ typedef struct Port hbaPort; extern int hba_getauthmethod(hbaPort *port); extern int authident(hbaPort *port); extern void load_hba_and_ident(void); + #endif diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index 729c1c36362..13af1594334 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-be.h,v 1.23 2001/10/25 05:49:59 momjian Exp $ + * $Id: libpq-be.h,v 1.24 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,10 +67,10 @@ typedef struct AuthRequestPacket typedef enum { - Idle, - ReadingPacketLength, - ReadingPacket, - WritingPacket + Idle, + ReadingPacketLength, + ReadingPacket, + WritingPacket } PacketState; typedef int (*PacketDoneProc) (void *arg, PacketLen pktlen, void *pktdata); @@ -155,4 +155,5 @@ int PacketReceiveFragment(Port *port); void PacketSendSetup(Packet *pkt, int nbytes, PacketDoneProc iodone, void *arg); int PacketSendFragment(Port *port); void PacketSendError(Packet *pkt, char *errormsg); + #endif /* LIBPQ_BE_H */ diff --git a/src/include/libpq/libpq-fs.h b/src/include/libpq/libpq-fs.h index 39b0291981a..6870ada29a4 100644 --- a/src/include/libpq/libpq-fs.h +++ b/src/include/libpq/libpq-fs.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-fs.h,v 1.13 2001/10/25 05:49:59 momjian Exp $ + * $Id: libpq-fs.h,v 1.14 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,5 @@ #define INV_WRITE 0x00020000 #define INV_READ 0x00040000 + #endif /* LIBPQ_FS_H */ diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index 685eb4a7c06..aa30d2f3a0d 100644 --- a/src/include/libpq/libpq.h +++ b/src/include/libpq/libpq.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.h,v 1.46 2001/10/25 05:49:59 momjian Exp $ + * $Id: libpq.h,v 1.47 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -76,4 +76,5 @@ extern void pq_endcopyout(bool errorAbort); extern void pqdebug(char *fmt, char *msg); extern void PQtrace(void); extern void PQuntrace(void); + #endif /* LIBPQ_H */ diff --git a/src/include/libpq/password.h b/src/include/libpq/password.h index 8eaf643eb17..c704edeb345 100644 --- a/src/include/libpq/password.h +++ b/src/include/libpq/password.h @@ -2,4 +2,5 @@ #define PASSWORD_H int verify_password(const Port *port, const char *user, const char *password); + #endif diff --git a/src/include/libpq/pqformat.h b/src/include/libpq/pqformat.h index 61e88c881cd..6505a30d600 100644 --- a/src/include/libpq/pqformat.h +++ b/src/include/libpq/pqformat.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqformat.h,v 1.9 2001/10/25 05:49:59 momjian Exp $ + * $Id: pqformat.h,v 1.10 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,5 @@ extern int pq_puttextmessage(char msgtype, const char *str); extern int pq_getint(int *result, int b); extern int pq_getstr(StringInfo s); + #endif /* PQFORMAT_H */ diff --git a/src/include/libpq/pqsignal.h b/src/include/libpq/pqsignal.h index efecb9cc4cc..065faf8c536 100644 --- a/src/include/libpq/pqsignal.h +++ b/src/include/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.17 2001/10/25 05:49:59 momjian Exp $ + * $Id: pqsignal.h,v 1.18 2001/10/28 06:26:07 momjian Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -38,4 +38,5 @@ typedef void (*pqsigfunc) (int); extern void pqinitmask(void); extern pqsigfunc pqsignal(int signo, pqsigfunc func); + #endif /* PQSIGNAL_H */ diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index d6d8af82cd1..97094c0e006 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -1,4 +1,4 @@ -/* $Id: pg_wchar.h,v 1.35 2001/10/25 05:49:59 momjian Exp $ */ +/* $Id: pg_wchar.h,v 1.36 2001/10/28 06:26:07 momjian Exp $ */ #ifndef PG_WCHAR_H #define PG_WCHAR_H @@ -88,7 +88,7 @@ typedef unsigned int pg_wchar; * Official multibyte byte encodings (0x90-0x99) * 0x9a-0x9d are free. 0x9e and 0x9f are reserved. */ -#define LC_JISX0208_1978 0x90/* Japanese Kanji, old JIS (not supported) */ +#define LC_JISX0208_1978 0x90 /* Japanese Kanji, old JIS (not supported) */ /* #define FREE 0x90 free (unused) */ #define LC_GB2312_80 0x91 /* Chinese */ #define LC_JISX0208 0x92 /* Japanese Kanji (JIS X 0208) */ @@ -114,20 +114,20 @@ typedef unsigned int pg_wchar; #define LC_VISCII_UPPER 0xa3 /* Vietnamese VISCII1.1 upper-case (not * supported) */ #define LC_ARABIC_DIGIT 0xa4 /* Arabic digit (not supported) */ -#define LC_ARABIC_1_COLUMN 0xa5/* Arabic 1-column (not supported) */ +#define LC_ARABIC_1_COLUMN 0xa5 /* Arabic 1-column (not supported) */ #define LC_ASCII_RIGHT_TO_LEFT 0xa6 /* ASCII (left half of ISO8859-1) * with right-to-left direction * (not supported) */ #define LC_LAO 0xa7 /* Lao characters (ISO10646 0E80..0EDF) * (not supported) */ -#define LC_ARABIC_2_COLUMN 0xa8/* Arabic 1-column (not supported) */ +#define LC_ARABIC_2_COLUMN 0xa8 /* Arabic 1-column (not supported) */ /* * Private multi byte encodings (0xf0-0xff) */ #define LC_INDIAN_1_COLUMN 0xf0/* Indian charset for 1-column width * glypps (not supported) */ -#define LC_TIBETAN_1_COLUMN 0xf1/* Tibetan 1 column glyph (not supported) */ +#define LC_TIBETAN_1_COLUMN 0xf1 /* Tibetan 1 column glyph (not supported) */ #define LC_ETHIOPIC 0xf5 /* Ethiopic characters (not supported) */ #define LC_CNS11643_3 0xf6 /* CNS 11643-1992 Plane 3 */ #define LC_CNS11643_4 0xf7 /* CNS 11643-1992 Plane 4 */ @@ -154,37 +154,37 @@ typedef unsigned int pg_wchar; */ typedef enum pg_enc { - PG_SQL_ASCII = 0, /* SQL/ASCII */ - PG_EUC_JP, /* EUC for Japanese */ - PG_EUC_CN, /* EUC for Chinese */ - PG_EUC_KR, /* EUC for Korean */ - PG_EUC_TW, /* EUC for Taiwan */ - PG_UTF8, /* Unicode UTF-8 */ - PG_MULE_INTERNAL, /* Mule internal code */ - PG_LATIN1, /* ISO-8859-1 Latin 1 */ - PG_LATIN2, /* ISO-8859-2 Latin 2 */ - PG_LATIN3, /* ISO-8859-3 Latin 3 */ - PG_LATIN4, /* ISO-8859-4 Latin 4 */ - PG_LATIN5, /* ISO-8859-9 Latin 5 */ - PG_LATIN6, /* ISO-8859-10 Latin6 */ - PG_LATIN7, /* ISO-8859-13 Latin7 */ - PG_LATIN8, /* ISO-8859-14 Latin8 */ - PG_LATIN9, /* ISO-8859-15 Latin9 */ - PG_LATIN10, /* ISO-8859-16 Latin10 */ - PG_KOI8R, /* KOI8-R */ - PG_WIN1251, /* windows-1251 (was: WIN) */ - PG_ALT, /* (MS-DOS CP866) */ - PG_ISO_8859_5, /* ISO-8859-5 */ - PG_ISO_8859_6, /* ISO-8859-6 */ - PG_ISO_8859_7, /* ISO-8859-7 */ - PG_ISO_8859_8, /* ISO-8859-8 */ + PG_SQL_ASCII = 0, /* SQL/ASCII */ + PG_EUC_JP, /* EUC for Japanese */ + PG_EUC_CN, /* EUC for Chinese */ + PG_EUC_KR, /* EUC for Korean */ + PG_EUC_TW, /* EUC for Taiwan */ + PG_UTF8, /* Unicode UTF-8 */ + PG_MULE_INTERNAL, /* Mule internal code */ + PG_LATIN1, /* ISO-8859-1 Latin 1 */ + PG_LATIN2, /* ISO-8859-2 Latin 2 */ + PG_LATIN3, /* ISO-8859-3 Latin 3 */ + PG_LATIN4, /* ISO-8859-4 Latin 4 */ + PG_LATIN5, /* ISO-8859-9 Latin 5 */ + PG_LATIN6, /* ISO-8859-10 Latin6 */ + PG_LATIN7, /* ISO-8859-13 Latin7 */ + PG_LATIN8, /* ISO-8859-14 Latin8 */ + PG_LATIN9, /* ISO-8859-15 Latin9 */ + PG_LATIN10, /* ISO-8859-16 Latin10 */ + PG_KOI8R, /* KOI8-R */ + PG_WIN1251, /* windows-1251 (was: WIN) */ + PG_ALT, /* (MS-DOS CP866) */ + PG_ISO_8859_5, /* ISO-8859-5 */ + PG_ISO_8859_6, /* ISO-8859-6 */ + PG_ISO_8859_7, /* ISO-8859-7 */ + PG_ISO_8859_8, /* ISO-8859-8 */ /* followings are for client encoding only */ - PG_SJIS, /* Shift JIS */ - PG_BIG5, /* Big5 */ - PG_WIN1250, /* windows-1250 */ + PG_SJIS, /* Shift JIS */ + PG_BIG5, /* Big5 */ + PG_WIN1250, /* windows-1250 */ - _PG_LAST_ENCODING_ /* mark only */ + _PG_LAST_ENCODING_ /* mark only */ } pg_enc; @@ -257,8 +257,8 @@ typedef struct pg_enconv { pg_enc encoding; /* encoding identifier */ to_mic_converter to_mic; /* client encoding to MIC */ - from_mic_converter from_mic; /* MIC to client encoding */ - to_mic_converter to_unicode; /* client encoding to UTF-8 */ + from_mic_converter from_mic; /* MIC to client encoding */ + to_mic_converter to_unicode; /* client encoding to UTF-8 */ from_mic_converter from_unicode; /* UTF-8 to client encoding */ } pg_enconv; @@ -346,4 +346,5 @@ extern unsigned short CNStoBIG5(unsigned short, unsigned char); char *pg_verifymbstr(const unsigned char *, int); #endif /* MULTIBYTE */ + #endif /* PG_WCHAR_H */ diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index b85784cdcab..ee8f69f04f9 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.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: miscadmin.h,v 1.95 2001/10/25 05:49:54 momjian Exp $ + * $Id: miscadmin.h,v 1.96 2001/10/28 06:25:59 momjian Exp $ * * NOTES * some of the information in this file should be moved to @@ -260,10 +260,9 @@ extern bool is_dbadmin(Oid dbid); /* current user is owner of typedef enum ProcessingMode { - BootstrapProcessing, /* bootstrap creation of template - * database */ - InitProcessing, /* initializing system */ - NormalProcessing/* normal processing */ + BootstrapProcessing, /* bootstrap creation of template database */ + InitProcessing, /* initializing system */ + NormalProcessing /* normal processing */ } ProcessingMode; extern ProcessingMode Mode; @@ -305,4 +304,5 @@ extern void ValidatePgVersion(const char *path); extern void IgnoreSystemIndexes(bool mode); extern bool IsIgnoringSystemIndexes(void); extern bool IsCacheInitialized(void); + #endif /* MISCADMIN_H */ diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 69f0597f81b..63b679da3d8 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.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: execnodes.h,v 1.64 2001/10/25 05:50:01 momjian Exp $ + * $Id: execnodes.h,v 1.65 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -98,11 +98,9 @@ typedef struct ExprContext */ typedef enum { - ExprSingleResult, /* expression does not return a - * set */ - ExprMultipleResult, /* this result is an element of a - * set */ - ExprEndResult /* there are no more elements in the set */ + ExprSingleResult, /* expression does not return a set */ + ExprMultipleResult, /* this result is an element of a set */ + ExprEndResult /* there are no more elements in the set */ } ExprDoneCond; /* @@ -753,4 +751,5 @@ typedef struct TeeState tee_rightScanDesc; } TeeState; #endif + #endif /* EXECNODES_H */ diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h index 9a4dc6e734a..2887440be14 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.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: makefuncs.h,v 1.28 2001/10/25 05:50:04 momjian Exp $ + * $Id: makefuncs.h,v 1.29 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,4 +45,5 @@ extern Const *makeConst(Oid consttype, extern Const *makeNullConst(Oid consttype); extern Attr *makeAttr(char *relname, char *attname); + #endif /* MAKEFUNC_H */ diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h index f26db840630..abf380bb60e 100644 --- a/src/include/nodes/nodeFuncs.h +++ b/src/include/nodes/nodeFuncs.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: nodeFuncs.h,v 1.14 2001/10/25 05:50:04 momjian Exp $ + * $Id: nodeFuncs.h,v 1.15 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,5 @@ extern bool single_node(Node *node); extern bool var_is_outer(Var *var); extern bool var_is_rel(Var *var); extern Oper *replace_opid(Oper *oper); + #endif /* NODEFUNCS_H */ diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index 66ca855f9aa..234d5afeae9 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.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: nodes.h,v 1.94 2001/10/25 05:50:04 momjian Exp $ + * $Id: nodes.h,v 1.95 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,211 +23,211 @@ */ typedef enum NodeTag { - T_Invalid = 0, + T_Invalid = 0, /* * TAGS FOR PLAN NODES (plannodes.h) */ - T_Plan = 10, - T_Result, - T_Append, - T_Scan, - T_SeqScan, - T_IndexScan, - T_Join, - T_NestLoop, - T_MergeJoin, - T_HashJoin, - T_Limit, - T_Material, - T_Sort, - T_Agg, - T_Unique, - T_Hash, - T_SetOp, - T_Group, - T_SubPlan, - T_TidScan, - T_SubqueryScan, + T_Plan = 10, + T_Result, + T_Append, + T_Scan, + T_SeqScan, + T_IndexScan, + T_Join, + T_NestLoop, + T_MergeJoin, + T_HashJoin, + T_Limit, + T_Material, + T_Sort, + T_Agg, + T_Unique, + T_Hash, + T_SetOp, + T_Group, + T_SubPlan, + T_TidScan, + T_SubqueryScan, /* * TAGS FOR PRIMITIVE NODES (primnodes.h) */ - T_Resdom = 100, - T_Fjoin, - T_Expr, - T_Var, - T_Oper, - T_Const, - T_Param, - T_Aggref, - T_SubLink, - T_Func, - T_FieldSelect, - T_ArrayRef, - T_Iter, - T_RelabelType, - T_RangeTblRef, - T_FromExpr, - T_JoinExpr, + T_Resdom = 100, + T_Fjoin, + T_Expr, + T_Var, + T_Oper, + T_Const, + T_Param, + T_Aggref, + T_SubLink, + T_Func, + T_FieldSelect, + T_ArrayRef, + T_Iter, + T_RelabelType, + T_RangeTblRef, + T_FromExpr, + T_JoinExpr, /* * TAGS FOR PLANNER NODES (relation.h) */ - T_RelOptInfo = 200, - T_Path, - T_IndexPath, - T_NestPath, - T_MergePath, - T_HashPath, - T_TidPath, - T_AppendPath, - T_PathKeyItem, - T_RestrictInfo, - T_JoinInfo, - T_Stream, - T_IndexOptInfo, + T_RelOptInfo = 200, + T_Path, + T_IndexPath, + T_NestPath, + T_MergePath, + T_HashPath, + T_TidPath, + T_AppendPath, + T_PathKeyItem, + T_RestrictInfo, + T_JoinInfo, + T_Stream, + T_IndexOptInfo, /* * TAGS FOR EXECUTOR NODES (execnodes.h) */ - T_IndexInfo = 300, - T_ResultRelInfo, - T_TupleCount, - T_TupleTableSlot, - T_ExprContext, - T_ProjectionInfo, - T_JunkFilter, - T_EState, - T_BaseNode, - T_CommonState, - T_ResultState, - T_AppendState, - T_CommonScanState, - T_ScanState, - T_IndexScanState, - T_JoinState, - T_NestLoopState, - T_MergeJoinState, - T_HashJoinState, - T_MaterialState, - T_AggState, - T_GroupState, - T_SortState, - T_UniqueState, - T_HashState, - T_TidScanState, - T_SubqueryScanState, - T_SetOpState, - T_LimitState, + T_IndexInfo = 300, + T_ResultRelInfo, + T_TupleCount, + T_TupleTableSlot, + T_ExprContext, + T_ProjectionInfo, + T_JunkFilter, + T_EState, + T_BaseNode, + T_CommonState, + T_ResultState, + T_AppendState, + T_CommonScanState, + T_ScanState, + T_IndexScanState, + T_JoinState, + T_NestLoopState, + T_MergeJoinState, + T_HashJoinState, + T_MaterialState, + T_AggState, + T_GroupState, + T_SortState, + T_UniqueState, + T_HashState, + T_TidScanState, + T_SubqueryScanState, + T_SetOpState, + T_LimitState, /* * TAGS FOR MEMORY NODES (memnodes.h) */ - T_MemoryContext = 400, - T_AllocSetContext, + T_MemoryContext = 400, + T_AllocSetContext, /* * TAGS FOR VALUE NODES (pg_list.h) */ - T_Value = 500, - T_List, - T_Integer, - T_Float, - T_String, - T_BitString, - T_Null, + T_Value = 500, + T_List, + T_Integer, + T_Float, + T_String, + T_BitString, + T_Null, /* * TAGS FOR PARSE TREE NODES (parsenodes.h) */ - T_Query = 600, - T_InsertStmt, - T_DeleteStmt, - T_UpdateStmt, - T_SelectStmt, - T_AlterTableStmt, - T_SetOperationStmt, - T_GrantStmt, - T_ClosePortalStmt, - T_ClusterStmt, - T_CopyStmt, - T_CreateStmt, - T_VersionStmt, - T_DefineStmt, - T_DropStmt, - T_TruncateStmt, - T_CommentStmt, - T_FetchStmt, - T_IndexStmt, - T_ProcedureStmt, - T_RemoveAggrStmt, - T_RemoveFuncStmt, - T_RemoveOperStmt, - T_RenameStmt, - T_RuleStmt, - T_NotifyStmt, - T_ListenStmt, - T_UnlistenStmt, - T_TransactionStmt, - T_ViewStmt, - T_LoadStmt, - T_CreatedbStmt, - T_DropdbStmt, - T_VacuumStmt, - T_ExplainStmt, - T_CreateSeqStmt, - T_VariableSetStmt, - T_VariableShowStmt, - T_VariableResetStmt, - T_CreateTrigStmt, - T_DropTrigStmt, - T_CreatePLangStmt, - T_DropPLangStmt, - T_CreateUserStmt, - T_AlterUserStmt, - T_DropUserStmt, - T_LockStmt, - T_ConstraintsSetStmt, - T_CreateGroupStmt, - T_AlterGroupStmt, - T_DropGroupStmt, - T_ReindexStmt, - T_CheckPointStmt, - - T_A_Expr = 700, - T_Attr, - T_A_Const, - T_ParamNo, - T_Ident, - T_FuncCall, - T_A_Indices, - T_ResTarget, - T_TypeCast, - T_RangeSubselect, - T_SortGroupBy, - T_RangeVar, - T_TypeName, - T_IndexElem, - T_ColumnDef, - T_Constraint, - T_DefElem, - T_TargetEntry, - T_RangeTblEntry, - T_SortClause, - T_GroupClause, - T_NullTest, - T_BooleanTest, - T_CaseExpr, - T_CaseWhen, - T_FkConstraint, - T_PrivGrantee, + T_Query = 600, + T_InsertStmt, + T_DeleteStmt, + T_UpdateStmt, + T_SelectStmt, + T_AlterTableStmt, + T_SetOperationStmt, + T_GrantStmt, + T_ClosePortalStmt, + T_ClusterStmt, + T_CopyStmt, + T_CreateStmt, + T_VersionStmt, + T_DefineStmt, + T_DropStmt, + T_TruncateStmt, + T_CommentStmt, + T_FetchStmt, + T_IndexStmt, + T_ProcedureStmt, + T_RemoveAggrStmt, + T_RemoveFuncStmt, + T_RemoveOperStmt, + T_RenameStmt, + T_RuleStmt, + T_NotifyStmt, + T_ListenStmt, + T_UnlistenStmt, + T_TransactionStmt, + T_ViewStmt, + T_LoadStmt, + T_CreatedbStmt, + T_DropdbStmt, + T_VacuumStmt, + T_ExplainStmt, + T_CreateSeqStmt, + T_VariableSetStmt, + T_VariableShowStmt, + T_VariableResetStmt, + T_CreateTrigStmt, + T_DropTrigStmt, + T_CreatePLangStmt, + T_DropPLangStmt, + T_CreateUserStmt, + T_AlterUserStmt, + T_DropUserStmt, + T_LockStmt, + T_ConstraintsSetStmt, + T_CreateGroupStmt, + T_AlterGroupStmt, + T_DropGroupStmt, + T_ReindexStmt, + T_CheckPointStmt, + + T_A_Expr = 700, + T_Attr, + T_A_Const, + T_ParamNo, + T_Ident, + T_FuncCall, + T_A_Indices, + T_ResTarget, + T_TypeCast, + T_RangeSubselect, + T_SortGroupBy, + T_RangeVar, + T_TypeName, + T_IndexElem, + T_ColumnDef, + T_Constraint, + T_DefElem, + T_TargetEntry, + T_RangeTblEntry, + T_SortClause, + T_GroupClause, + T_NullTest, + T_BooleanTest, + T_CaseExpr, + T_CaseWhen, + T_FkConstraint, + T_PrivGrantee, /* * TAGS FOR FUNCTION-CALL CONTEXT AND RESULTINFO NODES (see fmgr.h) */ - T_TriggerData = 800, /* in commands/trigger.h */ - T_ReturnSetInfo /* in nodes/execnodes.h */ + T_TriggerData = 800, /* in commands/trigger.h */ + T_ReturnSetInfo /* in nodes/execnodes.h */ } NodeTag; @@ -313,14 +313,14 @@ typedef double Cost; /* execution cost (in page-access units) */ */ typedef enum CmdType { - CMD_UNKNOWN, - CMD_SELECT, /* select stmt (formerly retrieve) */ - CMD_UPDATE, /* update stmt (formerly replace) */ - CMD_INSERT, /* insert stmt (formerly append) */ - CMD_DELETE, - CMD_UTILITY, /* cmds like create, destroy, copy, + CMD_UNKNOWN, + CMD_SELECT, /* select stmt (formerly retrieve) */ + CMD_UPDATE, /* update stmt (formerly replace) */ + CMD_INSERT, /* insert stmt (formerly append) */ + CMD_DELETE, + CMD_UTILITY, /* cmds like create, destroy, copy, * vacuum, etc. */ - CMD_NOTHING /* dummy command for instead nothing rules + CMD_NOTHING /* dummy command for instead nothing rules * with qual */ } CmdType; @@ -340,11 +340,11 @@ typedef enum JoinType /* * The canonical kinds of joins */ - JOIN_INNER, /* matching tuple pairs only */ - JOIN_LEFT, /* pairs + unmatched outer tuples */ - JOIN_FULL, /* pairs + unmatched outer + unmatched + JOIN_INNER, /* matching tuple pairs only */ + JOIN_LEFT, /* pairs + unmatched outer tuples */ + JOIN_FULL, /* pairs + unmatched outer + unmatched * inner */ - JOIN_RIGHT, /* pairs + unmatched inner tuples */ + JOIN_RIGHT, /* pairs + unmatched inner tuples */ /* * SQL92 considers UNION JOIN to be a kind of join, so list it here @@ -352,7 +352,7 @@ typedef enum JoinType * join in the executor. (The planner must convert it to an Append * plan.) */ - JOIN_UNION + JOIN_UNION /* * Eventually we will have some additional join types for efficient @@ -364,4 +364,5 @@ typedef enum JoinType ((jointype) == JOIN_LEFT || \ (jointype) == JOIN_FULL || \ (jointype) == JOIN_RIGHT) + #endif /* NODES_H */ diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h index 5c55d6cf35c..e15643806aa 100644 --- a/src/include/nodes/params.h +++ b/src/include/nodes/params.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: params.h,v 1.14 2001/10/25 05:50:04 momjian Exp $ + * $Id: params.h,v 1.15 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -99,4 +99,5 @@ typedef struct ParamExecData Datum value; bool isnull; } ParamExecData; + #endif /* PARAMS_H */ diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 2458a543fb5..1abd7ba365a 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.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: parsenodes.h,v 1.148 2001/10/25 05:50:04 momjian Exp $ + * $Id: parsenodes.h,v 1.149 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -79,7 +79,7 @@ typedef struct Query * commit to the exact set of child tables at parse time. This field * ought to go in some sort of TopPlan plan node, not in the Query. */ - List *resultRelations; /* integer list of RT indexes, or NIL */ + List *resultRelations; /* integer list of RT indexes, or NIL */ /* internal to planner */ List *base_rel_list; /* list of base-relation RelOptInfos */ @@ -93,9 +93,9 @@ typedef struct Query typedef enum InhOption { - INH_NO, /* Do NOT scan child tables */ - INH_YES, /* DO scan child tables */ - INH_DEFAULT /* Use current SQL_inheritance option */ + INH_NO, /* Do NOT scan child tables */ + INH_YES, /* DO scan child tables */ + INH_DEFAULT /* Use current SQL_inheritance option */ } InhOption; /***************************************************************************** @@ -228,18 +228,17 @@ typedef struct CreateStmt typedef enum ConstrType /* types of constraints */ { - CONSTR_NULL, /* not SQL92, but a lot of people expect + CONSTR_NULL, /* not SQL92, but a lot of people expect * it */ - CONSTR_NOTNULL, - CONSTR_DEFAULT, - CONSTR_CHECK, - CONSTR_PRIMARY, - CONSTR_UNIQUE, - CONSTR_ATTR_DEFERRABLE, /* attributes for previous - * constraint node */ - CONSTR_ATTR_NOT_DEFERRABLE, - CONSTR_ATTR_DEFERRED, - CONSTR_ATTR_IMMEDIATE + CONSTR_NOTNULL, + CONSTR_DEFAULT, + CONSTR_CHECK, + CONSTR_PRIMARY, + CONSTR_UNIQUE, + CONSTR_ATTR_DEFERRABLE, /* attributes for previous constraint node */ + CONSTR_ATTR_NOT_DEFERRABLE, + CONSTR_ATTR_DEFERRED, + CONSTR_ATTR_IMMEDIATE } ConstrType; typedef struct Constraint @@ -864,10 +863,10 @@ typedef struct UpdateStmt */ typedef enum SetOperation { - SETOP_NONE = 0, - SETOP_UNION, - SETOP_INTERSECT, - SETOP_EXCEPT + SETOP_NONE = 0, + SETOP_UNION, + SETOP_INTERSECT, + SETOP_EXCEPT } SetOperation; typedef struct SelectStmt @@ -1054,7 +1053,7 @@ typedef struct CaseWhen typedef enum NullTestType { - IS_NULL, IS_NOT_NULL + IS_NULL, IS_NOT_NULL } NullTestType; typedef struct NullTest @@ -1076,7 +1075,7 @@ typedef struct NullTest typedef enum BoolTestType { - IS_TRUE, IS_NOT_TRUE, IS_FALSE, IS_NOT_FALSE, IS_UNKNOWN, IS_NOT_UNKNOWN + IS_TRUE, IS_NOT_TRUE, IS_FALSE, IS_NOT_FALSE, IS_UNKNOWN, IS_NOT_UNKNOWN } BoolTestType; typedef struct BooleanTest @@ -1341,7 +1340,7 @@ typedef struct RangeTblEntry typedef struct SortClause { NodeTag type; - Index tleSortGroupRef; /* reference into targetlist */ + Index tleSortGroupRef; /* reference into targetlist */ Oid sortop; /* the sort operator to use */ } SortClause; @@ -1354,4 +1353,5 @@ typedef struct SortClause * nodetags...). We have routines that operate interchangeably on both. */ typedef SortClause GroupClause; + #endif /* PARSENODES_H */ diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index db303e2da80..20792b2d407 100644 --- a/src/include/nodes/pg_list.h +++ b/src/include/nodes/pg_list.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: pg_list.h,v 1.24 2001/10/25 05:50:05 momjian Exp $ + * $Id: pg_list.h,v 1.25 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -147,4 +147,5 @@ extern void freeList(List *list); /* in copyfuncs.c */ extern List *listCopy(List *list); + #endif /* PG_LIST_H */ diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index be66b92fce5..746732984c7 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.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: plannodes.h,v 1.51 2001/10/25 05:50:05 momjian Exp $ + * $Id: plannodes.h,v 1.52 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -373,10 +373,10 @@ typedef struct Unique */ typedef enum SetOpCmd { - SETOPCMD_INTERSECT, - SETOPCMD_INTERSECT_ALL, - SETOPCMD_EXCEPT, - SETOPCMD_EXCEPT_ALL + SETOPCMD_INTERSECT, + SETOPCMD_INTERSECT_ALL, + SETOPCMD_EXCEPT, + SETOPCMD_EXCEPT_ALL } SetOpCmd; typedef struct SetOp @@ -463,4 +463,5 @@ typedef struct SubPlan bool needShutdown; /* TRUE = need to shutdown subplan */ HeapTuple curTuple; /* copy of most recent tuple from subplan */ } SubPlan; + #endif /* PLANNODES_H */ diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index b9bada1332a..a5892738c0b 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: primnodes.h,v 1.55 2001/10/25 05:50:05 momjian Exp $ + * $Id: primnodes.h,v 1.56 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -103,7 +103,7 @@ typedef struct Fjoin */ typedef enum OpType { - OP_EXPR, FUNC_EXPR, OR_EXPR, AND_EXPR, NOT_EXPR, SUBPLAN_EXPR + OP_EXPR, FUNC_EXPR, OR_EXPR, AND_EXPR, NOT_EXPR, SUBPLAN_EXPR } OpType; typedef struct Expr @@ -345,7 +345,7 @@ typedef struct Aggref */ typedef enum SubLinkType { - EXISTS_SUBLINK, ALL_SUBLINK, ANY_SUBLINK, MULTIEXPR_SUBLINK, EXPR_SUBLINK + EXISTS_SUBLINK, ALL_SUBLINK, ANY_SUBLINK, MULTIEXPR_SUBLINK, EXPR_SUBLINK } SubLinkType; @@ -549,4 +549,5 @@ typedef struct FromExpr List *fromlist; /* List of join subtrees */ Node *quals; /* qualifiers on join, if any */ } FromExpr; + #endif /* PRIMNODES_H */ diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h index c40daed69ed..939587ccee3 100644 --- a/src/include/nodes/print.h +++ b/src/include/nodes/print.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: print.h,v 1.14 2001/10/25 05:50:05 momjian Exp $ + * $Id: print.h,v 1.15 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,4 +32,5 @@ extern void print_slot(TupleTableSlot *slot); extern void print_plan_recursive(Plan *p, Query *parsetree, int indentLevel, char *label); extern void print_plan(Plan *p, Query *parsetree); + #endif /* PRINT_H */ diff --git a/src/include/nodes/readfuncs.h b/src/include/nodes/readfuncs.h index f770e28c696..fbfccd91b29 100644 --- a/src/include/nodes/readfuncs.h +++ b/src/include/nodes/readfuncs.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: readfuncs.h,v 1.12 2001/10/25 05:50:05 momjian Exp $ + * $Id: readfuncs.h,v 1.13 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,5 @@ extern void *nodeRead(bool read_car_only); * prototypes for functions in readfuncs.c */ extern Node *parsePlanString(void); + #endif /* READFUNCS_H */ diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 117b95f73e1..b3f10b5b2c6 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.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: relation.h,v 1.59 2001/10/25 05:50:05 momjian Exp $ + * $Id: relation.h,v 1.60 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,7 @@ typedef List *Relids; */ typedef enum CostSelector { - STARTUP_COST, TOTAL_COST + STARTUP_COST, TOTAL_COST } CostSelector; /*---------- @@ -221,7 +221,7 @@ typedef struct IndexOptInfo Oid *ordering; /* OIDs of sort operators for each column */ Oid relam; /* OID of the access method (in pg_am) */ - RegProcedure amcostestimate; /* OID of the access method's cost fcn */ + RegProcedure amcostestimate; /* OID of the access method's cost fcn */ Oid indproc; /* if a functional index */ List *indpred; /* if a partial index */ @@ -339,7 +339,7 @@ typedef struct TidPath { Path path; List *tideval; - Relids unjoined_relids; /* some rels not yet part of my Path */ + Relids unjoined_relids; /* some rels not yet part of my Path */ } TidPath; /* @@ -525,7 +525,7 @@ typedef struct RestrictInfo Oid hashjoinoperator; /* copy of clause operator */ /* cache space for hashclause processing; -1 if not yet set */ - Selectivity left_bucketsize; /* avg bucketsize of left side */ + Selectivity left_bucketsize; /* avg bucketsize of left side */ Selectivity right_bucketsize; /* avg bucketsize of right side */ } RestrictInfo; @@ -546,7 +546,7 @@ typedef struct RestrictInfo typedef struct JoinInfo { NodeTag type; - Relids unjoined_relids; /* some rels not yet part of my RelOptInfo */ + Relids unjoined_relids; /* some rels not yet part of my RelOptInfo */ List *jinfo_restrictinfo; /* relevant RestrictInfos */ } JoinInfo; @@ -587,4 +587,5 @@ typedef struct Stream Cost groupcost; Selectivity groupsel; } Stream; + #endif /* RELATION_H */ diff --git a/src/include/optimizer/_deadcode/xfunc.h b/src/include/optimizer/_deadcode/xfunc.h index 8d14f90288a..039528dc29f 100644 --- a/src/include/optimizer/_deadcode/xfunc.h +++ b/src/include/optimizer/_deadcode/xfunc.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: xfunc.h,v 1.6 2001/10/25 05:50:06 momjian Exp $ + * $Id: xfunc.h,v 1.7 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -79,4 +79,5 @@ extern bool xfunc_copyrel(RelOptInfo *from, RelOptInfo **to); * function prototypes for path/predmig.c */ extern bool xfunc_do_predmig(Path root); + #endif /* XFUNC_H */ diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index 366e3821169..aa97bcc862c 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.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: clauses.h,v 1.46 2001/10/25 05:50:05 momjian Exp $ + * $Id: clauses.h,v 1.47 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -71,4 +71,5 @@ extern void query_tree_mutator(Query *query, Node *(*mutator) (), #define is_subplan(clause) ((clause) != NULL && \ IsA(clause, Expr) && \ ((Expr *) (clause))->opType == SUBPLAN_EXPR) + #endif /* CLAUSES_H */ diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index b163505875e..46093694b14 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.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: cost.h,v 1.41 2001/10/25 05:50:05 momjian Exp $ + * $Id: cost.h,v 1.42 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -94,4 +94,5 @@ extern Selectivity clauselist_selectivity(Query *root, extern Selectivity clause_selectivity(Query *root, Node *clause, int varRelid); + #endif /* COST_H */ diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h index 8b8e7a59534..bf834d439e9 100644 --- a/src/include/optimizer/geqo.h +++ b/src/include/optimizer/geqo.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo.h,v 1.25 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo.h,v 1.26 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -48,7 +48,7 @@ /* If you change these, update backend/utils/misc/postgresql.sample.conf */ extern int Geqo_pool_size; -#define DEFAULT_GEQO_POOL_SIZE 0/* = default based on no. of relations. */ +#define DEFAULT_GEQO_POOL_SIZE 0 /* = default based on no. of relations. */ #define MIN_GEQO_POOL_SIZE 128 #define MAX_GEQO_POOL_SIZE 1024 @@ -76,4 +76,5 @@ extern Cost geqo_eval(Query *root, List *initial_rels, extern RelOptInfo *gimme_tree(Query *root, List *initial_rels, Gene *tour, int num_gene, int rel_count, RelOptInfo *old_rel); + #endif /* GEQO_H */ diff --git a/src/include/optimizer/geqo_copy.h b/src/include/optimizer/geqo_copy.h index 15d7ba4c920..f9cff6bf667 100644 --- a/src/include/optimizer/geqo_copy.h +++ b/src/include/optimizer/geqo_copy.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_copy.h,v 1.10 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo_copy.h,v 1.11 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,4 +25,5 @@ #include "optimizer/geqo_gene.h" extern void geqo_copy(Chromosome *chromo1, Chromosome *chromo2, int string_length); + #endif /* GEQO_COPY_H */ diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h index 528ba2bce16..06194d99ca3 100644 --- a/src/include/optimizer/geqo_gene.h +++ b/src/include/optimizer/geqo_gene.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_gene.h,v 1.11 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo_gene.h,v 1.12 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,4 +41,5 @@ typedef struct Pool int size; int string_length; } Pool; + #endif /* GEQO_GENE_H */ diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h index 24c7b7a351b..d04f4a5d88a 100644 --- a/src/include/optimizer/geqo_misc.h +++ b/src/include/optimizer/geqo_misc.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_misc.h,v 1.16 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo_misc.h,v 1.17 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,4 +32,5 @@ extern void print_edge_table(FILE *fp, Edge *edge_table, int num_gene); extern void geqo_print_rel(Query *root, RelOptInfo *rel); extern void geqo_print_path(Query *root, Path *path, int indent); extern void geqo_print_joinclauses(Query *root, List *clauses); + #endif /* GEQO_MISC_H */ diff --git a/src/include/optimizer/geqo_mutation.h b/src/include/optimizer/geqo_mutation.h index 85d2879ad6c..6754ea95209 100644 --- a/src/include/optimizer/geqo_mutation.h +++ b/src/include/optimizer/geqo_mutation.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_mutation.h,v 1.10 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo_mutation.h,v 1.11 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,4 +25,5 @@ #include "optimizer/geqo_gene.h" extern void geqo_mutation(Gene *tour, int num_gene); + #endif /* GEQO_MUTATION_H */ diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h index 6f0db6a7e29..b2eb4cb2415 100644 --- a/src/include/optimizer/geqo_pool.h +++ b/src/include/optimizer/geqo_pool.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_pool.h,v 1.13 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo_pool.h,v 1.14 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,4 +37,5 @@ extern void free_chromo(Chromosome *chromo); extern void spread_chromo(Chromosome *chromo, Pool *pool); extern void sort_pool(Pool *pool); + #endif /* GEQO_POOL_H */ diff --git a/src/include/optimizer/geqo_random.h b/src/include/optimizer/geqo_random.h index c9293c8f62b..4c5a1ac8ce1 100644 --- a/src/include/optimizer/geqo_random.h +++ b/src/include/optimizer/geqo_random.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_random.h,v 1.9 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo_random.h,v 1.10 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,4 +34,5 @@ #define geqo_randint(upper,lower) \ ( (int) floor( geqo_rand()*(((upper)-(lower))+0.999999) ) + (lower) ) + #endif /* GEQO_RANDOM_H */ diff --git a/src/include/optimizer/geqo_selection.h b/src/include/optimizer/geqo_selection.h index a3d94f7cdfa..9c10cfec9c8 100644 --- a/src/include/optimizer/geqo_selection.h +++ b/src/include/optimizer/geqo_selection.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_selection.h,v 1.10 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo_selection.h,v 1.11 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,4 +26,5 @@ #include "optimizer/geqo_gene.h" extern void geqo_selection(Chromosome *momma, Chromosome *daddy, Pool *pool, double bias); + #endif /* GEQO_SELECTION_H */ diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h index 9573a2ce510..f905d385098 100644 --- a/src/include/optimizer/joininfo.h +++ b/src/include/optimizer/joininfo.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: joininfo.h,v 1.18 2001/10/25 05:50:05 momjian Exp $ + * $Id: joininfo.h,v 1.19 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,5 @@ #include "nodes/relation.h" extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids); + #endif /* JOININFO_H */ diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index 4de4ffa3675..0c05bbdaa67 100644 --- a/src/include/optimizer/pathnode.h +++ b/src/include/optimizer/pathnode.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: pathnode.h,v 1.39 2001/10/25 05:50:05 momjian Exp $ + * $Id: pathnode.h,v 1.40 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,4 +75,5 @@ extern RelOptInfo *build_join_rel(Query *root, RelOptInfo *inner_rel, JoinType jointype, List **restrictlist_ptr); + #endif /* PATHNODE_H */ diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index 0d57d89bbbb..c725e2126c0 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: paths.h,v 1.57 2001/10/25 05:50:05 momjian Exp $ + * $Id: paths.h,v 1.58 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -88,12 +88,10 @@ extern RelOptInfo *make_jointree_rel(Query *root, Node *jtnode); */ typedef enum { - PATHKEYS_EQUAL, /* pathkeys are identical */ - PATHKEYS_BETTER1, /* pathkey 1 is a superset of - * pathkey 2 */ - PATHKEYS_BETTER2, /* vice versa */ - PATHKEYS_DIFFERENT /* neither pathkey includes the - * other */ + PATHKEYS_EQUAL, /* pathkeys are identical */ + PATHKEYS_BETTER1, /* pathkey 1 is a superset of pathkey 2 */ + PATHKEYS_BETTER2, /* vice versa */ + PATHKEYS_DIFFERENT /* neither pathkey includes the other */ } PathKeysComparison; extern void add_equijoined_keys(Query *root, RestrictInfo *restrictinfo); @@ -132,4 +130,5 @@ extern int pathkeys_useful_for_ordering(Query *root, List *pathkeys); extern List *truncate_useless_pathkeys(Query *root, RelOptInfo *rel, List *pathkeys); + #endif /* PATHS_H */ diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index 1f60ee18df3..5fda9af760b 100644 --- a/src/include/optimizer/plancat.h +++ b/src/include/optimizer/plancat.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: plancat.h,v 1.24 2001/10/25 05:50:05 momjian Exp $ + * $Id: plancat.h,v 1.25 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,4 +36,5 @@ extern Selectivity restriction_selectivity(Query *root, extern Selectivity join_selectivity(Query *root, Oid operator, List *args); + #endif /* PLANCAT_H */ diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index 8831bb45d28..8c5bbf58063 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.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: planmain.h,v 1.52 2001/10/25 05:50:05 momjian Exp $ + * $Id: planmain.h,v 1.53 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,4 +67,5 @@ extern void fix_opids(Node *node); extern bool _use_keyset_query_optimizer; extern void transformKeySetQuery(Query *origNode); + #endif /* PLANMAIN_H */ diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h index acd6ff53260..7db7e5d1656 100644 --- a/src/include/optimizer/planner.h +++ b/src/include/optimizer/planner.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: planner.h,v 1.21 2001/10/25 05:50:06 momjian Exp $ + * $Id: planner.h,v 1.22 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,5 @@ extern Plan *subquery_planner(Query *parse, double tuple_fraction); extern Plan *make_sortplan(Query *parse, List *tlist, Plan *plannode, List *sortcls); + #endif /* PLANNER_H */ diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h index e4a55e662c4..e6fa5c437fc 100644 --- a/src/include/optimizer/prep.h +++ b/src/include/optimizer/prep.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: prep.h,v 1.29 2001/10/25 05:50:06 momjian Exp $ + * $Id: prep.h,v 1.30 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,4 +42,5 @@ extern List *expand_inherted_rtentry(Query *parse, Index rti, extern Node *adjust_inherited_attrs(Node *node, Index old_rt_index, Oid old_relid, Index new_rt_index, Oid new_relid); + #endif /* PREP_H */ diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h index 186cf288326..6fb0fb22eea 100644 --- a/src/include/optimizer/restrictinfo.h +++ b/src/include/optimizer/restrictinfo.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: restrictinfo.h,v 1.12 2001/10/25 05:50:06 momjian Exp $ + * $Id: restrictinfo.h,v 1.13 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,5 @@ extern bool restriction_is_or_clause(RestrictInfo *restrictinfo); extern List *get_actual_clauses(List *restrictinfo_list); extern void get_actual_join_clauses(List *restrictinfo_list, List **joinquals, List **otherquals); + #endif /* RESTRICTINFO_H */ diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h index a56fed5914e..9c56a7592ba 100644 --- a/src/include/optimizer/subselect.h +++ b/src/include/optimizer/subselect.h @@ -17,4 +17,5 @@ extern int PlannerPlanId; /* to assign unique ID to subquery plans */ extern List *SS_finalize_plan(Plan *plan); extern Node *SS_replace_correlation_vars(Node *expr); extern Node *SS_process_sublinks(Node *expr); + #endif /* SUBSELECT_H */ diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h index 796649d5964..44c4965bf6b 100644 --- a/src/include/optimizer/tlist.h +++ b/src/include/optimizer/tlist.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: tlist.h,v 1.29 2001/10/25 05:50:06 momjian Exp $ + * $Id: tlist.h,v 1.30 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,4 +32,5 @@ extern TargetEntry *get_sortgroupclause_tle(SortClause *sortClause, List *targetList); extern Node *get_sortgroupclause_expr(SortClause *sortClause, List *targetList); + #endif /* TLIST_H */ diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h index 536fc839e10..9d3fdc5e51b 100644 --- a/src/include/optimizer/var.h +++ b/src/include/optimizer/var.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: var.h,v 1.15 2001/10/25 05:50:06 momjian Exp $ + * $Id: var.h,v 1.16 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,5 @@ extern bool contain_var_reference(Node *node, int varno, int varattno, extern bool contain_whole_tuple_var(Node *node, int varno, int levelsup); extern bool contain_var_clause(Node *node); extern List *pull_var_clause(Node *node, bool includeUpperVars); + #endif /* VAR_H */ diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h index b72ed674118..9b21d31f866 100644 --- a/src/include/parser/analyze.h +++ b/src/include/parser/analyze.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: analyze.h,v 1.16 2001/10/25 05:50:06 momjian Exp $ + * $Id: analyze.h,v 1.17 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern void CheckSelectForUpdate(Query *qry); /* This was exported to allow ADD CONSTRAINT to make use of it */ extern char *makeObjectName(char *name1, char *name2, char *typename); + #endif /* ANALYZE_H */ diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h index 3399b7ea353..14829dafc80 100644 --- a/src/include/parser/gramparse.h +++ b/src/include/parser/gramparse.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: gramparse.h,v 1.17 2001/10/25 05:50:06 momjian Exp $ + * $Id: gramparse.h,v 1.18 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,4 +30,5 @@ extern int yyparse(void); extern char *xlateSqlFunc(char *name); extern char *xlateSqlType(char *name); bool exprIsNullConstant(Node *arg); + #endif /* GRAMPARSE_H */ diff --git a/src/include/parser/keywords.h b/src/include/parser/keywords.h index ef4b6658969..b9c0abc8109 100644 --- a/src/include/parser/keywords.h +++ b/src/include/parser/keywords.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: keywords.h,v 1.10 2001/10/25 05:50:06 momjian Exp $ + * $Id: keywords.h,v 1.11 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ typedef struct ScanKeyword } ScanKeyword; extern ScanKeyword *ScanKeywordLookup(char *text); + #endif /* KEYWORDS_H */ diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h index 943f4d54da1..fb6048560bd 100644 --- a/src/include/parser/parse_agg.h +++ b/src/include/parser/parse_agg.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: parse_agg.h,v 1.18 2001/10/25 05:50:06 momjian Exp $ + * $Id: parse_agg.h,v 1.19 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,5 @@ extern Aggref *ParseAgg(ParseState *pstate, char *aggname, Oid basetype, List *args, bool agg_star, bool agg_distinct, int precedence); extern void agg_error(char *caller, char *aggname, Oid basetypeID); + #endif /* PARSE_AGG_H */ diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h index 2e47fe8a356..ed97f6a8578 100644 --- a/src/include/parser/parse_clause.h +++ b/src/include/parser/parse_clause.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: parse_clause.h,v 1.25 2001/10/25 05:50:06 momjian Exp $ + * $Id: parse_clause.h,v 1.26 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,4 +30,5 @@ extern List *transformDistinctClause(ParseState *pstate, List *distinctlist, extern List *addAllTargetsToSortList(List *sortlist, List *targetlist); extern Index assignSortGroupRef(TargetEntry *tle, List *tlist); + #endif /* PARSE_CLAUSE_H */ diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index 4614492d8e2..e556db33b38 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.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: parse_coerce.h,v 1.35 2001/10/25 05:50:06 momjian Exp $ + * $Id: parse_coerce.h,v 1.36 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,18 +19,18 @@ typedef enum CATEGORY { - INVALID_TYPE, - UNKNOWN_TYPE, - BOOLEAN_TYPE, - STRING_TYPE, - BITSTRING_TYPE, - NUMERIC_TYPE, - DATETIME_TYPE, - TIMESPAN_TYPE, - GEOMETRIC_TYPE, - NETWORK_TYPE, - USER_TYPE, - MIXED_TYPE + INVALID_TYPE, + UNKNOWN_TYPE, + BOOLEAN_TYPE, + STRING_TYPE, + BITSTRING_TYPE, + NUMERIC_TYPE, + DATETIME_TYPE, + TIMESPAN_TYPE, + GEOMETRIC_TYPE, + NETWORK_TYPE, + USER_TYPE, + MIXED_TYPE } CATEGORY; @@ -81,4 +81,5 @@ extern Oid select_common_type(List *typeids, const char *context); extern Node *coerce_to_common_type(ParseState *pstate, Node *node, Oid targetTypeId, const char *context); + #endif /* PARSE_COERCE_H */ diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h index 6cc0796ca93..2367ac9dc9f 100644 --- a/src/include/parser/parse_expr.h +++ b/src/include/parser/parse_expr.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: parse_expr.h,v 1.23 2001/10/25 05:50:06 momjian Exp $ + * $Id: parse_expr.h,v 1.24 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,5 @@ extern int32 exprTypmod(Node *expr); extern bool exprIsLengthCoercion(Node *expr, int32 *coercedTypmod); extern void parse_expr_init(void); extern char *TypeNameToInternalName(TypeName *typename); + #endif /* PARSE_EXPR_H */ diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index fb63798e784..6edf39689d4 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.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: parse_func.h,v 1.33 2001/10/25 05:50:06 momjian Exp $ + * $Id: parse_func.h,v 1.34 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,9 +41,9 @@ typedef struct _CandidateList /* Result codes for func_get_detail */ typedef enum { - FUNCDETAIL_NOTFOUND, /* no suitable interpretation */ - FUNCDETAIL_NORMAL, /* found a matching function */ - FUNCDETAIL_COERCION /* it's a type coercion request */ + FUNCDETAIL_NOTFOUND, /* no suitable interpretation */ + FUNCDETAIL_NORMAL, /* found a matching function */ + FUNCDETAIL_COERCION /* it's a type coercion request */ } FuncDetailCode; @@ -63,4 +63,5 @@ extern bool typeInheritsFrom(Oid subclassTypeId, Oid superclassTypeId); extern void func_error(char *caller, char *funcname, int nargs, Oid *argtypes, char *msg); + #endif /* PARSE_FUNC_H */ diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h index 2efb13ac2ac..ce8f3007d0f 100644 --- a/src/include/parser/parse_node.h +++ b/src/include/parser/parse_node.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_node.h,v 1.27 2001/10/25 05:50:08 momjian Exp $ + * $Id: parse_node.h,v 1.28 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,4 +62,5 @@ extern ArrayRef *transformArraySubscripts(ParseState *pstate, bool forceSlice, Node *assignFrom); extern Const *make_const(Value *value); + #endif /* PARSE_NODE_H */ diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h index cde4a1fe544..89e2df820b4 100644 --- a/src/include/parser/parse_oper.h +++ b/src/include/parser/parse_oper.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: parse_oper.h,v 1.16 2001/10/25 05:50:09 momjian Exp $ + * $Id: parse_oper.h,v 1.17 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,4 +41,5 @@ extern Oid any_ordering_op(Oid argtype); /* Extract operator OID or underlying-function OID from an Operator tuple */ extern Oid oprid(Operator op); extern Oid oprfuncid(Operator op); + #endif /* PARSE_OPER_H */ diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index 81d3584e838..dd8307c778e 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.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: parse_relation.h,v 1.26 2001/10/25 05:50:09 momjian Exp $ + * $Id: parse_relation.h,v 1.27 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,4 +47,5 @@ extern List *expandJoinAttrs(ParseState *pstate, JoinExpr *join, extern int attnameAttNum(Relation rd, char *a); extern Name attnumAttName(Relation rd, int attid); extern Oid attnumTypeId(Relation rd, int attid); + #endif /* PARSE_RELATION_H */ diff --git a/src/include/parser/parse_target.h b/src/include/parser/parse_target.h index 5ce539bfd60..f31f49dbf44 100644 --- a/src/include/parser/parse_target.h +++ b/src/include/parser/parse_target.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: parse_target.h,v 1.21 2001/10/25 05:50:09 momjian Exp $ + * $Id: parse_target.h,v 1.22 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,5 @@ extern Node *CoerceTargetExpr(ParseState *pstate, Node *expr, Oid type_id, Oid attrtype, int32 attrtypmod); extern List *checkInsertTargets(ParseState *pstate, List *cols, List **attrnos); + #endif /* PARSE_TARGET_H */ diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h index 3b3689af5f3..47b756d6b49 100644 --- a/src/include/parser/parse_type.h +++ b/src/include/parser/parse_type.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: parse_type.h,v 1.18 2001/10/25 05:50:09 momjian Exp $ + * $Id: parse_type.h,v 1.19 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,4 +37,5 @@ extern Oid typenameTypeId(char *s); extern void parseTypeString(const char *str, Oid *type_id, int32 *typmod); #define ISCOMPLEX(typeid) (typeidTypeRelid(typeid) != InvalidOid) + #endif /* PARSE_TYPE_H */ diff --git a/src/include/parser/parser.h b/src/include/parser/parser.h index d4c80288776..e0e201cd488 100644 --- a/src/include/parser/parser.h +++ b/src/include/parser/parser.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: parser.h,v 1.9 2001/10/25 05:50:09 momjian Exp $ + * $Id: parser.h,v 1.10 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,5 @@ #include "parser/parse_node.h" extern List *parser(char *str, Oid *typev, int nargs); + #endif /* PARSER_H */ diff --git a/src/include/parser/parsetree.h b/src/include/parser/parsetree.h index fdf0218d8c6..7392f2e2242 100644 --- a/src/include/parser/parsetree.h +++ b/src/include/parser/parsetree.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parsetree.h,v 1.14 2001/10/25 05:50:09 momjian Exp $ + * $Id: parsetree.h,v 1.15 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,4 +51,5 @@ * variable name or alias for that attribute of that RTE. */ extern char *get_rte_attribute_name(RangeTblEntry *rte, AttrNumber attnum); + #endif /* PARSETREE_H */ diff --git a/src/include/parser/scansup.h b/src/include/parser/scansup.h index b8cd4023e52..a82839cdb79 100644 --- a/src/include/parser/scansup.h +++ b/src/include/parser/scansup.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: scansup.h,v 1.9 2001/10/25 05:50:09 momjian Exp $ + * $Id: scansup.h,v 1.10 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,4 +16,5 @@ #define SCANSUP_H extern char *scanstr(char *s); + #endif /* SCANSUP_H */ diff --git a/src/include/port/darwin.h b/src/include/port/darwin.h index 618eded7fd6..0d35a8a2f49 100644 --- a/src/include/port/darwin.h +++ b/src/include/port/darwin.h @@ -9,4 +9,5 @@ typedef unsigned int slock_t; #else typedef unsigned char slock_t; + #endif diff --git a/src/include/port/darwin/sem.h b/src/include/port/darwin/sem.h index 9e4b95abf64..96df7bd6033 100644 --- a/src/include/port/darwin/sem.h +++ b/src/include/port/darwin/sem.h @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/include/port/darwin/Attic/sem.h,v 1.3 2001/10/25 05:50:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/port/darwin/Attic/sem.h,v 1.4 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -70,4 +70,5 @@ extern "C" #ifdef __cplusplus } #endif + #endif /* _SYS_SEM_H */ diff --git a/src/include/port/dgux.h b/src/include/port/dgux.h index d8fd311e69c..e0e0c74de18 100644 --- a/src/include/port/dgux.h +++ b/src/include/port/dgux.h @@ -9,4 +9,5 @@ #endif #ifndef BYTE_ORDER #define BYTE_ORDER BIG_ENDIAN + #endif diff --git a/src/include/port/freebsd.h b/src/include/port/freebsd.h index 7759191b8d2..a884b9da0d9 100644 --- a/src/include/port/freebsd.h +++ b/src/include/port/freebsd.h @@ -33,4 +33,5 @@ typedef unsigned char slock_t; #if defined(__mips__) /* # undef HAS_TEST_AND_SET */ + #endif diff --git a/src/include/port/hpux.h b/src/include/port/hpux.h index 870b12f263a..e140c3cfcfc 100644 --- a/src/include/port/hpux.h +++ b/src/include/port/hpux.h @@ -15,4 +15,5 @@ typedef struct #endif #ifndef BYTE_ORDER #define BYTE_ORDER BIG_ENDIAN + #endif diff --git a/src/include/port/linux.h b/src/include/port/linux.h index b46766570ee..c5d58489ba1 100644 --- a/src/include/port/linux.h +++ b/src/include/port/linux.h @@ -37,4 +37,5 @@ typedef unsigned int slock_t; typedef unsigned int slock_t; #define HAS_TEST_AND_SET + #endif diff --git a/src/include/port/netbsd.h b/src/include/port/netbsd.h index aba5c72fe62..7729fa5b9bb 100644 --- a/src/include/port/netbsd.h +++ b/src/include/port/netbsd.h @@ -44,4 +44,5 @@ typedef unsigned long slock_t; #if defined(__powerpc__) #define HAS_TEST_AND_SET typedef unsigned int slock_t; + #endif diff --git a/src/include/port/openbsd.h b/src/include/port/openbsd.h index aba5c72fe62..7729fa5b9bb 100644 --- a/src/include/port/openbsd.h +++ b/src/include/port/openbsd.h @@ -44,4 +44,5 @@ typedef unsigned long slock_t; #if defined(__powerpc__) #define HAS_TEST_AND_SET typedef unsigned int slock_t; + #endif diff --git a/src/include/port/osf.h b/src/include/port/osf.h index aec6a70dbee..6dfe3ea9b82 100644 --- a/src/include/port/osf.h +++ b/src/include/port/osf.h @@ -1,7 +1,7 @@ #define NOFIXADE #define DISABLE_XOPEN_NLS #define HAS_TEST_AND_SET - /* #include <sys/mman.h> *//* for msemaphore */ + /* #include <sys/mman.h> */ /* for msemaphore */ /*typedef msemaphore slock_t;*/ #include <alpha/builtins.h> typedef volatile long slock_t; diff --git a/src/include/port/sco.h b/src/include/port/sco.h index 438e5b2001f..7aa2370443e 100644 --- a/src/include/port/sco.h +++ b/src/include/port/sco.h @@ -19,4 +19,5 @@ typedef unsigned char slock_t; #endif #ifndef BYTE_ORDER #define BYTE_ORDER LITTLE_ENDIAN + #endif diff --git a/src/include/port/solaris.h b/src/include/port/solaris.h index af715f5e11d..ac1e485ba3d 100644 --- a/src/include/port/solaris.h +++ b/src/include/port/solaris.h @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/include/port/solaris.h,v 1.5 2001/10/25 05:50:09 momjian Exp $ */ +/* $Header: /cvsroot/pgsql/src/include/port/solaris.h,v 1.6 2001/10/28 06:26:08 momjian Exp $ */ #define HAS_TEST_AND_SET typedef unsigned char slock_t; @@ -57,4 +57,5 @@ typedef unsigned char slock_t; #define NAN (0.0/0.0) #endif /* GCC. */ + #endif /* not NAN */ diff --git a/src/include/port/sunos4.h b/src/include/port/sunos4.h index 06c5ba99e30..5d7e911cf34 100644 --- a/src/include/port/sunos4.h +++ b/src/include/port/sunos4.h @@ -15,4 +15,5 @@ typedef unsigned char slock_t; #endif #ifndef BYTE_ORDER #define BYTE_ORDER BIG_ENDIAN + #endif diff --git a/src/include/port/svr4.h b/src/include/port/svr4.h index d5e7f90f72c..2c6e2b4e713 100644 --- a/src/include/port/svr4.h +++ b/src/include/port/svr4.h @@ -9,4 +9,5 @@ #include "abi_mutex.h" typedef abilock_t slock_t; + #endif diff --git a/src/include/port/univel.h b/src/include/port/univel.h index 071ac1f1ad2..16c85b9fa4c 100644 --- a/src/include/port/univel.h +++ b/src/include/port/univel.h @@ -20,4 +20,5 @@ typedef unsigned char slock_t; #endif #ifndef BYTE_ORDER #define BYTE_ORDER LITTLE_ENDIAN + #endif diff --git a/src/include/port/unixware.h b/src/include/port/unixware.h index 789f1e1b72d..da02084c697 100644 --- a/src/include/port/unixware.h +++ b/src/include/port/unixware.h @@ -23,4 +23,5 @@ typedef unsigned char slock_t; #endif #ifndef BYTE_ORDER #define BYTE_ORDER LITTLE_ENDIAN + #endif diff --git a/src/include/port/win.h b/src/include/port/win.h index b9d6308d77d..e22502d39fb 100644 --- a/src/include/port/win.h +++ b/src/include/port/win.h @@ -15,4 +15,5 @@ typedef unsigned char slock_t; */ #if CYGWIN_VERSION_DLL_MAJOR < 1001 #undef HAVE_UNIX_SOCKETS + #endif diff --git a/src/include/postgres.h b/src/include/postgres.h index 39c6fffdcab..41f141677ba 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $Id: postgres.h,v 1.54 2001/10/25 05:49:54 momjian Exp $ + * $Id: postgres.h,v 1.55 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -77,7 +77,7 @@ typedef struct varattrib int32 va_extsize; /* External saved size */ Oid va_valueid; /* Unique identifier of value */ Oid va_toastrelid; /* RelID where to find chunks */ - } va_external; /* External stored attribute */ + } va_external; /* External stored attribute */ char va_data[1]; /* Plain stored attribute */ } va_content; diff --git a/src/include/postgres_ext.h b/src/include/postgres_ext.h index dc9058360bc..0699cebdf8d 100644 --- a/src/include/postgres_ext.h +++ b/src/include/postgres_ext.h @@ -15,7 +15,7 @@ * use header files that are otherwise internal to Postgres to interface * with the backend. * - * $Id: postgres_ext.h,v 1.8 2001/10/25 05:49:55 momjian Exp $ + * $Id: postgres_ext.h,v 1.9 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,4 +41,5 @@ typedef unsigned int Oid; * NOTE that databases with different NAMEDATALEN's cannot interoperate! */ #define NAMEDATALEN 32 + #endif diff --git a/src/include/postgres_fe.h b/src/include/postgres_fe.h index 4aed68eb194..8480481705b 100644 --- a/src/include/postgres_fe.h +++ b/src/include/postgres_fe.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $Id: postgres_fe.h,v 1.3 2001/10/25 05:49:55 momjian Exp $ + * $Id: postgres_fe.h,v 1.4 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,4 +19,5 @@ #define POSTGRES_FE_H #include "c.h" + #endif /* POSTGRES_FE_H */ diff --git a/src/include/regex/cclass.h b/src/include/regex/cclass.h index c0ae7da4f65..700c712d8ca 100644 --- a/src/include/regex/cclass.h +++ b/src/include/regex/cclass.h @@ -43,7 +43,7 @@ static struct cclass char *name; char *chars; char *multis; -} cclasses[] = +} cclasses[] = { { diff --git a/src/include/regex/cname.h b/src/include/regex/cname.h index a333e9c4e5e..235de80a2d5 100644 --- a/src/include/regex/cname.h +++ b/src/include/regex/cname.h @@ -42,7 +42,7 @@ static struct cname { char *name; char code; -} cnames[] = +} cnames[] = { { diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h index 9ef8bee95a5..180bfe204f5 100644 --- a/src/include/regex/regex.h +++ b/src/include/regex/regex.h @@ -109,4 +109,5 @@ extern int pg95_regexec(const regex_t *preg, const char *string, size_t nmatch, regmatch_t *pmatch, int eflags); extern void pg95_regfree(regex_t *preg); + #endif /* !_REGEX_H_ */ diff --git a/src/include/regex/regex2.h b/src/include/regex/regex2.h index 8bcdddb65ab..98bf46a52e3 100644 --- a/src/include/regex/regex2.h +++ b/src/include/regex/regex2.h @@ -193,4 +193,5 @@ struct re_guts (isalnum((unsigned char) (c)) || (c) == '_')) #else #define ISWORD(c) (isalnum((unsigned char) (c)) || (c) == '_') + #endif diff --git a/src/include/regex/utils.h b/src/include/regex/utils.h index 0ef6c50a8e2..4a29c217264 100644 --- a/src/include/regex/utils.h +++ b/src/include/regex/utils.h @@ -60,4 +60,5 @@ typedef unsigned char uch; #define NDEBUG /* no assertions please */ #endif #endif + #endif /* _REGEX_UTILS_H */ diff --git a/src/include/rewrite/prs2lock.h b/src/include/rewrite/prs2lock.h index 3d24d331383..983f41f1c9a 100644 --- a/src/include/rewrite/prs2lock.h +++ b/src/include/rewrite/prs2lock.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: prs2lock.h,v 1.13 2001/10/25 05:50:09 momjian Exp $ + * $Id: prs2lock.h,v 1.14 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,4 +42,5 @@ typedef struct RuleLock int numLocks; RewriteRule **rules; } RuleLock; + #endif /* REWRITE_H */ diff --git a/src/include/rewrite/rewriteDefine.h b/src/include/rewrite/rewriteDefine.h index 91ab7272c96..49d3d1896e0 100644 --- a/src/include/rewrite/rewriteDefine.h +++ b/src/include/rewrite/rewriteDefine.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: rewriteDefine.h,v 1.11 2001/10/25 05:50:09 momjian Exp $ + * $Id: rewriteDefine.h,v 1.12 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,4 +19,5 @@ extern void DefineQueryRewrite(RuleStmt *args); extern void RenameRewriteRule(char *oldname, char *newname); + #endif /* REWRITEDEFINE_H */ diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h index 1a80dd2b3ce..a8210cc4e96 100644 --- a/src/include/rewrite/rewriteHandler.h +++ b/src/include/rewrite/rewriteHandler.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: rewriteHandler.h,v 1.16 2001/10/25 05:50:09 momjian Exp $ + * $Id: rewriteHandler.h,v 1.17 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,4 +18,5 @@ extern List *QueryRewrite(Query *parsetree); + #endif /* REWRITEHANDLER_H */ diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h index cdb28e01496..75539b33447 100644 --- a/src/include/rewrite/rewriteManip.h +++ b/src/include/rewrite/rewriteManip.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: rewriteManip.h,v 1.28 2001/10/25 05:50:09 momjian Exp $ + * $Id: rewriteManip.h,v 1.29 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,4 +39,5 @@ extern bool checkExprHasSubLink(Node *node); extern Node *ResolveNew(Node *node, int target_varno, int sublevels_up, List *targetlist, int event, int update_varno); + #endif /* REWRITEMANIP_H */ diff --git a/src/include/rewrite/rewriteRemove.h b/src/include/rewrite/rewriteRemove.h index a961ea5a86b..d6a440912a2 100644 --- a/src/include/rewrite/rewriteRemove.h +++ b/src/include/rewrite/rewriteRemove.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: rewriteRemove.h,v 1.8 2001/10/25 05:50:09 momjian Exp $ + * $Id: rewriteRemove.h,v 1.9 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,5 @@ extern char *RewriteGetRuleEventRel(char *rulename); extern void RemoveRewriteRule(char *ruleName); extern void RelationRemoveRules(Oid relid); + #endif /* REWRITEREMOVE_H */ diff --git a/src/include/rewrite/rewriteSupport.h b/src/include/rewrite/rewriteSupport.h index 7fa559f4c18..b64a20a8dc1 100644 --- a/src/include/rewrite/rewriteSupport.h +++ b/src/include/rewrite/rewriteSupport.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: rewriteSupport.h,v 1.18 2001/10/25 05:50:09 momjian Exp $ + * $Id: rewriteSupport.h,v 1.19 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,5 @@ extern char *MakeRetrieveViewRuleName(const char *view_name); extern void SetRelationRuleStatus(Oid relationId, bool relHasRules, bool relIsBecomingView); + #endif /* REWRITESUPPORT_H */ diff --git a/src/include/rusagestub.h b/src/include/rusagestub.h index 9f3d92e4e02..da8cc6125d2 100644 --- a/src/include/rusagestub.h +++ b/src/include/rusagestub.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: rusagestub.h,v 1.7 2001/10/25 05:49:55 momjian Exp $ + * $Id: rusagestub.h,v 1.8 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,5 @@ struct rusage }; extern int getrusage(int who, struct rusage * rusage); + #endif /* RUSAGESTUB_H */ diff --git a/src/include/storage/backendid.h b/src/include/storage/backendid.h index 1eac0172e3d..212f4e0f11e 100644 --- a/src/include/storage/backendid.h +++ b/src/include/storage/backendid.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: backendid.h,v 1.10 2001/10/25 05:50:09 momjian Exp $ + * $Id: backendid.h,v 1.11 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,4 +24,5 @@ typedef int BackendId; /* unique currently active backend #define InvalidBackendId (-1) extern BackendId MyBackendId; /* backend id of this backend */ + #endif /* BACKENDID_H */ diff --git a/src/include/storage/block.h b/src/include/storage/block.h index 90bcf6b2c53..d4516f5b7b8 100644 --- a/src/include/storage/block.h +++ b/src/include/storage/block.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: block.h,v 1.14 2001/10/25 05:50:09 momjian Exp $ + * $Id: block.h,v 1.15 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -117,4 +117,5 @@ typedef BlockIdData *BlockId; /* block identifier */ AssertMacro(BlockIdIsValid(blockId)), \ (BlockNumber) (((blockId)->bi_hi << 16) | ((uint16) (blockId)->bi_lo)) \ ) + #endif /* BLOCK_H */ diff --git a/src/include/storage/buf.h b/src/include/storage/buf.h index 4d767b808fc..702a3976d1a 100644 --- a/src/include/storage/buf.h +++ b/src/include/storage/buf.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: buf.h,v 1.10 2001/10/25 05:50:09 momjian Exp $ + * $Id: buf.h,v 1.11 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,4 +43,5 @@ typedef int Buffer; * - plai 9/10/90 */ #undef NO_BUFFERISVALID + #endif /* BUF_H */ diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h index 2ba2cfb3aa6..46eca54d11a 100644 --- a/src/include/storage/buf_internals.h +++ b/src/include/storage/buf_internals.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: buf_internals.h,v 1.52 2001/10/25 05:50:09 momjian Exp $ + * $Id: buf_internals.h,v 1.53 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -102,7 +102,7 @@ typedef struct sbufdesc * BM_PIN_COUNT_WAITER. At present, there can be only one such waiter * per buffer. */ - BackendId wait_backend_id; /* backend ID of pin-count waiter */ + BackendId wait_backend_id; /* backend ID of pin-count waiter */ } BufferDesc; #define BufferDescriptorGetBuffer(bdesc) ((bdesc)->buf_id + 1) @@ -183,4 +183,5 @@ extern int WriteLocalBuffer(Buffer buffer, bool release); extern int FlushLocalBuffer(Buffer buffer, bool sync, bool release); extern void LocalBufferSync(void); extern void ResetLocalBufferPool(void); + #endif /* BUFMGR_INTERNALS_H */ diff --git a/src/include/storage/buffile.h b/src/include/storage/buffile.h index c39463a7e06..cf40254bee1 100644 --- a/src/include/storage/buffile.h +++ b/src/include/storage/buffile.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: buffile.h,v 1.9 2001/10/25 05:50:10 momjian Exp $ + * $Id: buffile.h,v 1.10 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,4 +41,5 @@ extern size_t BufFileWrite(BufFile *file, void *ptr, size_t size); extern int BufFileSeek(BufFile *file, int fileno, long offset, int whence); extern void BufFileTell(BufFile *file, int *fileno, long *offset); extern int BufFileSeekBlock(BufFile *file, long blknum); + #endif /* BUFFILE_H */ diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index 8d755db16e3..1655ad02e50 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.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: bufmgr.h,v 1.55 2001/10/25 05:50:10 momjian Exp $ + * $Id: bufmgr.h,v 1.56 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -191,4 +191,5 @@ extern void BufmgrCommit(void); extern void BufferSync(void); extern void InitLocalBuffer(void); + #endif diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h index b948fd06b8b..58b83515f63 100644 --- a/src/include/storage/bufpage.h +++ b/src/include/storage/bufpage.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: bufpage.h,v 1.44 2001/10/25 05:50:10 momjian Exp $ + * $Id: bufpage.h,v 1.45 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -132,8 +132,8 @@ typedef PageHeaderData *PageHeader; typedef enum { - ShufflePageManagerMode, - OverwritePageManagerMode + ShufflePageManagerMode, + OverwritePageManagerMode } PageManagerMode; /* ---------------------------------------------------------------- diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h index 31eb02c72d5..670a7e5abab 100644 --- a/src/include/storage/fd.h +++ b/src/include/storage/fd.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: fd.h,v 1.32 2001/10/25 05:50:10 momjian Exp $ + * $Id: fd.h,v 1.33 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -78,4 +78,5 @@ extern void AtEOXact_Files(void); extern void RemovePgTempFiles(void); extern int pg_fsync(int fd); extern int pg_fdatasync(int fd); + #endif /* FD_H */ diff --git a/src/include/storage/freespace.h b/src/include/storage/freespace.h index 6aebd60e20c..d9ba1a796f9 100644 --- a/src/include/storage/freespace.h +++ b/src/include/storage/freespace.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: freespace.h,v 1.4 2001/10/25 05:50:10 momjian Exp $ + * $Id: freespace.h,v 1.5 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,4 +47,5 @@ extern void FreeSpaceMapForgetDatabase(Oid dbid); #ifdef FREESPACE_DEBUG extern void DumpFreeSpace(void); #endif + #endif /* FREESPACE_H */ diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h index 861104d6e5a..451aede3c4a 100644 --- a/src/include/storage/ipc.h +++ b/src/include/storage/ipc.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: ipc.h,v 1.52 2001/10/25 05:50:10 momjian Exp $ + * $Id: ipc.h,v 1.53 2001/10/28 06:26:08 momjian Exp $ * * Some files that would normally need to include only sys/ipc.h must * instead include this file because on Ultrix, sys/ipc.h is not designed @@ -89,4 +89,5 @@ extern bool SharedMemoryIsInUse(IpcMemoryKey shmKey, IpcMemoryId shmId); /* ipci.c */ extern void CreateSharedMemoryAndSemaphores(bool makePrivate, int maxBackends); + #endif /* IPC_H */ diff --git a/src/include/storage/item.h b/src/include/storage/item.h index afb869444a8..1bfcabb1eea 100644 --- a/src/include/storage/item.h +++ b/src/include/storage/item.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: item.h,v 1.8 2001/10/25 05:50:10 momjian Exp $ + * $Id: item.h,v 1.9 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,4 +15,5 @@ #define ITEM_H typedef Pointer Item; + #endif /* ITEM_H */ diff --git a/src/include/storage/itemid.h b/src/include/storage/itemid.h index ab4dca9b516..fae39dfc7f1 100644 --- a/src/include/storage/itemid.h +++ b/src/include/storage/itemid.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: itemid.h,v 1.17 2001/10/25 05:50:10 momjian Exp $ + * $Id: itemid.h,v 1.18 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -93,4 +93,5 @@ typedef bits16 ItemIdFlags; AssertMacro(ItemIdIsValid(itemId)), \ (bool) (((itemId)->lp_flags & LP_USED) != 0) \ ) + #endif /* ITEMID_H */ diff --git a/src/include/storage/itempos.h b/src/include/storage/itempos.h index 453863cd40b..1b18928a8d9 100644 --- a/src/include/storage/itempos.h +++ b/src/include/storage/itempos.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: itempos.h,v 1.13 2001/10/25 05:50:10 momjian Exp $ + * $Id: itempos.h,v 1.14 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,4 +41,5 @@ typedef ItemSubpositionData *ItemSubposition; */ #define PSKIP(OBJP, LEN)\ do { (OBJP)->op_cp += (LEN); (OBJP)->op_len -= (LEN); } while (0) + #endif /* ITEMPOS_H */ diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h index 30fb9184773..f9d8e27f3dc 100644 --- a/src/include/storage/itemptr.h +++ b/src/include/storage/itemptr.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: itemptr.h,v 1.19 2001/10/25 05:50:10 momjian Exp $ + * $Id: itemptr.h,v 1.20 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -142,4 +142,5 @@ typedef ItemPointerData *ItemPointer; */ extern bool ItemPointerEquals(ItemPointer pointer1, ItemPointer pointer2); + #endif /* ITEMPTR_H */ diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h index a87a8e301b9..8ea1d34df43 100644 --- a/src/include/storage/large_object.h +++ b/src/include/storage/large_object.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: large_object.h,v 1.22 2001/10/25 05:50:10 momjian Exp $ + * $Id: large_object.h,v 1.23 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,4 +75,5 @@ extern int inv_seek(LargeObjectDesc *obj_desc, int offset, int whence); extern int inv_tell(LargeObjectDesc *obj_desc); extern int inv_read(LargeObjectDesc *obj_desc, char *buf, int nbytes); extern int inv_write(LargeObjectDesc *obj_desc, char *buf, int nbytes); + #endif /* LARGE_OBJECT_H */ diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h index c481b884a65..4dbecc07dfc 100644 --- a/src/include/storage/lmgr.h +++ b/src/include/storage/lmgr.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: lmgr.h,v 1.33 2001/10/25 05:50:10 momjian Exp $ + * $Id: lmgr.h,v 1.34 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,4 +61,5 @@ extern void UnlockPage(Relation relation, BlockNumber blkno, LOCKMODE lockmode); /* Lock an XID (used to wait for a transaction to finish) */ extern void XactLockTableInsert(TransactionId xid); extern void XactLockTableWait(TransactionId xid); + #endif /* LMGR_H */ diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index b5f20b3cb81..e21d0ff5068 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.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: lock.h,v 1.57 2001/10/25 05:50:10 momjian Exp $ + * $Id: lock.h,v 1.58 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -251,4 +251,5 @@ extern void InitDeadLockChecking(void); extern void DumpLocks(void); extern void DumpAllLocks(void); #endif + #endif /* LOCK_H */ diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h index 1725fc3b73d..02bb9b5b454 100644 --- a/src/include/storage/lwlock.h +++ b/src/include/storage/lwlock.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: lwlock.h,v 1.2 2001/10/25 05:50:10 momjian Exp $ + * $Id: lwlock.h,v 1.3 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,31 +25,31 @@ */ typedef enum LWLockId { - BufMgrLock, - LockMgrLock, - OidGenLock, - XidGenLock, - ShmemIndexLock, - SInvalLock, - FreeSpaceLock, - MMCacheLock, - WALInsertLock, - WALWriteLock, - ControlFileLock, - CheckpointLock, - CLogControlLock, + BufMgrLock, + LockMgrLock, + OidGenLock, + XidGenLock, + ShmemIndexLock, + SInvalLock, + FreeSpaceLock, + MMCacheLock, + WALInsertLock, + WALWriteLock, + ControlFileLock, + CheckpointLock, + CLogControlLock, - NumFixedLWLocks,/* must be last except for + NumFixedLWLocks, /* must be last except for * MaxDynamicLWLock */ - MaxDynamicLWLock = 1000000000 + MaxDynamicLWLock = 1000000000 } LWLockId; typedef enum LWLockMode { - LW_EXCLUSIVE, - LW_SHARED + LW_EXCLUSIVE, + LW_SHARED } LWLockMode; @@ -66,4 +66,5 @@ extern void LWLockReleaseAll(void); extern int NumLWLocks(void); extern int LWLockShmemSize(void); extern void CreateLWLocks(void); + #endif /* LWLOCK_H */ diff --git a/src/include/storage/off.h b/src/include/storage/off.h index a575b8d23ff..7af9032c8ee 100644 --- a/src/include/storage/off.h +++ b/src/include/storage/off.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: off.h,v 1.11 2001/10/25 05:50:10 momjian Exp $ + * $Id: off.h,v 1.12 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -54,4 +54,5 @@ typedef uint16 OffsetNumber; ((OffsetNumber) (1 + (offsetNumber))) #define OffsetNumberPrev(offsetNumber) \ ((OffsetNumber) (-1 + (offsetNumber))) + #endif /* OFF_H */ diff --git a/src/include/storage/page.h b/src/include/storage/page.h index baf7e3ed262..be2ab631f38 100644 --- a/src/include/storage/page.h +++ b/src/include/storage/page.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: page.h,v 1.9 2001/10/25 05:50:10 momjian Exp $ + * $Id: page.h,v 1.10 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ typedef Pointer Page; * True iff page is valid. */ #define PageIsValid(page) PointerIsValid(page) + #endif /* PAGE_H */ diff --git a/src/include/storage/pos.h b/src/include/storage/pos.h index 7035fe74f51..e42c7fa521c 100644 --- a/src/include/storage/pos.h +++ b/src/include/storage/pos.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: pos.h,v 1.11 2001/10/25 05:50:10 momjian Exp $ + * $Id: pos.h,v 1.12 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,4 +61,5 @@ typedef PositionIdData *PositionId; */ #define PositionIdGetOffsetNumber(positionId) \ ((OffsetNumber) *(positionId)) + #endif /* POS_H */ diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 4be08aa3d27..43be9f043af 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.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: proc.h,v 1.51 2001/10/25 05:50:10 momjian Exp $ + * $Id: proc.h,v 1.52 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -152,4 +152,5 @@ extern void ProcSendSignal(BackendId procId); extern bool enable_sigalrm_interrupt(int delayms); extern bool disable_sigalrm_interrupt(void); + #endif /* PROC_H */ diff --git a/src/include/storage/relfilenode.h b/src/include/storage/relfilenode.h index 22af8343b53..c53dea8f399 100644 --- a/src/include/storage/relfilenode.h +++ b/src/include/storage/relfilenode.h @@ -18,4 +18,5 @@ typedef struct RelFileNode #define RelFileNodeEquals(node1, node2) \ ((node1).relNode == (node2).relNode && \ (node1).tblNode == (node2).tblNode) + #endif /* RELFILENODE_H */ diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h index ef529a08269..37ee5694ac8 100644 --- a/src/include/storage/shmem.h +++ b/src/include/storage/shmem.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: shmem.h,v 1.34 2001/10/25 05:50:10 momjian Exp $ + * $Id: shmem.h,v 1.35 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -95,4 +95,5 @@ extern void SHMQueueInsertBefore(SHM_QUEUE *queue, SHM_QUEUE *elem); extern Pointer SHMQueueNext(SHM_QUEUE *queue, SHM_QUEUE *curElem, Size linkOffset); extern bool SHMQueueEmpty(SHM_QUEUE *queue); + #endif /* SHMEM_H */ diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h index 21586b68bad..2e93d4293e8 100644 --- a/src/include/storage/sinval.h +++ b/src/include/storage/sinval.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: sinval.h,v 1.23 2001/10/25 05:50:10 momjian Exp $ + * $Id: sinval.h,v 1.24 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -78,4 +78,5 @@ extern int CountActiveBackends(void); /* Use "struct PROC", not PROC, to avoid including proc.h here */ extern struct PROC *BackendIdGetProc(BackendId procId); + #endif /* SINVAL_H */ diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h index e8d2967600b..aca1224e3b9 100644 --- a/src/include/storage/sinvaladt.h +++ b/src/include/storage/sinvaladt.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: sinvaladt.h,v 1.28 2001/10/25 05:50:10 momjian Exp $ + * $Id: sinvaladt.h,v 1.29 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -114,4 +114,5 @@ extern bool SIInsertDataEntry(SISeg *segP, SharedInvalidationMessage *data); extern int SIGetDataEntry(SISeg *segP, int backendId, SharedInvalidationMessage *data); extern void SIDelExpiredDataEntries(SISeg *segP); + #endif /* SINVALADT_H */ diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h index 2564fd04a2d..9a10232eba9 100644 --- a/src/include/storage/smgr.h +++ b/src/include/storage/smgr.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: smgr.h,v 1.32 2001/10/25 05:50:10 momjian Exp $ + * $Id: smgr.h,v 1.33 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -107,4 +107,5 @@ extern Datum smgrout(PG_FUNCTION_ARGS); extern Datum smgrin(PG_FUNCTION_ARGS); extern Datum smgreq(PG_FUNCTION_ARGS); extern Datum smgrne(PG_FUNCTION_ARGS); + #endif /* SMGR_H */ diff --git a/src/include/storage/spin.h b/src/include/storage/spin.h index 9d13097915a..2ef7f6de8a6 100644 --- a/src/include/storage/spin.h +++ b/src/include/storage/spin.h @@ -40,7 +40,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: spin.h,v 1.17 2001/10/25 05:50:10 momjian Exp $ + * $Id: spin.h,v 1.18 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -73,4 +73,5 @@ extern void CreateSpinlocks(void); + #endif /* SPIN_H */ diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h index 6e4fff9623b..9e81da48902 100644 --- a/src/include/tcop/dest.h +++ b/src/include/tcop/dest.h @@ -39,7 +39,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dest.h,v 1.26 2001/10/25 05:50:10 momjian Exp $ + * $Id: dest.h,v 1.27 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -55,12 +55,12 @@ */ typedef enum { - None, /* results are discarded */ - Debug, /* results go to debugging output */ - Remote, /* results sent to frontend process */ - RemoteInternal, /* results sent to frontend process in + None, /* results are discarded */ + Debug, /* results go to debugging output */ + Remote, /* results sent to frontend process */ + RemoteInternal, /* results sent to frontend process in * internal (binary) form */ - SPI /* results sent to SPI manager */ + SPI /* results sent to SPI manager */ } CommandDest; /* ---------------- @@ -97,4 +97,5 @@ extern void ReceiveCopyBegin(void); extern void NullCommand(CommandDest dest); extern void ReadyForQuery(CommandDest dest); extern void UpdateCommandInfo(int operation, Oid lastoid, uint32 tuples); + #endif /* DEST_H */ diff --git a/src/include/tcop/fastpath.h b/src/include/tcop/fastpath.h index b46c568d7db..901504bfd8a 100644 --- a/src/include/tcop/fastpath.h +++ b/src/include/tcop/fastpath.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fastpath.h,v 1.10 2001/10/25 05:50:10 momjian Exp $ + * $Id: fastpath.h,v 1.11 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,4 +14,5 @@ #define FASTPATH_H extern int HandleFunctionRequest(void); + #endif /* FASTPATH_H */ diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h index 336e0323e04..29bd0f7e170 100644 --- a/src/include/tcop/pquery.h +++ b/src/include/tcop/pquery.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: pquery.h,v 1.17 2001/10/25 05:50:10 momjian Exp $ + * $Id: pquery.h,v 1.18 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,5 @@ extern void ProcessQuery(Query *parsetree, Plan *plan, CommandDest dest); extern EState *CreateExecutorState(void); extern Portal PreparePortal(char *portalName); + #endif /* PQUERY_H */ diff --git a/src/include/tcop/tcopdebug.h b/src/include/tcop/tcopdebug.h index 94be8307b35..69e2285db29 100644 --- a/src/include/tcop/tcopdebug.h +++ b/src/include/tcop/tcopdebug.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: tcopdebug.h,v 1.7 2001/10/25 05:50:10 momjian Exp $ + * $Id: tcopdebug.h,v 1.8 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,4 +40,5 @@ * #defines controlled by above definitions * ---------------------------------------------------------------- */ + #endif /* TCOPDEBUG_H */ diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index c170e7bb08b..404c88c605f 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.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: tcopprot.h,v 1.44 2001/10/25 05:50:10 momjian Exp $ + * $Id: tcopprot.h,v 1.45 2001/10/28 06:26:09 momjian Exp $ * * OLD COMMENTS * This file was created so that other c files could get the two @@ -48,4 +48,5 @@ extern int PostgresMain(int argc, char *argv[], const char *username); extern void ResetUsage(void); extern void ShowUsage(void); extern FILE *StatFp; + #endif /* TCOPPROT_H */ diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h index 302fd21baa3..0cc271958f5 100644 --- a/src/include/tcop/utility.h +++ b/src/include/tcop/utility.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: utility.h,v 1.11 2001/10/25 05:50:10 momjian Exp $ + * $Id: utility.h,v 1.12 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,5 @@ #include "executor/execdesc.h" extern void ProcessUtility(Node *parsetree, CommandDest dest); + #endif /* UTILITY_H */ diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index eb227b3ea93..838936e93d0 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.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: acl.h,v 1.37 2001/10/25 05:50:10 momjian Exp $ + * $Id: acl.h,v 1.38 2001/10/28 06:26:09 momjian Exp $ * * NOTES * For backward-compatibility purposes we have to allow there @@ -207,4 +207,5 @@ extern bool pg_func_ownercheck(Oid userid, char *funcname, int nargs, Oid *arglist); extern bool pg_aggr_ownercheck(Oid userid, char *aggname, Oid basetypeID); + #endif /* ACL_H */ diff --git a/src/include/utils/ascii.h b/src/include/utils/ascii.h index cfead8bd1aa..01777c761bc 100644 --- a/src/include/utils/ascii.h +++ b/src/include/utils/ascii.h @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------- * ascii.h * - * $Id: ascii.h,v 1.6 2001/10/25 05:50:10 momjian Exp $ + * $Id: ascii.h,v 1.7 2001/10/28 06:26:09 momjian Exp $ * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group * @@ -23,4 +23,5 @@ extern Datum to_ascii_default(PG_FUNCTION_ARGS); extern char *pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *desc, int enc); #endif /* MULTIBYTE */ + #endif /* _ASCII_H_ */ diff --git a/src/include/utils/bit.h b/src/include/utils/bit.h index 82df884b697..0d88ef96399 100644 --- a/src/include/utils/bit.h +++ b/src/include/utils/bit.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: bit.h,v 1.10 2001/10/25 05:50:10 momjian Exp $ + * $Id: bit.h,v 1.11 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,4 +34,5 @@ extern void BitArrayClearBit(BitArray bitArray, BitIndex bitIndex); * True iff the bit is set (1) in a bit array. */ extern bool BitArrayBitIsSet(BitArray bitArray, BitIndex bitIndex); + #endif /* BIT_H */ diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 006b1286f8e..fdcc877538e 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.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: builtins.h,v 1.169 2001/10/25 05:50:10 momjian Exp $ + * $Id: builtins.h,v 1.170 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -607,4 +607,5 @@ extern int32 type_maximum_size(Oid type_oid, int32 typemod); /* quote.c */ extern Datum quote_ident(PG_FUNCTION_ARGS); extern Datum quote_literal(PG_FUNCTION_ARGS); + #endif /* BUILTINS_H */ diff --git a/src/include/utils/cash.h b/src/include/utils/cash.h index 49a70616e7b..07897fb0a5c 100644 --- a/src/include/utils/cash.h +++ b/src/include/utils/cash.h @@ -45,4 +45,5 @@ extern Datum cashlarger(PG_FUNCTION_ARGS); extern Datum cashsmaller(PG_FUNCTION_ARGS); extern Datum cash_words(PG_FUNCTION_ARGS); + #endif /* CASH_H */ diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h index 18fd9473e49..00e4e5afe89 100644 --- a/src/include/utils/catcache.h +++ b/src/include/utils/catcache.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catcache.h,v 1.35 2001/10/25 05:50:10 momjian Exp $ + * $Id: catcache.h,v 1.36 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -102,4 +102,5 @@ extern void CatalogCacheIdInvalidate(int cacheId, Index hashIndex, extern void PrepareToInvalidateCacheTuple(Relation relation, HeapTuple tuple, void (*function) (int, Index, ItemPointer, Oid)); + #endif /* CATCACHE_H */ diff --git a/src/include/utils/date.h b/src/include/utils/date.h index 9773d40768f..dc83746acfa 100644 --- a/src/include/utils/date.h +++ b/src/include/utils/date.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: date.h,v 1.15 2001/10/25 05:50:10 momjian Exp $ + * $Id: date.h,v 1.16 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -123,4 +123,5 @@ extern Datum timetz_zone(PG_FUNCTION_ARGS); extern Datum timetz_izone(PG_FUNCTION_ARGS); extern Datum timetz_pl_interval(PG_FUNCTION_ARGS); extern Datum timetz_mi_interval(PG_FUNCTION_ARGS); + #endif /* DATE_H */ diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h index 57960c7699f..31d43636dc9 100644 --- a/src/include/utils/datetime.h +++ b/src/include/utils/datetime.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: datetime.h,v 1.24 2001/10/25 05:50:10 momjian Exp $ + * $Id: datetime.h,v 1.25 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -281,4 +281,5 @@ extern int DecodeUnits(int field, char *lowtoken, int *val); extern void ClearDateCache(bool); extern int j2day(int jd); + #endif /* DATETIME_H */ diff --git a/src/include/utils/datum.h b/src/include/utils/datum.h index 7f6e1662e56..f67c3ae7a6e 100644 --- a/src/include/utils/datum.h +++ b/src/include/utils/datum.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: datum.h,v 1.14 2001/10/25 05:50:10 momjian Exp $ + * $Id: datum.h,v 1.15 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,4 +45,5 @@ extern void datumFree(Datum value, bool typByVal, int typLen); */ extern bool datumIsEqual(Datum value1, Datum value2, bool typByVal, int typLen); + #endif /* DATUM_H */ diff --git a/src/include/utils/dynahash.h b/src/include/utils/dynahash.h index 549fd878c40..7c1ec1ae986 100644 --- a/src/include/utils/dynahash.h +++ b/src/include/utils/dynahash.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: dynahash.h,v 1.9 2001/10/25 05:50:10 momjian Exp $ + * $Id: dynahash.h,v 1.10 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,4 +15,5 @@ #define DYNAHASH_H extern int my_log2(long num); + #endif /* DYNAHASH_H */ diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h index cf685ba7454..7bf248229a0 100644 --- a/src/include/utils/dynamic_loader.h +++ b/src/include/utils/dynamic_loader.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: dynamic_loader.h,v 1.18 2001/10/25 05:50:10 momjian Exp $ + * $Id: dynamic_loader.h,v 1.19 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern void *pg_dlopen(char *filename); extern PGFunction pg_dlsym(void *handle, char *funcname); extern void pg_dlclose(void *handle); extern char *pg_dlerror(void); + #endif /* DYNAMIC_LOADER_H */ diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index 83309a285ad..9f537932b78 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.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: elog.h,v 1.28 2001/10/25 05:50:10 momjian Exp $ + * $Id: elog.h,v 1.29 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,4 +40,5 @@ elog(int lev, const char *fmt,...) __attribute__((format(printf, 2, 3))); extern int DebugFileOpen(void); + #endif /* ELOG_H */ diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h index e8d90c432da..b4d841e3017 100644 --- a/src/include/utils/exc.h +++ b/src/include/utils/exc.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: exc.h,v 1.20 2001/10/25 05:50:10 momjian Exp $ + * $Id: exc.h,v 1.21 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -84,4 +84,5 @@ extern void ExcRaise(Exception *excP, */ extern void ExcAbort(const Exception *excP, ExcDetail detail, ExcData data, ExcMessage message); + #endif /* EXC_H */ diff --git a/src/include/utils/excid.h b/src/include/utils/excid.h index db1189842e6..8259b7a888e 100644 --- a/src/include/utils/excid.h +++ b/src/include/utils/excid.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: excid.h,v 1.11 2001/10/25 05:50:10 momjian Exp $ + * $Id: excid.h,v 1.12 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,5 @@ extern DLLIMPORT Exception InternalError; /* XXX inconsistent naming extern DLLIMPORT Exception SemanticError; /* XXX inconsistent naming * style */ extern DLLIMPORT Exception SystemError; /* XXX inconsistent naming style */ + #endif /* EXCID_H */ diff --git a/src/include/utils/fcache.h b/src/include/utils/fcache.h index 04a7728bb53..e46eb90fe30 100644 --- a/src/include/utils/fcache.h +++ b/src/include/utils/fcache.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fcache.h,v 1.18 2001/10/25 05:50:10 momjian Exp $ + * $Id: fcache.h,v 1.19 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -66,4 +66,5 @@ typedef struct FunctionCache extern FunctionCachePtr init_fcache(Oid foid, int nargs, MemoryContext fcacheCxt); + #endif /* FCACHE_H */ diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h index afef186e274..e0c7852d394 100644 --- a/src/include/utils/fmgrtab.h +++ b/src/include/utils/fmgrtab.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fmgrtab.h,v 1.17 2001/10/25 05:50:10 momjian Exp $ + * $Id: fmgrtab.h,v 1.18 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,5 +35,6 @@ typedef struct extern const FmgrBuiltin fmgr_builtins[]; -extern const int fmgr_nbuiltins; /* number of entries in table */ +extern const int fmgr_nbuiltins; /* number of entries in table */ + #endif /* FMGRTAB_H */ diff --git a/src/include/utils/formatting.h b/src/include/utils/formatting.h index 2fd297c9780..85aa54e62d2 100644 --- a/src/include/utils/formatting.h +++ b/src/include/utils/formatting.h @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------- * formatting.h * - * $Id: formatting.h,v 1.10 2001/10/25 05:50:10 momjian Exp $ + * $Id: formatting.h,v 1.11 2001/10/28 06:26:09 momjian Exp $ * * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group @@ -32,4 +32,5 @@ extern Datum int4_to_char(PG_FUNCTION_ARGS); extern Datum int8_to_char(PG_FUNCTION_ARGS); extern Datum float4_to_char(PG_FUNCTION_ARGS); extern Datum float8_to_char(PG_FUNCTION_ARGS); + #endif diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h index 7518c351be0..52171db1523 100644 --- a/src/include/utils/geo_decls.h +++ b/src/include/utils/geo_decls.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geo_decls.h,v 1.35 2001/10/25 05:50:10 momjian Exp $ + * $Id: geo_decls.h,v 1.36 2001/10/28 06:26:09 momjian Exp $ * * NOTE * These routines do *not* use the float types from adt/. @@ -397,4 +397,5 @@ extern Datum positionsel(PG_FUNCTION_ARGS); extern Datum positionjoinsel(PG_FUNCTION_ARGS); extern Datum contsel(PG_FUNCTION_ARGS); extern Datum contjoinsel(PG_FUNCTION_ARGS); + #endif /* GEO_DECLS_H */ diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index ecb883d105e..c75eda18c98 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -4,7 +4,7 @@ * External declarations pertaining to backend/utils/misc/guc.c and * backend/utils/misc/guc-file.l * - * $Id: guc.h,v 1.11 2001/10/25 05:50:10 momjian Exp $ + * $Id: guc.h,v 1.12 2001/10/28 06:26:09 momjian Exp $ */ #ifndef GUC_H #define GUC_H @@ -39,11 +39,11 @@ */ typedef enum { - PGC_POSTMASTER, - PGC_SIGHUP, - PGC_BACKEND, - PGC_SUSET, - PGC_USERSET + PGC_POSTMASTER, + PGC_SIGHUP, + PGC_BACKEND, + PGC_SUSET, + PGC_USERSET } GucContext; @@ -72,4 +72,5 @@ extern bool Show_btree_build_stats; extern bool SQL_inheritance; extern bool Australian_timezones; + #endif /* GUC_H */ diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h index 78ecc485caf..b8cbab43634 100644 --- a/src/include/utils/hsearch.h +++ b/src/include/utils/hsearch.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: hsearch.h,v 1.23 2001/10/25 05:50:10 momjian Exp $ + * $Id: hsearch.h,v 1.24 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,9 +31,9 @@ * tables, the initial directory size can be left at the default. */ #define DEF_SEGSIZE 256 -#define DEF_SEGSIZE_SHIFT 8/* must be log2(DEF_SEGSIZE) */ +#define DEF_SEGSIZE_SHIFT 8 /* must be log2(DEF_SEGSIZE) */ #define DEF_DIRSIZE 256 -#define DEF_FFACTOR 1/* default fill factor */ +#define DEF_FFACTOR 1 /* default fill factor */ #define PRIME1 37 /* for the hash function */ #define PRIME2 1048583 @@ -87,7 +87,7 @@ typedef struct HTAB HASHHDR *hctl; /* shared control information */ HASHSEGMENT *dir; /* directory of segment starts */ long (*hash) (void *key, int keysize); /* Hash Function */ - void *(*alloc) (Size); /* memory allocator */ + void *(*alloc) (Size); /* memory allocator */ MemoryContext hcxt; /* memory context if default allocator * used */ char *tabname; /* table name (for error messages) */ @@ -106,7 +106,7 @@ typedef struct HASHCTL long entrysize; /* total user element size in bytes */ long max_dsize; /* limit to dsize if directory size is * limited */ - void *(*alloc) (Size); /* memory allocation function */ + void *(*alloc) (Size); /* memory allocation function */ HASHSEGMENT *dir; /* directory of segment starts */ HASHHDR *hctl; /* location of header in shared mem */ MemoryContext hcxt; /* memory context to use for allocations */ @@ -132,11 +132,11 @@ typedef struct HASHCTL /* hash_search operations */ typedef enum { - HASH_FIND, - HASH_ENTER, - HASH_REMOVE, - HASH_FIND_SAVE, - HASH_REMOVE_SAVED + HASH_FIND, + HASH_ENTER, + HASH_REMOVE, + HASH_FIND_SAVE, + HASH_REMOVE_SAVED } HASHACTION; /* hash_seq status (should be considered an opaque type by callers) */ @@ -166,4 +166,5 @@ extern long hash_select_dirsize(long num_entries); */ extern long string_hash(void *key, int keysize); extern long tag_hash(void *key, int keysize); + #endif /* HSEARCH_H */ diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h index d083fb9f002..252a9ece7a4 100644 --- a/src/include/utils/int8.h +++ b/src/include/utils/int8.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: int8.h,v 1.29 2001/10/25 14:10:07 tgl Exp $ + * $Id: int8.h,v 1.30 2001/10/28 06:26:09 momjian Exp $ * * NOTES * These data types are supported on all 64-bit architectures, and may @@ -106,4 +106,5 @@ extern Datum dtoi8(PG_FUNCTION_ARGS); extern Datum int8_text(PG_FUNCTION_ARGS); extern Datum text_int8(PG_FUNCTION_ARGS); + #endif /* INT8_H */ diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h index bc5b8d7fbe2..e025cc216fb 100644 --- a/src/include/utils/inval.h +++ b/src/include/utils/inval.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: inval.h,v 1.21 2001/10/25 05:50:10 momjian Exp $ + * $Id: inval.h,v 1.22 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,4 +26,5 @@ extern void CommandEndInvalidationMessages(bool isCommit); extern void RelationInvalidateHeapTuple(Relation relation, HeapTuple tuple); extern void RelationMark4RollbackHeapTuple(Relation relation, HeapTuple tuple); + #endif /* INVAL_H */ diff --git a/src/include/utils/logtape.h b/src/include/utils/logtape.h index 960a2d3abec..721a065dd3d 100644 --- a/src/include/utils/logtape.h +++ b/src/include/utils/logtape.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: logtape.h,v 1.5 2001/10/25 05:50:10 momjian Exp $ + * $Id: logtape.h,v 1.6 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,4 +38,5 @@ extern bool LogicalTapeSeek(LogicalTapeSet *lts, int tapenum, long blocknum, int offset); extern void LogicalTapeTell(LogicalTapeSet *lts, int tapenum, long *blocknum, int *offset); + #endif /* LOGTAPE_H */ diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index 17e9c510686..ad5409ff088 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lsyscache.h,v 1.37 2001/10/25 05:50:10 momjian Exp $ + * $Id: lsyscache.h,v 1.38 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,4 +56,5 @@ extern void free_attstatsslot(Oid atttype, extern int32 get_usesysid(const char *username); #define TypeIsToastable(typid) (get_typstorage(typid) != 'p') + #endif /* LSYSCACHE_H */ diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h index 03bb3b6e9f5..3f2ed80dd31 100644 --- a/src/include/utils/nabstime.h +++ b/src/include/utils/nabstime.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: nabstime.h,v 1.33 2001/10/25 05:50:10 momjian Exp $ + * $Id: nabstime.h,v 1.34 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -159,4 +159,5 @@ extern Datum timeofday(PG_FUNCTION_ARGS); extern AbsoluteTime GetCurrentAbsoluteTime(void); extern AbsoluteTime GetCurrentAbsoluteTimeUsec(int *usec); extern void abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char **tzn); + #endif /* NABSTIME_H */ diff --git a/src/include/utils/numeric.h b/src/include/utils/numeric.h index 1198b838ae3..eda8d18d076 100644 --- a/src/include/utils/numeric.h +++ b/src/include/utils/numeric.h @@ -5,7 +5,7 @@ * * 1998 Jan Wieck * - * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.13 2001/10/25 05:50:10 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.14 2001/10/28 06:26:09 momjian Exp $ * * ---------- */ @@ -81,4 +81,5 @@ typedef NumericData *Numeric; #define PG_GETARG_NUMERIC(n) DatumGetNumeric(PG_GETARG_DATUM(n)) #define PG_GETARG_NUMERIC_COPY(n) DatumGetNumericCopy(PG_GETARG_DATUM(n)) #define PG_RETURN_NUMERIC(x) return NumericGetDatum(x) + #endif /* _PG_NUMERIC_H_ */ diff --git a/src/include/utils/pg_crc.h b/src/include/utils/pg_crc.h index e6d4b223fc8..a1e1da7340d 100644 --- a/src/include/utils/pg_crc.h +++ b/src/include/utils/pg_crc.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_crc.h,v 1.4 2001/10/25 05:50:10 momjian Exp $ + * $Id: pg_crc.h,v 1.5 2001/10/28 06:26:09 momjian Exp $ */ #ifndef PG_CRC_H #define PG_CRC_H @@ -117,4 +117,5 @@ do { \ /* Constant table for CRC calculation */ extern const uint64 crc_table[]; #endif /* INT64_IS_BUSTED */ + #endif /* PG_CRC_H */ diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h index a2a727290a8..d3d16d9780d 100644 --- a/src/include/utils/pg_locale.h +++ b/src/include/utils/pg_locale.h @@ -4,7 +4,7 @@ * The PostgreSQL locale utils. * * - * $Id: pg_locale.h,v 1.9 2001/10/25 05:50:10 momjian Exp $ + * $Id: pg_locale.h,v 1.10 2001/10/28 06:26:09 momjian Exp $ * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group * @@ -51,6 +51,6 @@ extern void PGLC_free_categories(PG_LocaleCategories *lc); *------ */ extern struct lconv *PGLC_localeconv(void); - #endif /* USE_LOCALE */ + #endif /* _PG_LOCALE_ */ diff --git a/src/include/utils/pg_lzcompress.h b/src/include/utils/pg_lzcompress.h index deaa8b1fb21..bc6dd8c3e04 100644 --- a/src/include/utils/pg_lzcompress.h +++ b/src/include/utils/pg_lzcompress.h @@ -1,7 +1,7 @@ /* ---------- * pg_lzcompress.h - * - * $Header: /cvsroot/pgsql/src/include/utils/pg_lzcompress.h,v 1.6 2001/10/25 05:50:10 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/utils/pg_lzcompress.h,v 1.7 2001/10/28 06:26:09 momjian Exp $ * * Definitions for the builtin LZ compressor * ---------- @@ -227,4 +227,5 @@ int pglz_decompress(PGLZ_Header *source, char *dest); */ extern int pglz_get_next_decomp_char_from_lzdata(PGLZ_DecompState *dstate); extern int pglz_get_next_decomp_char_from_plain(PGLZ_DecompState *dstate); + #endif /* _PG_LZCOMPRESS_H_ */ diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h index 94b8e0911d2..8b12856e33d 100644 --- a/src/include/utils/ps_status.h +++ b/src/include/utils/ps_status.h @@ -4,7 +4,7 @@ * * Declarations for backend/utils/misc/ps_status.c * - * $Id: ps_status.h,v 1.21 2001/10/25 05:50:10 momjian Exp $ + * $Id: ps_status.h,v 1.22 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,5 @@ extern void init_ps_display(const char *username, const char *dbname, extern void set_ps_display(const char *activity); extern const char *get_ps_display(void); + #endif /* PS_STATUS_H */ diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index 11c06069aa0..1e450d5e731 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.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: rel.h,v 1.53 2001/10/25 05:50:10 momjian Exp $ + * $Id: rel.h,v 1.54 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -279,4 +279,5 @@ typedef Relation *RelationPtr; /* added to prevent circular dependency. bjm 1999/11/15 */ extern char *get_temp_rel_by_physicalname(const char *relname); + #endif /* REL_H */ diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h index d4243c7c121..6906520107f 100644 --- a/src/include/utils/relcache.h +++ b/src/include/utils/relcache.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: relcache.h,v 1.27 2001/10/25 05:50:11 momjian Exp $ + * $Id: relcache.h,v 1.28 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -72,4 +72,5 @@ extern void DestroyDummyCaches(void); */ #define RELCACHE_INIT_FILENAME "pg_internal.init" + #endif /* RELCACHE_H */ diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h index 5a7c44a6c6b..9e7d5ac5dab 100644 --- a/src/include/utils/selfuncs.h +++ b/src/include/utils/selfuncs.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: selfuncs.h,v 1.2 2001/10/25 05:50:11 momjian Exp $ + * $Id: selfuncs.h,v 1.3 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,13 +21,13 @@ typedef enum { - Pattern_Type_Like, Pattern_Type_Like_IC, - Pattern_Type_Regex, Pattern_Type_Regex_IC + Pattern_Type_Like, Pattern_Type_Like_IC, + Pattern_Type_Regex, Pattern_Type_Regex_IC } Pattern_Type; typedef enum { - Pattern_Prefix_None, Pattern_Prefix_Partial, Pattern_Prefix_Exact + Pattern_Prefix_None, Pattern_Prefix_Partial, Pattern_Prefix_Exact } Pattern_Prefix_Status; @@ -73,4 +73,5 @@ extern Datum btcostestimate(PG_FUNCTION_ARGS); extern Datum rtcostestimate(PG_FUNCTION_ARGS); extern Datum hashcostestimate(PG_FUNCTION_ARGS); extern Datum gistcostestimate(PG_FUNCTION_ARGS); + #endif /* SELFUNCS_H */ diff --git a/src/include/utils/sets.h b/src/include/utils/sets.h index b620967b01a..07c827c03ba 100644 --- a/src/include/utils/sets.h +++ b/src/include/utils/sets.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: sets.h,v 1.10 2001/10/25 05:50:11 momjian Exp $ + * $Id: sets.h,v 1.11 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,5 @@ extern Oid SetDefine(char *querystr, char *typename); extern Datum seteval(PG_FUNCTION_ARGS); + #endif /* SETS_H */ diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h index e21081cc1ef..2ec1986e671 100644 --- a/src/include/utils/syscache.h +++ b/src/include/utils/syscache.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: syscache.h,v 1.34 2001/10/25 05:50:11 momjian Exp $ + * $Id: syscache.h,v 1.35 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -72,4 +72,5 @@ extern Oid GetSysCacheOid(int cacheId, extern Datum SysCacheGetAttr(int cacheId, HeapTuple tup, AttrNumber attributeNumber, bool *isNull); + #endif /* SYSCACHE_H */ diff --git a/src/include/utils/temprel.h b/src/include/utils/temprel.h index 20dc75f9e97..fa3ed41cf32 100644 --- a/src/include/utils/temprel.h +++ b/src/include/utils/temprel.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: temprel.h,v 1.18 2001/10/25 05:50:11 momjian Exp $ + * $Id: temprel.h,v 1.19 2001/10/28 06:26:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,4 +29,5 @@ extern char *get_temp_rel_by_username(const char *user_relname); extern char *get_temp_rel_by_physicalname(const char *relname); #define is_temp_rel_name(relname) (get_temp_rel_by_username(relname) != NULL) + #endif /* TEMPREL_H */ diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h index 2272c33ff2d..3ac252b8cad 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: timestamp.h,v 1.22 2001/10/25 05:50:11 momjian Exp $ + * $Id: timestamp.h,v 1.23 2001/10/28 06:26:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -180,4 +180,5 @@ extern void GetEpochTime(struct tm * tm); extern void isoweek2date(int woy, int *year, int *mon, int *mday); extern int date2isoweek(int year, int mon, int mday); + #endif /* TIMESTAMP_H */ diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h index 4ebcc094d78..5a6c832fddc 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tqual.h,v 1.35 2001/10/25 05:50:11 momjian Exp $ + * $Id: tqual.h,v 1.36 2001/10/28 06:26:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -90,14 +90,12 @@ extern bool ReferentialIntegritySnapshotOverride; /* Result codes for HeapTupleSatisfiesVacuum */ typedef enum { - HEAPTUPLE_DEAD, /* tuple is dead and deletable */ - HEAPTUPLE_LIVE, /* tuple is live (committed, no deleter) */ - HEAPTUPLE_RECENTLY_DEAD, /* tuple is dead, but not - * deletable yet */ - HEAPTUPLE_INSERT_IN_PROGRESS, /* inserting xact is still - * in progress */ - HEAPTUPLE_DELETE_IN_PROGRESS /* deleting xact is still - * in progress */ + HEAPTUPLE_DEAD, /* tuple is dead and deletable */ + HEAPTUPLE_LIVE, /* tuple is live (committed, no deleter) */ + HEAPTUPLE_RECENTLY_DEAD, /* tuple is dead, but not deletable yet */ + HEAPTUPLE_INSERT_IN_PROGRESS, /* inserting xact is still in + * progress */ + HEAPTUPLE_DELETE_IN_PROGRESS /* deleting xact is still in progress */ } HTSV_Result; extern bool HeapTupleSatisfiesItself(HeapTupleHeader tuple); @@ -112,4 +110,5 @@ extern HTSV_Result HeapTupleSatisfiesVacuum(HeapTupleHeader tuple, extern Snapshot GetSnapshotData(bool serializable); extern void SetQuerySnapshot(void); extern void FreeXactSnapshot(void); + #endif /* TQUAL_H */ diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h index 11137219288..f6baea7412a 100644 --- a/src/include/utils/tuplesort.h +++ b/src/include/utils/tuplesort.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tuplesort.h,v 1.9 2001/10/25 05:50:11 momjian Exp $ + * $Id: tuplesort.h,v 1.10 2001/10/28 06:26:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -83,10 +83,10 @@ extern void tuplesort_restorepos(Tuplesortstate *state); */ typedef enum { - SORTFUNC_LT, /* raw "<" operator */ - SORTFUNC_REVLT, /* raw "<" operator, but reverse NULLs */ - SORTFUNC_CMP, /* -1 / 0 / 1 three-way comparator */ - SORTFUNC_REVCMP /* 1 / 0 / -1 (reversed) 3-way comparator */ + SORTFUNC_LT, /* raw "<" operator */ + SORTFUNC_REVLT, /* raw "<" operator, but reverse NULLs */ + SORTFUNC_CMP, /* -1 / 0 / 1 three-way comparator */ + SORTFUNC_REVCMP /* 1 / 0 / -1 (reversed) 3-way comparator */ } SortFunctionKind; extern void SelectSortFunction(Oid sortOperator, @@ -101,4 +101,5 @@ extern void SelectSortFunction(Oid sortOperator, extern int32 ApplySortFunction(FmgrInfo *sortFunction, SortFunctionKind kind, Datum datum1, bool isNull1, Datum datum2, bool isNull2); + #endif /* TUPLESORT_H */ diff --git a/src/include/utils/tuplestore.h b/src/include/utils/tuplestore.h index 39d17461085..1e253d178b4 100644 --- a/src/include/utils/tuplestore.h +++ b/src/include/utils/tuplestore.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tuplestore.h,v 1.4 2001/10/25 05:50:11 momjian Exp $ + * $Id: tuplestore.h,v 1.5 2001/10/28 06:26:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,4 +56,5 @@ extern void tuplestore_end(Tuplestorestate *state); extern void tuplestore_rescan(Tuplestorestate *state); extern void tuplestore_markpos(Tuplestorestate *state); extern void tuplestore_restorepos(Tuplestorestate *state); + #endif /* TUPLESTORE_H */ diff --git a/src/include/utils/varbit.h b/src/include/utils/varbit.h index b4fedf18a77..27d1c4fa8fc 100644 --- a/src/include/utils/varbit.h +++ b/src/include/utils/varbit.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: varbit.h,v 1.12 2001/10/25 05:50:11 momjian Exp $ + * $Id: varbit.h,v 1.13 2001/10/28 06:26:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -89,4 +89,5 @@ extern Datum bitoctetlength(PG_FUNCTION_ARGS); extern Datum bitfromint4(PG_FUNCTION_ARGS); extern Datum bittoint4(PG_FUNCTION_ARGS); extern Datum bitposition(PG_FUNCTION_ARGS); + #endif diff --git a/src/interfaces/cli/example1.c b/src/interfaces/cli/example1.c index 75cedda3dd9..9660ce57198 100644 --- a/src/interfaces/cli/example1.c +++ b/src/interfaces/cli/example1.c @@ -40,7 +40,7 @@ int print_err(SQLSMALLINT handletype, SQLINTEGER handle); int -example1(SQLCHAR * server, SQLCHAR * uid, SQLCHAR * authen) +example1(SQLCHAR *server, SQLCHAR *uid, SQLCHAR *authen) { SQLHENV henv; SQLHDBC hdbc; @@ -135,12 +135,12 @@ example1(SQLCHAR * server, SQLCHAR * uid, SQLCHAR * authen) /* this time, explicitly allocate an application row descriptor */ SQLAllocHandle(SQL_HANDLE_DESC, hdbc, &hdesc); SQLSetDescRec(hdesc, 1, SQL_INTEGER, 0, 0L, 0, 0, - (SQLPOINTER) & id, (SQLINTEGER *) NULL, (SQLSMALLINT *) & idind); + (SQLPOINTER) & id, (SQLINTEGER *) NULL, (SQLSMALLINT *) &idind); SQLSetDescRec(hdesc, 2, SQL_ CHAR, 0, (SQLINTEGER) sizeof(name), - 0, 0, (SQLPOINTER) & name, (SQLINTEGER *) & namelen, - (SQLSMALLINT *) & nameind); + 0, 0, (SQLPOINTER) & name, (SQLINTEGER *) &namelen, + (SQLSMALLINT *) &nameind); /* associate descriptor with statement handle */ SQLSetStmtAttr(hstmt, SQL_ATTR_APP_ROW_DESC, &hdesc, 0); /* execute the fetch */ diff --git a/src/interfaces/cli/example2.c b/src/interfaces/cli/example2.c index 7230abc4da8..42a63e5b503 100644 --- a/src/interfaces/cli/example2.c +++ b/src/interfaces/cli/example2.c @@ -39,17 +39,17 @@ #define max(a,b) (a>b?a:b) int print_err(SQLSMALLINT handletype, SQLINTEGER handle); -int build_indicator_message(SQLCHAR * errmsg, +int build_indicator_message(SQLCHAR *errmsg, SQLPOINTER * data, SQLINTEGER collen, - SQLINTEGER * outlen, + SQLINTEGER *outlen, SQLSMALLINT colnum); SQLINTEGER display_length(SQLSMALLINT coltype, SQLINTEGER collen, - SQLCHAR * colname); + SQLCHAR *colname); -example2(SQLCHAR * server, SQLCHAR * uid, SQLCHAR * authen, SQLCHAR * sqlstr) +example2(SQLCHAR *server, SQLCHAR *uid, SQLCHAR *authen, SQLCHAR *sqlstr) { int i; SQLHENV henv; @@ -214,7 +214,7 @@ example2(SQLCHAR * server, SQLCHAR * uid, SQLCHAR * authen, SQLCHAR * sqlstr) SQLINTEGER display_length(SQLSMALLINT coltype, SQLINTEGER collen, - SQLCHAR * colname) + SQLCHAR *colname) { switch (coltype) { @@ -252,8 +252,8 @@ display_length(SQLSMALLINT coltype, SQLINTEGER collen, } int -build_indicator_message(SQLCHAR * errmsg, SQLPOINTER * data, - SQLINTEGER collen, SQLINTEGER * outlen, SQLSMALLINT colnum) +build_indicator_message(SQLCHAR *errmsg, SQLPOINTER * data, + SQLINTEGER collen, SQLINTEGER *outlen, SQLSMALLINT colnum) { if (*outlen == SQL_NULL_DATA) { diff --git a/src/interfaces/cli/sqlcli.h b/src/interfaces/cli/sqlcli.h index a9145495fc6..2942abf12fa 100644 --- a/src/interfaces/cli/sqlcli.h +++ b/src/interfaces/cli/sqlcli.h @@ -473,7 +473,7 @@ SQLRETURN SQLAllocEnv(SQLHENV * EnvironmentHandle); SQLRETURN SQLAllocHandle(SQLSMALLINT HandleType, SQLINTEGER InputHandle, - SQLINTEGER * OutputHandle); + SQLINTEGER *OutputHandle); SQLRETURN SQLAllocStmt(SQLHDBC ConnectionHandle, SQLSTMT * StatementHandle); @@ -483,7 +483,7 @@ SQLRETURN SQLBindCol(SQLHSTMT StatementHandle, SQLSMALLINT BufferType, SQLPOINTER Data, SQLINTEGER BufferLength, - SQLINTEGER * DataLength); + SQLINTEGER *DataLength); SQLRETURN SQLBindParam(SQLHSTMT StatementHandle, SQLSMALLINT ParamNumber, @@ -492,7 +492,7 @@ SQLRETURN SQLBindParam(SQLHSTMT StatementHandle, SQLINTEGER ParamLength, SQLSMALLINT Scale, SQLPOINTER Data, - SQLINTEGER * DataLength); + SQLINTEGER *DataLength); SQLRETURN SQLCancel(SQLHSTMT StatementHandle); @@ -501,17 +501,17 @@ SQLRETURN SQLCloseCursor(SQLHSTMT StatementHandle); SQLRETURN SQLColAttribute(SQLHSTMT StatementHandle, SQLSMALLINT ColumnNumber, SQLSMALLINT FieldIdentifier, - SQLCHAR * CharacterAttribute, + SQLCHAR *CharacterAttribute, SQLINTEGER BufferLength, - SQLINTEGER * AttributetLength, - SQLINTEGER * NumericAttribute); + SQLINTEGER *AttributetLength, + SQLINTEGER *NumericAttribute); SQLRETURN SQLConnect(SQLHDBC ConnectionHandle, - SQLCHAR * ServerName, + SQLCHAR *ServerName, SQLSMALLINT NameLength1, - SQLCHAR * UserName, + SQLCHAR *UserName, SQLSMALLINT NameLength2, - SQLCHAR * Authentication, + SQLCHAR *Authentication, SQLSMALLINT NameLength3); SQLRETURN SQLCopyDesc(SQLHDESC SourceDescHandle, @@ -519,22 +519,22 @@ SQLRETURN SQLCopyDesc(SQLHDESC SourceDescHandle, SQLRETURN SQLDataSources(SQLHENV EnvironmentHandle, SQLSMALLINT Direction, - SQLCHAR * ServerName, + SQLCHAR *ServerName, SQLSMALLINT BufferLength1, - SQLSMALLINT * NameLength1, - SQLCHAR * Description, + SQLSMALLINT *NameLength1, + SQLCHAR *Description, SQLSMALLINT BufferLength2, - SQLSMALLINT * NameLength2); + SQLSMALLINT *NameLength2); SQLRETURN SQLDescribeCol(SQLHSTMT StatementHandle, SQLSMALLINT ColumnNumber, - SQLCHAR * ColumnName, + SQLCHAR *ColumnName, SQLSMALLINT BufferLength, - SQLSMALLINT * ColumnNameLength, - SQLSMALLINT * ColumnType, - SQLINTEGER * ColumnLength, - SQLSMALLINT * ColumnScale, - SQLSMALLINT * Nullable); + SQLSMALLINT *ColumnNameLength, + SQLSMALLINT *ColumnType, + SQLINTEGER *ColumnLength, + SQLSMALLINT *ColumnScale, + SQLSMALLINT *Nullable); SQLRETURN SQLDisconnect(SQLHDBC ConnectionHandle); @@ -545,14 +545,14 @@ SQLRETURN SQLEndTran(SQLSMALLINT HandleType, SQLRETURN SQLError(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, SQLSTMT StatementHandle, - SQLCHAR * Sqlstate, - SQLINTEGER * NativeError, - SQLCHAR * MessageText, + SQLCHAR *Sqlstate, + SQLINTEGER *NativeError, + SQLCHAR *MessageText, SQLINTEGER BufferLength, - SQLINTEGER * TextLength); + SQLINTEGER *TextLength); SQLRETURN SQLExecDirect(SQLHSTMT StatementHandle, - SQLCHAR * StatementText, + SQLCHAR *StatementText, SQLSMALLINT StringLength); SQLRETURN SQLExecute(SQLHSTMT StatementHandle); @@ -576,38 +576,38 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC ConnectionHandle, SQLINTEGER Attribute, SQLPOINTER Value, SQLINTEGER BufferLength, - SQLINTEGER * StringLength); + SQLINTEGER *StringLength); SQLRETURN SQLGetCursorName(SQLHSTMT StatementHandle, - SQLCHAR * CursorName, + SQLCHAR *CursorName, SQLSMALLINT BufferLength, - SQLSMALLINT * NameLength); + SQLSMALLINT *NameLength); SQLRETURN SQLGetData(SQLHSTMT StatementHandle, SQLSMALLINT ColumnNumber, SQLSMALLINT TargetType, SQLPOINTER TargetValue, SQLINTEGER BufferLength, - SQLINTEGER * IndicatorValue); + SQLINTEGER *IndicatorValue); SQLRETURN SQLGetDescField(SQLHDESC DescriptorHandle, SQLSMALLINT RecordNumber, SQLSMALLINT FieldIdentifier, SQLPOINTER Value, SQLINTEGER BufferLength, - SQLINTEGER * StringLength); + SQLINTEGER *StringLength); SQLRETURN SQLGetDescRec(SQLHDESC DescriptorHandle, SQLSMALLINT RecordNumber, - SQLCHAR * Name, + SQLCHAR *Name, SQLSMALLINT BufferLength, - SQLSMALLINT * StringLength, - SQLSMALLINT * Type, - SQLSMALLINT * SubType, - SQLINTEGER * Length, - SQLSMALLINT * Precision, - SQLSMALLINT * Scale, - SQLSMALLINT * Nullable); + SQLSMALLINT *StringLength, + SQLSMALLINT *Type, + SQLSMALLINT *SubType, + SQLINTEGER *Length, + SQLSMALLINT *Precision, + SQLSMALLINT *Scale, + SQLSMALLINT *Nullable); SQLRETURN SQLGetDiagField(SQLSMALLINT HandleType, SQLINTEGER Handle, @@ -615,51 +615,51 @@ SQLRETURN SQLGetDiagField(SQLSMALLINT HandleType, SQLSMALLINT DiagIdentifier, SQLPOINTER DiagInfo, SQLSMALLINT BufferLength, - SQLSMALLINT * StringLength); + SQLSMALLINT *StringLength); SQLRETURN SQLGetDiagRec(SQLSMALLINT HandleType, SQLINTEGER Handle, SQLSMALLINT RecordNumber, - SQLCHAR * Sqlstate, - SQLINTEGER * NativeError, - SQLCHAR * MessageText, + SQLCHAR *Sqlstate, + SQLINTEGER *NativeError, + SQLCHAR *MessageText, SQLSMALLINT BufferLength, - SQLSMALLINT * StringLength); + SQLSMALLINT *StringLength); SQLRETURN SQLGetEnvAttr(SQLHENV EnvironmentHandle, SQLINTEGER Attribute, SQLPOINTER Value, SQLINTEGER BufferLength, - SQLINTEGER * StringLength); + SQLINTEGER *StringLength); SQLRETURN SQLGetFunctions(SQLHDBC ConnectionHandle, SQLSMALLINT FunctionId, - SQLSMALLINT * Supported); + SQLSMALLINT *Supported); SQLRETURN SQLGetInfo(SQLHDBC ConnectionHandle, SQLSMALLINT InfoType, SQLPOINTER InfoValue, SQLSMALLINT BufferLength, - SQLSMALLINT * StringLength); + SQLSMALLINT *StringLength); SQLRETURN SQLGetStmtAttr(SQLHSTMT StatementHandle, SQLINTEGER Attribute, SQLPOINTER Value, SQLINTEGER BufferLength, - SQLINTEGER * StringLength); + SQLINTEGER *StringLength); SQLRETURN SQLGetTypeInfo(SQLHSTMT StatementHandle, SQLSMALLINT DataType); SQLRETURN SQLNumResultCols(SQLHSTMT StatementHandle, - SQLINTEGER * ColumnCount); + SQLINTEGER *ColumnCount); SQLRETURN SQLParamData(SQLHSTMT StatementHandle, SQLPOINTER * Value); SQLRETURN SQLPrepare(SQLHSTMT StatementHandle, - SQLCHAR * StatementText, + SQLCHAR *StatementText, SQLSMALLINT StringLength); @@ -668,7 +668,7 @@ SQLRETURN SQLPutData(SQLHSTMT StatementHandle, SQLINTEGER StringLength); SQLRETURN SQLRowCount(SQLHSTMT StatementHandle, - SQLINTEGER * RowCount); + SQLINTEGER *RowCount); SQLRETURN SQLSetConnectAttr(SQLHDBC ConnectionHandle, SQLINTEGER AttributeCursorName, @@ -676,7 +676,7 @@ SQLRETURN SQLSetConnectAttr(SQLHDBC ConnectionHandle, SQLINTEGER StringLength); SQLRETURN SQLSetCursorName(SQLHSTMT StatementHandle, - SQLCHAR * CursorName, + SQLCHAR *CursorName, SQLSMALLINT NameLength); SQLRETURN SQLSetDescField(SQLHDESC DescriptorHandle, @@ -692,8 +692,8 @@ SQLRETURN SQLSetDescRec(SQLHDESC DescriptorHandle, SQLSMALLINT Precision, SQLSMALLINT Scale, SQLPOINTER Data, - SQLINTEGER * StringLength, - SQLSMALLINT * Indicator); + SQLINTEGER *StringLength, + SQLSMALLINT *Indicator); SQLRETURN SQLSetEnvAttr(SQLHENV EnvironmentHandle, SQLINTEGER Attribute, diff --git a/src/interfaces/ecpg/include/ecpgerrno.h b/src/interfaces/ecpg/include/ecpgerrno.h index 81d67277fe4..49e6269d8af 100644 --- a/src/interfaces/ecpg/include/ecpgerrno.h +++ b/src/interfaces/ecpg/include/ecpgerrno.h @@ -61,4 +61,5 @@ #define ECPG_NOTICE_NO_TRANSACTION -604 /* NOTICE: BlankPortalAssignName: portal * already exists */ #define ECPG_NOTICE_PORTAL_EXISTS -605 + #endif /* !_ECPG_ERROR_H */ diff --git a/src/interfaces/ecpg/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h index 732e70f3cee..acb022aa1b2 100644 --- a/src/interfaces/ecpg/include/ecpglib.h +++ b/src/interfaces/ecpg/include/ecpglib.h @@ -70,4 +70,5 @@ extern "C" #ifdef __cplusplus } + #endif diff --git a/src/interfaces/ecpg/include/ecpgtype.h b/src/interfaces/ecpg/include/ecpgtype.h index c2e698b84fd..d8e2807bb1f 100644 --- a/src/interfaces/ecpg/include/ecpgtype.h +++ b/src/interfaces/ecpg/include/ecpgtype.h @@ -76,4 +76,5 @@ extern "C" #ifdef __cplusplus } + #endif diff --git a/src/interfaces/ecpg/include/sql3types.h b/src/interfaces/ecpg/include/sql3types.h index 02305dd54ab..74a6d2192ec 100644 --- a/src/interfaces/ecpg/include/sql3types.h +++ b/src/interfaces/ecpg/include/sql3types.h @@ -2,29 +2,29 @@ * * Copyright (c) 2000, Christof Petig <christof.petig@wtal.de> * - * $Header: /cvsroot/pgsql/src/interfaces/ecpg/include/sql3types.h,v 1.6 2001/10/25 05:50:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/ecpg/include/sql3types.h,v 1.7 2001/10/28 06:26:11 momjian Exp $ */ /* chapter 13.1 table 2: Codes used for SQL data types in Dynamic SQL */ enum { - SQL3_CHARACTER = 1, - SQL3_NUMERIC, - SQL3_DECIMAL, - SQL3_INTEGER, - SQL3_SMALLINT, - SQL3_FLOAT, - SQL3_REAL, - SQL3_DOUBLE_PRECISION, - SQL3_DATE_TIME_TIMESTAMP, - SQL3_INTERVAL, /* 10 */ - SQL3_CHARACTER_VARYING = 12, - SQL3_ENUMERATED, - SQL3_BIT, - SQL3_BIT_VARYING, - SQL3_BOOLEAN, - SQL3_abstract + SQL3_CHARACTER = 1, + SQL3_NUMERIC, + SQL3_DECIMAL, + SQL3_INTEGER, + SQL3_SMALLINT, + SQL3_FLOAT, + SQL3_REAL, + SQL3_DOUBLE_PRECISION, + SQL3_DATE_TIME_TIMESTAMP, + SQL3_INTERVAL, /* 10 */ + SQL3_CHARACTER_VARYING = 12, + SQL3_ENUMERATED, + SQL3_BIT, + SQL3_BIT_VARYING, + SQL3_BOOLEAN, + SQL3_abstract /* the rest is xLOB stuff */ }; @@ -32,12 +32,12 @@ enum enum { - SQL3_DDT_DATE = 1, - SQL3_DDT_TIME, - SQL3_DDT_TIMESTAMP, - SQL3_DDT_TIME_WITH_TIME_ZONE, - SQL3_DDT_TIMESTAMP_WITH_TIME_ZONE, + SQL3_DDT_DATE = 1, + SQL3_DDT_TIME, + SQL3_DDT_TIMESTAMP, + SQL3_DDT_TIME_WITH_TIME_ZONE, + SQL3_DDT_TIMESTAMP_WITH_TIME_ZONE, - SQL3_DDT_ILLEGAL/* not a datetime data type (not part of + SQL3_DDT_ILLEGAL /* not a datetime data type (not part of * standard) */ }; diff --git a/src/interfaces/ecpg/include/sqlca.h b/src/interfaces/ecpg/include/sqlca.h index 28ab20533df..68e0f00839e 100644 --- a/src/interfaces/ecpg/include/sqlca.h +++ b/src/interfaces/ecpg/include/sqlca.h @@ -44,7 +44,7 @@ extern "C" /* * 2: if 'W' a (hopefully) non-fatal notice occured -*//* 3: empty */ + */ /* 3: empty */ /* 4: empty */ /* 5: empty */ /* 6: empty */ @@ -59,4 +59,5 @@ extern "C" #ifdef __cplusplus } #endif + #endif diff --git a/src/interfaces/ecpg/lib/execute.c b/src/interfaces/ecpg/lib/execute.c index e9454ec215e..a979b55447d 100644 --- a/src/interfaces/ecpg/lib/execute.c +++ b/src/interfaces/ecpg/lib/execute.c @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.29 2001/10/25 05:50:11 momjian Exp $ */ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.30 2001/10/28 06:26:11 momjian Exp $ */ /* * The aim is to get a simpler inteface to the database routines. @@ -32,9 +32,9 @@ struct sqlca sqlca = { { 'S', 'Q', 'L', 'C', 'A', ' ', ' ', ' ' - } , - sizeof(struct sqlca), - 0, + }, + sizeof(struct sqlca), + 0, { 0, { @@ -76,7 +76,7 @@ static struct auto_mem { void *pointer; struct auto_mem *next; -} *auto_allocs = NULL; +} *auto_allocs = NULL; static void add_mem(void *ptr, int lineno) diff --git a/src/interfaces/ecpg/lib/misc.c b/src/interfaces/ecpg/lib/misc.c index a37cd7ceb67..47bb1824c25 100644 --- a/src/interfaces/ecpg/lib/misc.c +++ b/src/interfaces/ecpg/lib/misc.c @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/misc.c,v 1.7 2001/10/25 05:50:12 momjian Exp $ */ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/misc.c,v 1.8 2001/10/28 06:26:11 momjian Exp $ */ #include "postgres_fe.h" @@ -13,9 +13,9 @@ static struct sqlca sqlca_init = { { 'S', 'Q', 'L', 'C', 'A', ' ', ' ', ' ' - } , - sizeof(struct sqlca), - 0, + }, + sizeof(struct sqlca), + 0, { 0, { diff --git a/src/interfaces/ecpg/lib/pg_type.h b/src/interfaces/ecpg/lib/pg_type.h index 5961dc23c6a..cd2c5273f42 100644 --- a/src/interfaces/ecpg/lib/pg_type.h +++ b/src/interfaces/ecpg/lib/pg_type.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_type.h,v 1.3 2001/10/25 05:50:12 momjian Exp $ + * $Id: pg_type.h,v 1.4 2001/10/28 06:26:11 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -68,4 +68,5 @@ #define ZPBITOID 1560 #define VARBITOID 1562 #define NUMERICOID 1700 + #endif /* PG_TYPE_H */ diff --git a/src/interfaces/ecpg/lib/prepare.c b/src/interfaces/ecpg/lib/prepare.c index 4efd31da093..e6898b0be06 100644 --- a/src/interfaces/ecpg/lib/prepare.c +++ b/src/interfaces/ecpg/lib/prepare.c @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/prepare.c,v 1.8 2001/10/05 17:37:07 meskes Exp $ */ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/prepare.c,v 1.9 2001/10/28 06:26:11 momjian Exp $ */ #include "postgres_fe.h" @@ -15,7 +15,7 @@ static struct prepared_statement char *name; struct statement *stmt; struct prepared_statement *next; -} *prep_stmts = NULL; +} *prep_stmts = NULL; static bool isvarchar(unsigned char c) diff --git a/src/interfaces/ecpg/lib/typename.c b/src/interfaces/ecpg/lib/typename.c index 48747e2c719..e4ffcc77d88 100644 --- a/src/interfaces/ecpg/lib/typename.c +++ b/src/interfaces/ecpg/lib/typename.c @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/typename.c,v 1.20 2001/10/25 05:50:12 momjian Exp $ */ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/typename.c,v 1.21 2001/10/28 06:26:11 momjian Exp $ */ #include "postgres_fe.h" @@ -59,11 +59,11 @@ ECPGDynamicType(Oid type) switch (type) { case BOOLOID: - return SQL3_BOOLEAN; /* bool */ + return SQL3_BOOLEAN; /* bool */ case INT2OID: return SQL3_SMALLINT; /* int2 */ case INT4OID: - return SQL3_INTEGER; /* int4 */ + return SQL3_INTEGER; /* int4 */ case TEXTOID: return SQL3_CHARACTER; /* text */ case FLOAT4OID: @@ -81,7 +81,7 @@ ECPGDynamicType(Oid type) case TIMESTAMPOID: return SQL3_DATE_TIME_TIMESTAMP; /* datetime */ case NUMERICOID: - return SQL3_NUMERIC; /* numeric */ + return SQL3_NUMERIC; /* numeric */ default: return -type; } diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c index 7b6f33e794f..5e809042155 100644 --- a/src/interfaces/ecpg/preproc/ecpg.c +++ b/src/interfaces/ecpg/preproc/ecpg.c @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.50 2001/10/25 05:50:12 momjian Exp $ */ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.51 2001/10/28 06:26:11 momjian Exp $ */ /* New main for ecpg, the PostgreSQL embedded SQL precompiler. */ /* (C) Michael Meskes <meskes@postgresql.org> Feb 5th, 1998 */ @@ -192,7 +192,7 @@ main(int argc, char *const argv[]) ptr2ext[4] = '\0'; } - if (out_option == 0)/* calculate the output name */ + if (out_option == 0) /* calculate the output name */ { output_filename = strdup(input_filename); diff --git a/src/interfaces/ecpg/preproc/type.h b/src/interfaces/ecpg/preproc/type.h index a44cbec1ca7..12e45ab43ac 100644 --- a/src/interfaces/ecpg/preproc/type.h +++ b/src/interfaces/ecpg/preproc/type.h @@ -60,13 +60,13 @@ extern const char *ECPGtype_name(enum ECPGttype typ); /* some stuff for whenever statements */ enum WHEN_TYPE { - W_NOTHING, - W_CONTINUE, - W_BREAK, - W_SQLPRINT, - W_GOTO, - W_DO, - W_STOP + W_NOTHING, + W_CONTINUE, + W_BREAK, + W_SQLPRINT, + W_GOTO, + W_DO, + W_STOP }; struct when @@ -155,7 +155,7 @@ struct assignment enum errortype { - ET_NOTICE, ET_ERROR, ET_FATAL + ET_NOTICE, ET_ERROR, ET_FATAL }; struct fetch_desc diff --git a/src/interfaces/libpgtcl/libpgtcl.h b/src/interfaces/libpgtcl/libpgtcl.h index 7d225d03e84..5b72c80c191 100644 --- a/src/interfaces/libpgtcl/libpgtcl.h +++ b/src/interfaces/libpgtcl/libpgtcl.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpgtcl.h,v 1.12 2001/10/25 05:50:12 momjian Exp $ + * $Id: libpgtcl.h,v 1.13 2001/10/28 06:26:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,5 @@ extern int Pgtcl_Init(Tcl_Interp *interp); extern int Pgtcl_SafeInit(Tcl_Interp *interp); + #endif /* LIBPGTCL_H */ diff --git a/src/interfaces/libpgtcl/pgtclCmds.h b/src/interfaces/libpgtcl/pgtclCmds.h index 8f90af5aa98..9c53d82a7ef 100644 --- a/src/interfaces/libpgtcl/pgtclCmds.h +++ b/src/interfaces/libpgtcl/pgtclCmds.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pgtclCmds.h,v 1.23 2001/10/25 05:50:12 momjian Exp $ + * $Id: pgtclCmds.h,v 1.24 2001/10/28 06:26:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,13 +62,13 @@ typedef struct Pg_ConnectionId_s int res_copyStatus; /* Copying status */ PGresult **results; /* The results */ - Pg_TclNotifies *notify_list; /* head of list of notify info */ + Pg_TclNotifies *notify_list; /* head of list of notify info */ int notifier_running; /* notify event source is live */ #if TCL_MAJOR_VERSION >= 8 Tcl_Channel notifier_channel; /* Tcl_Channel on which notifier * is listening */ #else - int notifier_socket; /* PQsocket on which notifier is listening */ + int notifier_socket; /* PQsocket on which notifier is listening */ #endif } Pg_ConnectionId; @@ -128,4 +128,5 @@ extern int Pg_lo_export( ClientData cData, Tcl_Interp *interp, int argc, char *argv[]); extern int Pg_listen( ClientData cData, Tcl_Interp *interp, int argc, char *argv[]); + #endif /* PGTCLCMDS_H */ diff --git a/src/interfaces/libpq/fe-auth.h b/src/interfaces/libpq/fe-auth.h index 4d99399cb93..979ac078b53 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 69bd5fa5919..fa000f3959e 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 2a75ce43d72..2257cbd47b6 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 e753e5dd523..97760766f89 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 de8fa5636e1..cdfb5750610 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 26acd3ed838..f7f060a152e 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 9e17b314f72..1435b502b7c 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 b6b167c1888..d36165b4f72 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 */ diff --git a/src/interfaces/odbc/bind.c b/src/interfaces/odbc/bind.c index 4bd2c0ce082..d176acee6b1 100644 --- a/src/interfaces/odbc/bind.c +++ b/src/interfaces/odbc/bind.c @@ -431,7 +431,7 @@ create_empty_bindings(int num_columns) void -extend_bindings(StatementClass * stmt, int num_columns) +extend_bindings(StatementClass *stmt, int num_columns) { static char *func = "extend_bindings"; BindInfoClass *new_bindings; diff --git a/src/interfaces/odbc/bind.h b/src/interfaces/odbc/bind.h index a792c389519..444d30f2d22 100644 --- a/src/interfaces/odbc/bind.h +++ b/src/interfaces/odbc/bind.h @@ -48,5 +48,6 @@ struct ParameterInfoClass_ }; BindInfoClass *create_empty_bindings(int num_columns); -void extend_bindings(StatementClass * stmt, int num_columns); +void extend_bindings(StatementClass *stmt, int num_columns); + #endif diff --git a/src/interfaces/odbc/columninfo.c b/src/interfaces/odbc/columninfo.c index d05de1ffb7f..d9a22a163a1 100644 --- a/src/interfaces/odbc/columninfo.c +++ b/src/interfaces/odbc/columninfo.c @@ -42,7 +42,7 @@ CI_Constructor() void -CI_Destructor(ColumnInfoClass * self) +CI_Destructor(ColumnInfoClass *self) { CI_free_memory(self); @@ -56,7 +56,7 @@ CI_Destructor(ColumnInfoClass * self) * If self is null, then just read, don't store. */ char -CI_read_fields(ColumnInfoClass * self, ConnectionClass * conn) +CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn) { Int2 lf; int new_num_fields; @@ -112,7 +112,7 @@ CI_read_fields(ColumnInfoClass * self, ConnectionClass * conn) void -CI_free_memory(ColumnInfoClass * self) +CI_free_memory(ColumnInfoClass *self) { register Int2 lf; int num_fields = self->num_fields; @@ -148,7 +148,7 @@ CI_free_memory(ColumnInfoClass * self) void -CI_set_num_fields(ColumnInfoClass * self, int new_num_fields) +CI_set_num_fields(ColumnInfoClass *self, int new_num_fields) { CI_free_memory(self); /* always safe to call */ @@ -164,7 +164,7 @@ CI_set_num_fields(ColumnInfoClass * self, int new_num_fields) void -CI_set_field_info(ColumnInfoClass * self, int field_num, char *new_name, +CI_set_field_info(ColumnInfoClass *self, int field_num, char *new_name, Oid new_adtid, Int2 new_adtsize, Int4 new_atttypmod) { /* check bounds */ diff --git a/src/interfaces/odbc/columninfo.h b/src/interfaces/odbc/columninfo.h index 1c805cc977c..41e9400dcea 100644 --- a/src/interfaces/odbc/columninfo.h +++ b/src/interfaces/odbc/columninfo.h @@ -29,13 +29,14 @@ struct ColumnInfoClass_ #define CI_get_atttypmod(self, col) (self->atttypmod[col]) ColumnInfoClass *CI_Constructor(void); -void CI_Destructor(ColumnInfoClass * self); -void CI_free_memory(ColumnInfoClass * self); -char CI_read_fields(ColumnInfoClass * self, ConnectionClass * conn); +void CI_Destructor(ColumnInfoClass *self); +void CI_free_memory(ColumnInfoClass *self); +char CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn); /* functions for setting up the fields from within the program, */ /* without reading from a socket */ -void CI_set_num_fields(ColumnInfoClass * self, int new_num_fields); -void CI_set_field_info(ColumnInfoClass * self, int field_num, char *new_name, +void CI_set_num_fields(ColumnInfoClass *self, int new_num_fields); +void CI_set_field_info(ColumnInfoClass *self, int field_num, char *new_name, Oid new_adtid, Int2 new_adtsize, Int4 atttypmod); + #endif diff --git a/src/interfaces/odbc/connection.c b/src/interfaces/odbc/connection.c index 408bef8f80b..c5aac61c4ae 100644 --- a/src/interfaces/odbc/connection.c +++ b/src/interfaces/odbc/connection.c @@ -297,7 +297,7 @@ CC_Constructor() char -CC_Destructor(ConnectionClass * self) +CC_Destructor(ConnectionClass *self) { mylog("enter CC_Destructor, self=%u\n", self); @@ -349,7 +349,7 @@ CC_Destructor(ConnectionClass * self) /* Return how many cursors are opened on this connection */ int -CC_cursor_count(ConnectionClass * self) +CC_cursor_count(ConnectionClass *self) { StatementClass *stmt; int i, @@ -371,7 +371,7 @@ CC_cursor_count(ConnectionClass * self) void -CC_clear_error(ConnectionClass * self) +CC_clear_error(ConnectionClass *self) { self->errornumber = 0; self->errormsg = NULL; @@ -384,7 +384,7 @@ CC_clear_error(ConnectionClass * self) * We are almost always in the middle of a transaction. */ char -CC_abort(ConnectionClass * self) +CC_abort(ConnectionClass *self) { QResultClass *res; @@ -410,7 +410,7 @@ CC_abort(ConnectionClass * self) /* This is called by SQLDisconnect also */ char -CC_cleanup(ConnectionClass * self) +CC_cleanup(ConnectionClass *self) { int i; StatementClass *stmt; @@ -466,7 +466,7 @@ CC_cleanup(ConnectionClass * self) int -CC_set_translation(ConnectionClass * self) +CC_set_translation(ConnectionClass *self) { #ifdef WIN32 @@ -510,7 +510,7 @@ CC_set_translation(ConnectionClass * self) char -CC_connect(ConnectionClass * self, char do_password) +CC_connect(ConnectionClass *self, char do_password) { StartupPacket sp; StartupPacket6_2 sp62; @@ -854,7 +854,7 @@ another_version_retry: char -CC_add_statement(ConnectionClass * self, StatementClass * stmt) +CC_add_statement(ConnectionClass *self, StatementClass *stmt) { int i; @@ -887,7 +887,7 @@ CC_add_statement(ConnectionClass * self, StatementClass * stmt) char -CC_remove_statement(ConnectionClass * self, StatementClass * stmt) +CC_remove_statement(ConnectionClass *self, StatementClass *stmt) { int i; @@ -909,7 +909,7 @@ CC_remove_statement(ConnectionClass * self, StatementClass * stmt) * error message with its socket error message. */ char * -CC_create_errormsg(ConnectionClass * self) +CC_create_errormsg(ConnectionClass *self) { SocketClass *sock = self->sock; int pos; @@ -936,7 +936,7 @@ CC_create_errormsg(ConnectionClass * self) char -CC_get_error(ConnectionClass * self, int *number, char **message) +CC_get_error(ConnectionClass *self, int *number, char **message) { int rv; @@ -974,7 +974,7 @@ CC_get_error(ConnectionClass * self, int *number, char **message) * 'declare cursor C3326857 for ...' and 'fetch 100 in C3326857' statements. */ QResultClass * -CC_send_query(ConnectionClass * self, char *query, QueryInfo * qi) +CC_send_query(ConnectionClass *self, char *query, QueryInfo *qi) { QResultClass *result_in = NULL, *res = NULL, @@ -1335,7 +1335,7 @@ CC_send_query(ConnectionClass * self, char *query, QueryInfo * qi) int -CC_send_function(ConnectionClass * self, int fnid, void *result_buf, int *actual_result_len, int result_is_int, LO_ARG * args, int nargs) +CC_send_function(ConnectionClass *self, int fnid, void *result_buf, int *actual_result_len, int result_is_int, LO_ARG *args, int nargs) { char id, c, @@ -1487,7 +1487,7 @@ CC_send_function(ConnectionClass * self, int fnid, void *result_buf, int *actual char -CC_send_settings(ConnectionClass * self) +CC_send_settings(ConnectionClass *self) { /* char ini_query[MAX_MESSAGE_LEN]; */ ConnInfo *ci = &(self->connInfo); @@ -1596,7 +1596,7 @@ CC_send_settings(ConnectionClass * self) * will go away and the define 'PG_TYPE_LO' will be updated. */ void -CC_lookup_lo(ConnectionClass * self) +CC_lookup_lo(ConnectionClass *self) { HSTMT hstmt; StatementClass *stmt; @@ -1648,7 +1648,7 @@ CC_lookup_lo(ConnectionClass * self) * h-inoue 01-2-2001 */ void -CC_initialize_pg_version(ConnectionClass * self) +CC_initialize_pg_version(ConnectionClass *self) { strcpy(self->pg_version, self->connInfo.protocol); if (PROTOCOL_62(&self->connInfo)) @@ -1678,7 +1678,7 @@ CC_initialize_pg_version(ConnectionClass * self) * DJP - 25-1-2001 */ void -CC_lookup_pg_version(ConnectionClass * self) +CC_lookup_pg_version(ConnectionClass *self) { HSTMT hstmt; StatementClass *stmt; @@ -1744,7 +1744,7 @@ CC_lookup_pg_version(ConnectionClass * self) void -CC_log_error(char *func, char *desc, ConnectionClass * self) +CC_log_error(char *func, char *desc, ConnectionClass *self) { #ifdef PRN_NULLCHECK #define nullcheck(a) (a ? a : "(NULL)") @@ -1774,7 +1774,7 @@ CC_log_error(char *func, char *desc, ConnectionClass * self) } int -CC_get_max_query_len(const ConnectionClass * conn) +CC_get_max_query_len(const ConnectionClass *conn) { int value; diff --git a/src/interfaces/odbc/connection.h b/src/interfaces/odbc/connection.h index 782fb0e4d15..f2c21604b14 100644 --- a/src/interfaces/odbc/connection.h +++ b/src/interfaces/odbc/connection.h @@ -17,14 +17,13 @@ typedef enum { - CONN_NOT_CONNECTED, /* Connection has not been - * established */ - CONN_CONNECTED, /* Connection is up and has been + CONN_NOT_CONNECTED, /* Connection has not been established */ + CONN_CONNECTED, /* Connection is up and has been * established */ - CONN_DOWN, /* Connection is broken */ - CONN_EXECUTING /* the connection is currently executing a + CONN_DOWN, /* Connection is broken */ + CONN_EXECUTING /* the connection is currently executing a * statement */ -} CONN_Status; +} CONN_Status; /* These errors have general sql error state */ #define CONNECTION_SERVER_NOT_REACHED 101 @@ -124,7 +123,7 @@ typedef struct _StartupPacket6_2 char options[ARGV_SIZE]; char execfile[ARGV_SIZE]; char tty[PATH_SIZE]; -} StartupPacket6_2; +} StartupPacket6_2; /* Structure to hold all the connection attributes for a specific @@ -153,7 +152,7 @@ typedef struct char disallow_premature; char updatable_cursors; GLOBAL_VALUES drivers; /* moved from driver's option */ -} ConnInfo; +} ConnInfo; /* Macro to determine is the connection using 6.2 protocol? */ #define PROTOCOL_62(conninfo_) (strncmp((conninfo_)->protocol, PG62, strlen(PG62)) == 0) @@ -213,27 +212,27 @@ struct col_info #define HINSTANCE void * #endif -typedef BOOL(FAR WINAPI * DataSourceToDriverProc) (UDWORD, - SWORD, - PTR, - SDWORD, - PTR, - SDWORD, - SDWORD FAR *, - UCHAR FAR *, - SWORD, - SWORD FAR *); - -typedef BOOL(FAR WINAPI * DriverToDataSourceProc) (UDWORD, - SWORD, - PTR, - SDWORD, - PTR, - SDWORD, - SDWORD FAR *, - UCHAR FAR *, - SWORD, - SWORD FAR *); +typedef BOOL (FAR WINAPI * DataSourceToDriverProc) (UDWORD, + SWORD, + PTR, + SDWORD, + PTR, + SDWORD, + SDWORD FAR *, + UCHAR FAR *, + SWORD, + SWORD FAR *); + +typedef BOOL (FAR WINAPI * DriverToDataSourceProc) (UDWORD, + SWORD, + PTR, + SDWORD, + PTR, + SDWORD, + SDWORD FAR *, + UCHAR FAR *, + SWORD, + SWORD FAR *); /******* The Connection handle ************/ struct ConnectionClass_ @@ -290,23 +289,24 @@ struct ConnectionClass_ /* prototypes */ ConnectionClass *CC_Constructor(void); -char CC_Destructor(ConnectionClass * self); -int CC_cursor_count(ConnectionClass * self); -char CC_cleanup(ConnectionClass * self); -char CC_abort(ConnectionClass * self); -int CC_set_translation(ConnectionClass * self); -char CC_connect(ConnectionClass * self, char do_password); -char CC_add_statement(ConnectionClass * self, StatementClass * stmt); -char CC_remove_statement(ConnectionClass * self, StatementClass * stmt); -char CC_get_error(ConnectionClass * self, int *number, char **message); -QResultClass *CC_send_query(ConnectionClass * self, char *query, QueryInfo * qi); -void CC_clear_error(ConnectionClass * self); -char *CC_create_errormsg(ConnectionClass * self); -int CC_send_function(ConnectionClass * conn, int fnid, void *result_buf, int *actual_result_len, int result_is_int, LO_ARG * argv, int nargs); -char CC_send_settings(ConnectionClass * self); -void CC_lookup_lo(ConnectionClass * conn); -void CC_lookup_pg_version(ConnectionClass * conn); -void CC_initialize_pg_version(ConnectionClass * conn); -void CC_log_error(char *func, char *desc, ConnectionClass * self); -int CC_get_max_query_len(const ConnectionClass * self); +char CC_Destructor(ConnectionClass *self); +int CC_cursor_count(ConnectionClass *self); +char CC_cleanup(ConnectionClass *self); +char CC_abort(ConnectionClass *self); +int CC_set_translation(ConnectionClass *self); +char CC_connect(ConnectionClass *self, char do_password); +char CC_add_statement(ConnectionClass *self, StatementClass *stmt); +char CC_remove_statement(ConnectionClass *self, StatementClass *stmt); +char CC_get_error(ConnectionClass *self, int *number, char **message); +QResultClass *CC_send_query(ConnectionClass *self, char *query, QueryInfo *qi); +void CC_clear_error(ConnectionClass *self); +char *CC_create_errormsg(ConnectionClass *self); +int CC_send_function(ConnectionClass *conn, int fnid, void *result_buf, int *actual_result_len, int result_is_int, LO_ARG *argv, int nargs); +char CC_send_settings(ConnectionClass *self); +void CC_lookup_lo(ConnectionClass *conn); +void CC_lookup_pg_version(ConnectionClass *conn); +void CC_initialize_pg_version(ConnectionClass *conn); +void CC_log_error(char *func, char *desc, ConnectionClass *self); +int CC_get_max_query_len(const ConnectionClass *self); + #endif diff --git a/src/interfaces/odbc/convert.c b/src/interfaces/odbc/convert.c index aae290970cb..871a9c37410 100644 --- a/src/interfaces/odbc/convert.c +++ b/src/interfaces/odbc/convert.c @@ -138,7 +138,7 @@ static char *conv_to_octal(unsigned char val); /* This is called by SQLFetch() */ int -copy_and_convert_field_bindinfo(StatementClass * stmt, Int4 field_type, void *value, int col) +copy_and_convert_field_bindinfo(StatementClass *stmt, Int4 field_type, void *value, int col) { BindInfoClass *bic = &(stmt->bindings[col]); @@ -149,8 +149,8 @@ copy_and_convert_field_bindinfo(StatementClass * stmt, Int4 field_type, void *va /* This is called by SQLGetData() */ int -copy_and_convert_field(StatementClass * stmt, Int4 field_type, void *value, Int2 fCType, - PTR rgbValue, SDWORD cbValueMax, SDWORD * pcbValue) +copy_and_convert_field(StatementClass *stmt, Int4 field_type, void *value, Int2 fCType, + PTR rgbValue, SDWORD cbValueMax, SDWORD *pcbValue) { Int4 len = 0, copy_len = 0; @@ -756,7 +756,7 @@ copy_and_convert_field(StatementClass * stmt, Int4 field_type, void *value, Int2 */ #define INIT_MIN_ALLOC 4096 static int -enlarge_statement(StatementClass * stmt, unsigned int newsize) +enlarge_statement(StatementClass *stmt, unsigned int newsize) { unsigned int newalsize = INIT_MIN_ALLOC; static char *func = "enlarge_statement"; @@ -952,7 +952,7 @@ table_for_update(const char *stmt, int *endpos) * This function does a dynamic memory allocation to get rid of query size limit! */ int -copy_statement_with_parameters(StatementClass * stmt) +copy_statement_with_parameters(StatementClass *stmt) { static char *func = "copy_statement_with_parameters"; unsigned int opos, @@ -1855,7 +1855,7 @@ convert_money(const char *s, char *sout, size_t soutmax) * It does not zero out SIMPLE_TIME in case it is desired to initialize it with a value */ char -parse_datetime(char *buf, SIMPLE_TIME * st) +parse_datetime(char *buf, SIMPLE_TIME *st) { int y, m, @@ -1922,7 +1922,7 @@ parse_datetime(char *buf, SIMPLE_TIME * st) /* Change linefeed to carriage-return/linefeed */ int -convert_linefeeds(const char *si, char *dst, size_t max, BOOL * changed) +convert_linefeeds(const char *si, char *dst, size_t max, BOOL *changed) { size_t i = 0, out = 0; @@ -2221,8 +2221,8 @@ decode(const char *in, char *out) *------- */ int -convert_lo(StatementClass * stmt, const void *value, Int2 fCType, PTR rgbValue, - SDWORD cbValueMax, SDWORD * pcbValue) +convert_lo(StatementClass *stmt, const void *value, Int2 fCType, PTR rgbValue, + SDWORD cbValueMax, SDWORD *pcbValue) { Oid oid; int retval, diff --git a/src/interfaces/odbc/convert.h b/src/interfaces/odbc/convert.h index 9ef3dffa644..dfbd32ce247 100644 --- a/src/interfaces/odbc/convert.h +++ b/src/interfaces/odbc/convert.h @@ -27,17 +27,17 @@ typedef struct int hh; int mm; int ss; -} SIMPLE_TIME; +} SIMPLE_TIME; -int copy_and_convert_field_bindinfo(StatementClass * stmt, Int4 field_type, void *value, int col); -int copy_and_convert_field(StatementClass * stmt, Int4 field_type, void *value, Int2 fCType, - PTR rgbValue, SDWORD cbValueMax, SDWORD * pcbValue); +int copy_and_convert_field_bindinfo(StatementClass *stmt, Int4 field_type, void *value, int col); +int copy_and_convert_field(StatementClass *stmt, Int4 field_type, void *value, Int2 fCType, + PTR rgbValue, SDWORD cbValueMax, SDWORD *pcbValue); -int copy_statement_with_parameters(StatementClass * stmt); +int copy_statement_with_parameters(StatementClass *stmt); char *convert_escape(char *value); BOOL convert_money(const char *s, char *sout, size_t soutmax); -char parse_datetime(char *buf, SIMPLE_TIME * st); -int convert_linefeeds(const char *s, char *dst, size_t max, BOOL * changed); +char parse_datetime(char *buf, SIMPLE_TIME *st); +int convert_linefeeds(const char *s, char *dst, size_t max, BOOL *changed); int convert_special_chars(const char *si, char *dst, int used); int convert_pgbinary_to_char(const char *value, char *rgbValue, int cbValueMax); @@ -45,6 +45,7 @@ int convert_from_pgbinary(const unsigned char *value, unsigned char *rgbValue, int convert_to_pgbinary(const unsigned char *in, char *out, int len); void encode(const char *in, char *out); void decode(const char *in, char *out); -int convert_lo(StatementClass * stmt, const void *value, Int2 fCType, PTR rgbValue, - SDWORD cbValueMax, SDWORD * pcbValue); +int convert_lo(StatementClass *stmt, const void *value, Int2 fCType, PTR rgbValue, + SDWORD cbValueMax, SDWORD *pcbValue); + #endif diff --git a/src/interfaces/odbc/dlg_specific.c b/src/interfaces/odbc/dlg_specific.c index d395e9a35e5..e73c47e314e 100644 --- a/src/interfaces/odbc/dlg_specific.c +++ b/src/interfaces/odbc/dlg_specific.c @@ -40,13 +40,13 @@ extern GLOBAL_VALUES globals; #ifdef WIN32 static int driver_optionsDraw(HWND, const ConnInfo *, int src, BOOL enable); -static int driver_options_update(HWND hdlg, ConnInfo * ci, BOOL); -static void updateCommons(const ConnInfo * ci); +static int driver_options_update(HWND hdlg, ConnInfo *ci, BOOL); +static void updateCommons(const ConnInfo *ci); #endif #ifdef WIN32 void -SetDlgStuff(HWND hdlg, const ConnInfo * ci) +SetDlgStuff(HWND hdlg, const ConnInfo *ci) { /* * If driver attribute NOT present, then set the datasource name and @@ -67,7 +67,7 @@ SetDlgStuff(HWND hdlg, const ConnInfo * ci) void -GetDlgStuff(HWND hdlg, ConnInfo * ci) +GetDlgStuff(HWND hdlg, ConnInfo *ci) { GetDlgItemText(hdlg, IDC_DESC, ci->desc, sizeof(ci->desc)); @@ -80,7 +80,7 @@ GetDlgStuff(HWND hdlg, ConnInfo * ci) static int -driver_optionsDraw(HWND hdlg, const ConnInfo * ci, int src, BOOL enable) +driver_optionsDraw(HWND hdlg, const ConnInfo *ci, int src, BOOL enable) { const GLOBAL_VALUES *comval; static BOOL defset = FALSE; @@ -164,7 +164,7 @@ driver_optionsDraw(HWND hdlg, const ConnInfo * ci, int src, BOOL enable) return 0; } static int -driver_options_update(HWND hdlg, ConnInfo * ci, BOOL updateProfile) +driver_options_update(HWND hdlg, ConnInfo *ci, BOOL updateProfile) { GLOBAL_VALUES *comval; @@ -391,7 +391,7 @@ ds_optionsProc(HWND hdlg, * to the ODBCINST.INI portion of the registry */ static void -updateCommons(const ConnInfo * ci) +updateCommons(const ConnInfo *ci) { const char *sectionName; const char *fileName; @@ -498,7 +498,7 @@ updateCommons(const ConnInfo * ci) void -makeConnectString(char *connect_string, const ConnInfo * ci, UWORD len) +makeConnectString(char *connect_string, const ConnInfo *ci, UWORD len) { char got_dsn = (ci->dsn[0] != '\0'); char encoded_conn_settings[LARGE_REGISTRY_LEN]; @@ -576,7 +576,7 @@ makeConnectString(char *connect_string, const ConnInfo * ci, UWORD len) void -copyAttributes(ConnInfo * ci, const char *attribute, const char *value) +copyAttributes(ConnInfo *ci, const char *attribute, const char *value) { if (stricmp(attribute, "DSN") == 0) strcpy(ci->dsn, value); @@ -631,7 +631,7 @@ copyAttributes(ConnInfo * ci, const char *attribute, const char *value) } void -copyCommonAttributes(ConnInfo * ci, const char *attribute, const char *value) +copyCommonAttributes(ConnInfo *ci, const char *attribute, const char *value) { if (stricmp(attribute, INI_FETCH) == 0 || stricmp(attribute, "A7") == 0) ci->drivers.fetch_max = atoi(value); @@ -694,7 +694,7 @@ copyCommonAttributes(ConnInfo * ci, const char *attribute, const char *value) void -getDSNdefaults(ConnInfo * ci) +getDSNdefaults(ConnInfo *ci) { if (ci->port[0] == '\0') strcpy(ci->port, DEFAULT_PORT); @@ -720,7 +720,7 @@ getDSNdefaults(ConnInfo * ci) void -getDSNinfo(ConnInfo * ci, char overwrite) +getDSNinfo(ConnInfo *ci, char overwrite) { char *DSN = ci->dsn; char encoded_conn_settings[LARGE_REGISTRY_LEN], @@ -840,7 +840,7 @@ getDSNinfo(ConnInfo * ci, char overwrite) /* This is for datasource based options only */ void -writeDSNinfo(const ConnInfo * ci) +writeDSNinfo(const ConnInfo *ci) { const char *DSN = ci->dsn; char encoded_conn_settings[LARGE_REGISTRY_LEN], @@ -931,7 +931,7 @@ writeDSNinfo(const ConnInfo * ci) * the registry and gets any driver defaults. */ void -getCommonDefaults(const char *section, const char *filename, ConnInfo * ci) +getCommonDefaults(const char *section, const char *filename, ConnInfo *ci) { char temp[256]; GLOBAL_VALUES *comval; diff --git a/src/interfaces/odbc/dlg_specific.h b/src/interfaces/odbc/dlg_specific.h index b1ec7090c03..5a8c7514852 100644 --- a/src/interfaces/odbc/dlg_specific.h +++ b/src/interfaces/odbc/dlg_specific.h @@ -120,11 +120,11 @@ #define DEFAULT_EXTRASYSTABLEPREFIXES "dd_;" /* prototypes */ -void getCommonDefaults(const char *section, const char *filename, ConnInfo * ci); +void getCommonDefaults(const char *section, const char *filename, ConnInfo *ci); #ifdef WIN32 -void SetDlgStuff(HWND hdlg, const ConnInfo * ci); -void GetDlgStuff(HWND hdlg, ConnInfo * ci); +void SetDlgStuff(HWND hdlg, const ConnInfo *ci); +void GetDlgStuff(HWND hdlg, ConnInfo *ci); int CALLBACK driver_optionsProc(HWND hdlg, WORD wMsg, @@ -137,11 +137,11 @@ int CALLBACK ds_optionsProc(HWND hdlg, #endif /* WIN32 */ void updateGlobals(void); -void writeDSNinfo(const ConnInfo * ci); -void getDSNdefaults(ConnInfo * ci); -void getDSNinfo(ConnInfo * ci, char overwrite); -void makeConnectString(char *connect_string, const ConnInfo * ci, UWORD); -void copyAttributes(ConnInfo * ci, const char *attribute, const char *value); -void copyCommonAttributes(ConnInfo * ci, const char *attribute, const char *value); +void writeDSNinfo(const ConnInfo *ci); +void getDSNdefaults(ConnInfo *ci); +void getDSNinfo(ConnInfo *ci, char overwrite); +void makeConnectString(char *connect_string, const ConnInfo *ci, UWORD); +void copyAttributes(ConnInfo *ci, const char *attribute, const char *value); +void copyCommonAttributes(ConnInfo *ci, const char *attribute, const char *value); #endif diff --git a/src/interfaces/odbc/drvconn.c b/src/interfaces/odbc/drvconn.c index ce95296e544..bdcf6af7f09 100644 --- a/src/interfaces/odbc/drvconn.c +++ b/src/interfaces/odbc/drvconn.c @@ -45,14 +45,14 @@ #include "dlg_specific.h" /* prototypes */ -void dconn_get_connect_attributes(const UCHAR FAR * connect_string, ConnInfo * ci); -static void dconn_get_common_attributes(const UCHAR FAR * connect_string, ConnInfo * ci); +void dconn_get_connect_attributes(const UCHAR FAR * connect_string, ConnInfo *ci); +static void dconn_get_common_attributes(const UCHAR FAR * connect_string, ConnInfo *ci); #ifdef WIN32 BOOL FAR PASCAL dconn_FDriverConnectProc(HWND hdlg, UINT wMsg, WPARAM wParam, LPARAM lParam); -RETCODE dconn_DoDialog(HWND hwnd, ConnInfo * ci); +RETCODE dconn_DoDialog(HWND hwnd, ConnInfo *ci); -extern HINSTANCE NEAR s_hModule; /* Saved module handle. */ +extern HINSTANCE NEAR s_hModule; /* Saved module handle. */ #endif @@ -249,7 +249,7 @@ dialog: #ifdef WIN32 RETCODE -dconn_DoDialog(HWND hwnd, ConnInfo * ci) +dconn_DoDialog(HWND hwnd, ConnInfo *ci) { int dialog_result; @@ -342,7 +342,7 @@ dconn_FDriverConnectProc( void -dconn_get_connect_attributes(const UCHAR FAR * connect_string, ConnInfo * ci) +dconn_get_connect_attributes(const UCHAR FAR * connect_string, ConnInfo *ci) { char *our_connect_string; char *pair, @@ -391,7 +391,7 @@ dconn_get_connect_attributes(const UCHAR FAR * connect_string, ConnInfo * ci) } static void -dconn_get_common_attributes(const UCHAR FAR * connect_string, ConnInfo * ci) +dconn_get_common_attributes(const UCHAR FAR * connect_string, ConnInfo *ci) { char *our_connect_string; char *pair, diff --git a/src/interfaces/odbc/environ.c b/src/interfaces/odbc/environ.c index c36c300caf4..9bb9615dea4 100644 --- a/src/interfaces/odbc/environ.c +++ b/src/interfaces/odbc/environ.c @@ -494,7 +494,7 @@ EN_Constructor(void) char -EN_Destructor(EnvironmentClass * self) +EN_Destructor(EnvironmentClass *self) { int lf; char rv = 1; @@ -523,7 +523,7 @@ EN_Destructor(EnvironmentClass * self) char -EN_get_error(EnvironmentClass * self, int *number, char **message) +EN_get_error(EnvironmentClass *self, int *number, char **message) { if (self && self->errormsg && self->errornumber) { @@ -539,7 +539,7 @@ EN_get_error(EnvironmentClass * self, int *number, char **message) char -EN_add_connection(EnvironmentClass * self, ConnectionClass * conn) +EN_add_connection(EnvironmentClass *self, ConnectionClass *conn) { int i; @@ -563,7 +563,7 @@ EN_add_connection(EnvironmentClass * self, ConnectionClass * conn) char -EN_remove_connection(EnvironmentClass * self, ConnectionClass * conn) +EN_remove_connection(EnvironmentClass *self, ConnectionClass *conn) { int i; @@ -579,7 +579,7 @@ EN_remove_connection(EnvironmentClass * self, ConnectionClass * conn) void -EN_log_error(char *func, char *desc, EnvironmentClass * self) +EN_log_error(char *func, char *desc, EnvironmentClass *self) { if (self) qlog("ENVIRON ERROR: func=%s, desc='%s', errnum=%d, errmsg='%s'\n", func, desc, self->errornumber, self->errormsg); diff --git a/src/interfaces/odbc/environ.h b/src/interfaces/odbc/environ.h index a99a4e5a285..7b463b3e744 100644 --- a/src/interfaces/odbc/environ.h +++ b/src/interfaces/odbc/environ.h @@ -22,9 +22,10 @@ struct EnvironmentClass_ /* Environment prototypes */ EnvironmentClass *EN_Constructor(void); -char EN_Destructor(EnvironmentClass * self); -char EN_get_error(EnvironmentClass * self, int *number, char **message); -char EN_add_connection(EnvironmentClass * self, ConnectionClass * conn); -char EN_remove_connection(EnvironmentClass * self, ConnectionClass * conn); -void EN_log_error(char *func, char *desc, EnvironmentClass * self); +char EN_Destructor(EnvironmentClass *self); +char EN_get_error(EnvironmentClass *self, int *number, char **message); +char EN_add_connection(EnvironmentClass *self, ConnectionClass *conn); +char EN_remove_connection(EnvironmentClass *self, ConnectionClass *conn); +void EN_log_error(char *func, char *desc, EnvironmentClass *self); + #endif diff --git a/src/interfaces/odbc/gpps.c b/src/interfaces/odbc/gpps.c index 658829a5fde..3d578c9d77c 100644 --- a/src/interfaces/odbc/gpps.c +++ b/src/interfaces/odbc/gpps.c @@ -55,7 +55,7 @@ * ODBCINSTDIR/ODBCINST_INI */ DWORD -GetPrivateProfileString(const char *theSection, /* section name */ +GetPrivateProfileString(const char *theSection, /* section name */ const char *theKey, /* search key name */ const char *theDefault, /* default value if not * found */ diff --git a/src/interfaces/odbc/gpps.h b/src/interfaces/odbc/gpps.h index f44a266f394..eb1b155c8ad 100644 --- a/src/interfaces/odbc/gpps.h +++ b/src/interfaces/odbc/gpps.h @@ -18,7 +18,7 @@ extern "C" { #endif - DWORD + DWORD GetPrivateProfileString(const char *theSection, /* section name */ const char *theKey, /* search key name */ const char *theDefault, /* default value if not @@ -30,7 +30,7 @@ extern "C" const char *theIniFileName); /* pathname of ini file * to search */ - DWORD + DWORD WritePrivateProfileString(const char *theSection, /* section name */ const char *theKey, /* write key name */ const char *theBuffer, /* input buffer */ @@ -44,4 +44,5 @@ extern "C" #ifndef WIN32 #undef DWORD #endif + #endif diff --git a/src/interfaces/odbc/info.c b/src/interfaces/odbc/info.c index 0752ab03ab5..6ffc7cc51b0 100644 --- a/src/interfaces/odbc/info.c +++ b/src/interfaces/odbc/info.c @@ -178,7 +178,7 @@ PGAPI_GetInfo( p = CC_is_onlyread(conn) ? "Y" : "N"; break; - case SQL_DATABASE_NAME:/* Support for old ODBC 1.0 Apps */ + case SQL_DATABASE_NAME: /* Support for old ODBC 1.0 Apps */ /* * Returning the database name causes problems in MS Query. It @@ -789,7 +789,7 @@ PGAPI_GetTypeInfo( if (fSqlType == SQL_ALL_TYPES || fSqlType == sqlType) { - row = (TupleNode *) malloc(sizeof(TupleNode) + (15 - 1) * sizeof(TupleField)); + row = (TupleNode *) malloc(sizeof(TupleNode) + (15 - 1) *sizeof(TupleField)); /* These values can't be NULL */ set_tuplefield_string(&row->tuple[0], pgtype_to_name(stmt, pgType)); @@ -1387,7 +1387,7 @@ PGAPI_Tables( (view && show_views) || (regular_table && show_regular_tables)) { - row = (TupleNode *) malloc(sizeof(TupleNode) + (5 - 1) * sizeof(TupleField)); + row = (TupleNode *) malloc(sizeof(TupleNode) + (5 - 1) *sizeof(TupleField)); set_tuplefield_string(&row->tuple[0], ""); @@ -1698,7 +1698,7 @@ PGAPI_Columns( /* For OID fields */ the_type = PG_TYPE_OID; row = (TupleNode *) malloc(sizeof(TupleNode) + - (result_cols - 1) * sizeof(TupleField)); + (result_cols - 1) *sizeof(TupleField)); set_tuplefield_string(&row->tuple[0], ""); /* see note in SQLTables() */ @@ -1727,7 +1727,7 @@ PGAPI_Columns( while ((result == SQL_SUCCESS) || (result == SQL_SUCCESS_WITH_INFO)) { row = (TupleNode *) malloc(sizeof(TupleNode) + - (result_cols - 1) * sizeof(TupleField)); + (result_cols - 1) *sizeof(TupleField)); set_tuplefield_string(&row->tuple[0], ""); @@ -1761,7 +1761,7 @@ PGAPI_Columns( if (field_type == PG_TYPE_NUMERIC) { if (mod_length >= 4) - mod_length -= 4; /* the length is in atttypmod - 4 */ + mod_length -= 4; /* the length is in atttypmod - 4 */ if (mod_length >= 0) { @@ -1785,7 +1785,7 @@ PGAPI_Columns( useStaticPrecision = FALSE; if (mod_length >= 4) - mod_length -= 4; /* the length is in atttypmod - 4 */ + mod_length -= 4; /* the length is in atttypmod - 4 */ if (mod_length > ci->drivers.max_varchar_size || mod_length <= 0) mod_length = ci->drivers.max_varchar_size; @@ -1838,7 +1838,7 @@ PGAPI_Columns( the_type = PG_TYPE_INT4; row = (TupleNode *) malloc(sizeof(TupleNode) + - (result_cols - 1) * sizeof(TupleField)); + (result_cols - 1) *sizeof(TupleField)); set_tuplefield_string(&row->tuple[0], ""); set_tuplefield_string(&row->tuple[1], ""); @@ -1975,7 +1975,7 @@ PGAPI_SpecialColumns( /* use the oid value for the rowid */ if (fColType == SQL_BEST_ROWID) { - row = (TupleNode *) malloc(sizeof(TupleNode) + (8 - 1) * sizeof(TupleField)); + row = (TupleNode *) malloc(sizeof(TupleNode) + (8 - 1) *sizeof(TupleField)); set_tuplefield_int2(&row->tuple[0], SQL_SCOPE_SESSION); set_tuplefield_string(&row->tuple[1], "oid"); @@ -1995,7 +1995,7 @@ PGAPI_SpecialColumns( if (atoi(ci->row_versioning)) { - row = (TupleNode *) malloc(sizeof(TupleNode) + (8 - 1) * sizeof(TupleField)); + row = (TupleNode *) malloc(sizeof(TupleNode) + (8 - 1) *sizeof(TupleField)); set_tuplefield_null(&row->tuple[0]); set_tuplefield_string(&row->tuple[1], "xmin"); @@ -2303,7 +2303,7 @@ PGAPI_Statistics( if (relhasrules[0] != '1' && atoi(ci->show_oid_column) && atoi(ci->fake_oid_index)) { row = (TupleNode *) malloc(sizeof(TupleNode) + - (13 - 1) * sizeof(TupleField)); + (13 - 1) *sizeof(TupleField)); /* no table qualifier */ set_tuplefield_string(&row->tuple[0], ""); @@ -2347,7 +2347,7 @@ PGAPI_Statistics( while (i < 16 && fields_vector[i] != 0) { row = (TupleNode *) malloc(sizeof(TupleNode) + - (13 - 1) * sizeof(TupleField)); + (13 - 1) *sizeof(TupleField)); /* no table qualifier */ set_tuplefield_string(&row->tuple[0], ""); @@ -2630,7 +2630,7 @@ PGAPI_PrimaryKeys( while ((result == SQL_SUCCESS) || (result == SQL_SUCCESS_WITH_INFO)) { - row = (TupleNode *) malloc(sizeof(TupleNode) + (result_cols - 1) * sizeof(TupleField)); + row = (TupleNode *) malloc(sizeof(TupleNode) + (result_cols - 1) *sizeof(TupleField)); set_tuplefield_null(&row->tuple[0]); @@ -2698,7 +2698,7 @@ isMultibyte(const unsigned char *str) return FALSE; } static char * -getClientTableName(ConnectionClass * conn, char *serverTableName, BOOL * nameAlloced) +getClientTableName(ConnectionClass *conn, char *serverTableName, BOOL *nameAlloced) { char query[1024], saveoid[24], @@ -2778,7 +2778,7 @@ getClientTableName(ConnectionClass * conn, char *serverTableName, BOOL * nameAll return ret; } static char * -getClientColumnName(ConnectionClass * conn, const char *serverTableName, char *serverColumnName, BOOL * nameAlloced) +getClientColumnName(ConnectionClass *conn, const char *serverTableName, char *serverColumnName, BOOL *nameAlloced) { char query[1024], saveattrelid[24], @@ -3277,7 +3277,7 @@ PGAPI_ForeignKeys( for (k = 0; k < num_keys; k++) { - row = (TupleNode *) malloc(sizeof(TupleNode) + (result_cols - 1) * sizeof(TupleField)); + row = (TupleNode *) malloc(sizeof(TupleNode) + (result_cols - 1) *sizeof(TupleField)); #ifdef MULTIBYTE pkey_text = getClientColumnName(conn, pk_table, pkey_ptr, &pkey_alloced); @@ -3533,7 +3533,7 @@ PGAPI_ForeignKeys( #endif /* MULTIBYTE */ mylog("pkey_ptr = '%s', fk_table = '%s', fkey_ptr = '%s'\n", pkey_text, fkt_text, fkey_text); - row = (TupleNode *) malloc(sizeof(TupleNode) + (result_cols - 1) * sizeof(TupleField)); + row = (TupleNode *) malloc(sizeof(TupleNode) + (result_cols - 1) *sizeof(TupleField)); mylog("pk_table_needed = '%s', pkey_ptr = '%s'\n", pk_table_needed, pkey_text); set_tuplefield_null(&row->tuple[0]); diff --git a/src/interfaces/odbc/iodbc.h b/src/interfaces/odbc/iodbc.h index ca12dd03733..9d826b3e459 100644 --- a/src/interfaces/odbc/iodbc.h +++ b/src/interfaces/odbc/iodbc.h @@ -64,4 +64,5 @@ typedef int BOOL; #ifndef NULL #define NULL ((void FAR*)0UL) #endif + #endif diff --git a/src/interfaces/odbc/isql.h b/src/interfaces/odbc/isql.h index fafb01594bc..ba55856096e 100644 --- a/src/interfaces/odbc/isql.h +++ b/src/interfaces/odbc/isql.h @@ -236,4 +236,5 @@ extern "C" #ifdef __cplusplus } #endif + #endif diff --git a/src/interfaces/odbc/isqlext.h b/src/interfaces/odbc/isqlext.h index 83e9c83ee2f..bb5292e864f 100644 --- a/src/interfaces/odbc/isqlext.h +++ b/src/interfaces/odbc/isqlext.h @@ -371,13 +371,13 @@ typedef struct { SQLUINTEGER dwLowWord; SQLUINTEGER dwHighWord; -} SQLUBIGINT; +} SQLUBIGINT; typedef struct { SQLUINTEGER dwLowWord; SQLINTEGER dwHighWord; -} SQLBIGINT; +} SQLBIGINT; #endif /* GCC */ typedef struct tagDATE_STRUCT @@ -385,18 +385,18 @@ typedef struct tagDATE_STRUCT SQLSMALLINT year; SQLUSMALLINT month; SQLUSMALLINT day; -} DATE_STRUCT, +} DATE_STRUCT, - SQL_DATE_STRUCT; +SQL_DATE_STRUCT; typedef struct tagTIME_STRUCT { SQLUSMALLINT hour; SQLUSMALLINT minute; SQLUSMALLINT second; -} TIME_STRUCT, +} TIME_STRUCT, - SQL_TIME_STRUCT; +SQL_TIME_STRUCT; typedef struct tagTIMESTAMP_STRUCT { @@ -407,9 +407,9 @@ typedef struct tagTIMESTAMP_STRUCT SQLUSMALLINT minute; SQLUSMALLINT second; SQLUINTEGER fraction; -} TIMESTAMP_STRUCT, +} TIMESTAMP_STRUCT, - SQL_TIMESTAMP_STRUCT; +SQL_TIMESTAMP_STRUCT; /* postodbc doesn't use these but what the heck */ /* Don't know what SQL_MAX_NUMERIC_LEN should be so I can't include this. It's @@ -430,30 +430,30 @@ typedef struct tagSQLGUID WORD Data2; WORD Data3; BYTE Data4[8]; -} SQLGUID; +} SQLGUID; typedef enum { - SQL_IS_YEAR = 1, - SQL_IS_MONTH = 2, - SQL_IS_DAY = 3, - SQL_IS_HOUR = 4, - SQL_IS_MINUTE = 5, - SQL_IS_SECOND = 6, - SQL_IS_YEAR_TO_MONTH = 7, - SQL_IS_DAY_TO_HOUR = 8, - SQL_IS_DAY_TO_MINUTE = 9, - SQL_IS_DAY_TO_SECOND = 10, - SQL_IS_HOUR_TO_MINUTE = 11, - SQL_IS_HOUR_TO_SECOND = 12, - SQL_IS_MINUTE_TO_SECOND = 13 -} SQLINTERVAL; + SQL_IS_YEAR = 1, + SQL_IS_MONTH = 2, + SQL_IS_DAY = 3, + SQL_IS_HOUR = 4, + SQL_IS_MINUTE = 5, + SQL_IS_SECOND = 6, + SQL_IS_YEAR_TO_MONTH = 7, + SQL_IS_DAY_TO_HOUR = 8, + SQL_IS_DAY_TO_MINUTE = 9, + SQL_IS_DAY_TO_SECOND = 10, + SQL_IS_HOUR_TO_MINUTE = 11, + SQL_IS_HOUR_TO_SECOND = 12, + SQL_IS_MINUTE_TO_SECOND = 13 +} SQLINTERVAL; typedef struct tagSQL_YEAR_MONTH { SQLUINTEGER year; SQLUINTEGER month; -} SQL_YEAR_MONTH_STRUCT; +} SQL_YEAR_MONTH_STRUCT; typedef struct tagSQL_DAY_SECOND { @@ -462,7 +462,7 @@ typedef struct tagSQL_DAY_SECOND SQLUINTEGER minute; SQLUINTEGER second; SQLUINTEGER fraction; -} SQL_DAY_SECOND_STRUCT; +} SQL_DAY_SECOND_STRUCT; typedef struct tagSQL_INTERVAL_STRUCT { @@ -473,7 +473,7 @@ typedef struct tagSQL_INTERVAL_STRUCT SQL_YEAR_MONTH_STRUCT year_month; SQL_DAY_SECOND_STRUCT day_second; } intval; -} SQL_INTERVAL_STRUCT; +} SQL_INTERVAL_STRUCT; #define SQL_MAX_OPTION_STRING_LENGTH 256 #define SQL_NUM_EXTENSIONS (SQL_EXT_API_LAST - SQL_EXT_API_START + 1) @@ -1556,4 +1556,5 @@ extern "C" #ifdef __cplusplus } #endif + #endif diff --git a/src/interfaces/odbc/lobj.c b/src/interfaces/odbc/lobj.c index ab9c287e6a3..6b55b82d54e 100644 --- a/src/interfaces/odbc/lobj.c +++ b/src/interfaces/odbc/lobj.c @@ -18,7 +18,7 @@ Oid -lo_creat(ConnectionClass * conn, int mode) +lo_creat(ConnectionClass *conn, int mode) { LO_ARG argv[1]; int retval, @@ -36,7 +36,7 @@ lo_creat(ConnectionClass * conn, int mode) int -lo_open(ConnectionClass * conn, int lobjId, int mode) +lo_open(ConnectionClass *conn, int lobjId, int mode) { int fd; int result_len; @@ -61,7 +61,7 @@ lo_open(ConnectionClass * conn, int lobjId, int mode) int -lo_close(ConnectionClass * conn, int fd) +lo_close(ConnectionClass *conn, int fd) { LO_ARG argv[1]; int retval, @@ -79,7 +79,7 @@ lo_close(ConnectionClass * conn, int fd) int -lo_read(ConnectionClass * conn, int fd, char *buf, int len) +lo_read(ConnectionClass *conn, int fd, char *buf, int len) { LO_ARG argv[2]; int result_len; @@ -100,7 +100,7 @@ lo_read(ConnectionClass * conn, int fd, char *buf, int len) int -lo_write(ConnectionClass * conn, int fd, char *buf, int len) +lo_write(ConnectionClass *conn, int fd, char *buf, int len) { LO_ARG argv[2]; int retval, @@ -125,7 +125,7 @@ lo_write(ConnectionClass * conn, int fd, char *buf, int len) int -lo_lseek(ConnectionClass * conn, int fd, int offset, int whence) +lo_lseek(ConnectionClass *conn, int fd, int offset, int whence) { LO_ARG argv[3]; int retval, @@ -151,7 +151,7 @@ lo_lseek(ConnectionClass * conn, int fd, int offset, int whence) int -lo_tell(ConnectionClass * conn, int fd) +lo_tell(ConnectionClass *conn, int fd) { LO_ARG argv[1]; int retval, @@ -169,7 +169,7 @@ lo_tell(ConnectionClass * conn, int fd) int -lo_unlink(ConnectionClass * conn, Oid lobjId) +lo_unlink(ConnectionClass *conn, Oid lobjId) { LO_ARG argv[1]; int retval, diff --git a/src/interfaces/odbc/lobj.h b/src/interfaces/odbc/lobj.h index f245411c2ce..4d720488a01 100644 --- a/src/interfaces/odbc/lobj.h +++ b/src/interfaces/odbc/lobj.h @@ -35,12 +35,13 @@ struct lo_arg #define INV_WRITE 0x00020000 #define INV_READ 0x00040000 -Oid lo_creat(ConnectionClass * conn, int mode); -int lo_open(ConnectionClass * conn, int lobjId, int mode); -int lo_close(ConnectionClass * conn, int fd); -int lo_read(ConnectionClass * conn, int fd, char *buf, int len); -int lo_write(ConnectionClass * conn, int fd, char *buf, int len); -int lo_lseek(ConnectionClass * conn, int fd, int offset, int len); -int lo_tell(ConnectionClass * conn, int fd); -int lo_unlink(ConnectionClass * conn, Oid lobjId); +Oid lo_creat(ConnectionClass *conn, int mode); +int lo_open(ConnectionClass *conn, int lobjId, int mode); +int lo_close(ConnectionClass *conn, int fd); +int lo_read(ConnectionClass *conn, int fd, char *buf, int len); +int lo_write(ConnectionClass *conn, int fd, char *buf, int len); +int lo_lseek(ConnectionClass *conn, int fd, int offset, int len); +int lo_tell(ConnectionClass *conn, int fd); +int lo_unlink(ConnectionClass *conn, Oid lobjId); + #endif diff --git a/src/interfaces/odbc/misc.h b/src/interfaces/odbc/misc.h index 5237af6bbe2..5cedd4c147e 100644 --- a/src/interfaces/odbc/misc.h +++ b/src/interfaces/odbc/misc.h @@ -94,4 +94,5 @@ char *my_strcat(char *buf, const char *fmt, const char *s, int len); #define STRCPY_NULL (-2) int my_strcpy(char *dst, int dst_len, const char *src, int src_len); + #endif diff --git a/src/interfaces/odbc/odbcapi.c b/src/interfaces/odbc/odbcapi.c index 3b1b1a0fc3c..4604c14157e 100644 --- a/src/interfaces/odbc/odbcapi.c +++ b/src/interfaces/odbc/odbcapi.c @@ -37,7 +37,7 @@ #include "connection.h" #include "statement.h" -RETCODE SQL_API +RETCODE SQL_API SQLAllocConnect(HENV EnvironmentHandle, HDBC FAR * ConnectionHandle) { @@ -45,45 +45,45 @@ SQLAllocConnect(HENV EnvironmentHandle, return PGAPI_AllocConnect(EnvironmentHandle, ConnectionHandle); } -RETCODE SQL_API +RETCODE SQL_API SQLAllocEnv(HENV FAR * EnvironmentHandle) { mylog("[SQLAllocEnv]"); return PGAPI_AllocEnv(EnvironmentHandle); } -RETCODE SQL_API +RETCODE SQL_API SQLAllocStmt(HDBC ConnectionHandle, - HSTMT * StatementHandle) + HSTMT *StatementHandle) { mylog("[SQLAllocStmt]"); return PGAPI_AllocStmt(ConnectionHandle, StatementHandle); } -RETCODE SQL_API +RETCODE SQL_API SQLBindCol(HSTMT StatementHandle, SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, PTR TargetValue, SQLINTEGER BufferLength, - SQLINTEGER * StrLen_or_Ind) + SQLINTEGER *StrLen_or_Ind) { mylog("[SQLBindCol]"); return PGAPI_BindCol(StatementHandle, ColumnNumber, TargetType, TargetValue, BufferLength, StrLen_or_Ind); } -RETCODE SQL_API +RETCODE SQL_API SQLCancel(HSTMT StatementHandle) { mylog("[SQLCancel]"); return PGAPI_Cancel(StatementHandle); } -RETCODE SQL_API +RETCODE SQL_API SQLColumns(HSTMT StatementHandle, - SQLCHAR * CatalogName, SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, SQLSMALLINT NameLength2, - SQLCHAR * TableName, SQLSMALLINT NameLength3, - SQLCHAR * ColumnName, SQLSMALLINT NameLength4) + SQLCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLCHAR *SchemaName, SQLSMALLINT NameLength2, + SQLCHAR *TableName, SQLSMALLINT NameLength3, + SQLCHAR *ColumnName, SQLSMALLINT NameLength4) { mylog("[SQLColumns]"); return PGAPI_Columns(StatementHandle, CatalogName, NameLength1, @@ -92,18 +92,18 @@ SQLColumns(HSTMT StatementHandle, } -RETCODE SQL_API +RETCODE SQL_API SQLConnect(HDBC ConnectionHandle, - SQLCHAR * ServerName, SQLSMALLINT NameLength1, - SQLCHAR * UserName, SQLSMALLINT NameLength2, - SQLCHAR * Authentication, SQLSMALLINT NameLength3) + SQLCHAR *ServerName, SQLSMALLINT NameLength1, + SQLCHAR *UserName, SQLSMALLINT NameLength2, + SQLCHAR *Authentication, SQLSMALLINT NameLength3) { mylog("[SQLConnect]"); return PGAPI_Connect(ConnectionHandle, ServerName, NameLength1, UserName, NameLength2, Authentication, NameLength3); } -RETCODE SQL_API +RETCODE SQL_API SQLDriverConnect(HDBC hdbc, HWND hwnd, UCHAR FAR * szConnStrIn, @@ -117,26 +117,26 @@ SQLDriverConnect(HDBC hdbc, return PGAPI_DriverConnect(hdbc, hwnd, szConnStrIn, cbConnStrIn, szConnStrOut, cbConnStrOutMax, pcbConnStrOut, fDriverCompletion); } -RETCODE SQL_API +RETCODE SQL_API SQLBrowseConnect( HDBC hdbc, - SQLCHAR * szConnStrIn, + SQLCHAR *szConnStrIn, SQLSMALLINT cbConnStrIn, - SQLCHAR * szConnStrOut, + SQLCHAR *szConnStrOut, SQLSMALLINT cbConnStrOutMax, - SQLSMALLINT * pcbConnStrOut) + SQLSMALLINT *pcbConnStrOut) { mylog("[SQLBrowseConnect]"); return PGAPI_BrowseConnect(hdbc, szConnStrIn, cbConnStrIn, szConnStrOut, cbConnStrOutMax, pcbConnStrOut); } -RETCODE SQL_API +RETCODE SQL_API SQLDataSources(HENV EnvironmentHandle, - SQLUSMALLINT Direction, SQLCHAR * ServerName, - SQLSMALLINT BufferLength1, SQLSMALLINT * NameLength1, - SQLCHAR * Description, SQLSMALLINT BufferLength2, - SQLSMALLINT * NameLength2) + SQLUSMALLINT Direction, SQLCHAR *ServerName, + SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, + SQLCHAR *Description, SQLSMALLINT BufferLength2, + SQLSMALLINT *NameLength2) { mylog("[SQLDataSources]"); @@ -148,12 +148,12 @@ SQLDataSources(HENV EnvironmentHandle, return SQL_ERROR; } -RETCODE SQL_API +RETCODE SQL_API SQLDescribeCol(HSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, SQLCHAR * ColumnName, - SQLSMALLINT BufferLength, SQLSMALLINT * NameLength, - SQLSMALLINT * DataType, SQLUINTEGER * ColumnSize, - SQLSMALLINT * DecimalDigits, SQLSMALLINT * Nullable) + SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName, + SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, + SQLSMALLINT *DataType, SQLUINTEGER *ColumnSize, + SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) { mylog("[SQLDescribeCol]"); return PGAPI_DescribeCol(StatementHandle, ColumnNumber, @@ -161,41 +161,41 @@ SQLDescribeCol(HSTMT StatementHandle, DataType, ColumnSize, DecimalDigits, Nullable); } -RETCODE SQL_API +RETCODE SQL_API SQLDisconnect(HDBC ConnectionHandle) { mylog("[SQLDisconnect]"); return PGAPI_Disconnect(ConnectionHandle); } -RETCODE SQL_API +RETCODE SQL_API SQLError(HENV EnvironmentHandle, HDBC ConnectionHandle, HSTMT StatementHandle, - SQLCHAR * Sqlstate, SQLINTEGER * NativeError, - SQLCHAR * MessageText, SQLSMALLINT BufferLength, - SQLSMALLINT * TextLength) + SQLCHAR *Sqlstate, SQLINTEGER *NativeError, + SQLCHAR *MessageText, SQLSMALLINT BufferLength, + SQLSMALLINT *TextLength) { mylog("[SQLError]"); return PGAPI_Error(EnvironmentHandle, ConnectionHandle, StatementHandle, Sqlstate, NativeError, MessageText, BufferLength, TextLength); } -RETCODE SQL_API +RETCODE SQL_API SQLExecDirect(HSTMT StatementHandle, - SQLCHAR * StatementText, SQLINTEGER TextLength) + SQLCHAR *StatementText, SQLINTEGER TextLength) { mylog("[SQLExecDirect]"); return PGAPI_ExecDirect(StatementHandle, StatementText, TextLength); } -RETCODE SQL_API +RETCODE SQL_API SQLExecute(HSTMT StatementHandle) { mylog("[SQLExecute]"); return PGAPI_Execute(StatementHandle); } -RETCODE SQL_API +RETCODE SQL_API SQLFetch(HSTMT StatementHandle) { static char *func = "SQLFetch"; @@ -218,21 +218,21 @@ SQLFetch(HSTMT StatementHandle) return PGAPI_Fetch(StatementHandle); } -RETCODE SQL_API +RETCODE SQL_API SQLFreeConnect(HDBC ConnectionHandle) { mylog("[SQLFreeStmt]"); return PGAPI_FreeConnect(ConnectionHandle); } -RETCODE SQL_API +RETCODE SQL_API SQLFreeEnv(HENV EnvironmentHandle) { mylog("[SQLFreeEnv]"); return PGAPI_FreeEnv(EnvironmentHandle); } -RETCODE SQL_API +RETCODE SQL_API SQLFreeStmt(HSTMT StatementHandle, SQLUSMALLINT Option) { @@ -240,37 +240,37 @@ SQLFreeStmt(HSTMT StatementHandle, return PGAPI_FreeStmt(StatementHandle, Option); } -RETCODE SQL_API +RETCODE SQL_API SQLGetConnectOption(HDBC ConnectionHandle, SQLUSMALLINT Option, PTR Value) { mylog("[SQLGetConnectOption]"); return PGAPI_GetConnectOption(ConnectionHandle, Option, Value); } -RETCODE SQL_API +RETCODE SQL_API SQLGetCursorName(HSTMT StatementHandle, - SQLCHAR * CursorName, SQLSMALLINT BufferLength, - SQLSMALLINT * NameLength) + SQLCHAR *CursorName, SQLSMALLINT BufferLength, + SQLSMALLINT *NameLength) { mylog("[SQLGetCursorName]"); return PGAPI_GetCursorName(StatementHandle, CursorName, BufferLength, NameLength); } -RETCODE SQL_API +RETCODE SQL_API SQLGetData(HSTMT StatementHandle, SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, PTR TargetValue, SQLINTEGER BufferLength, - SQLINTEGER * StrLen_or_Ind) + SQLINTEGER *StrLen_or_Ind) { mylog("[SQLGetData]"); return PGAPI_GetData(StatementHandle, ColumnNumber, TargetType, TargetValue, BufferLength, StrLen_or_Ind); } -RETCODE SQL_API +RETCODE SQL_API SQLGetFunctions(HDBC ConnectionHandle, - SQLUSMALLINT FunctionId, SQLUSMALLINT * Supported) + SQLUSMALLINT FunctionId, SQLUSMALLINT *Supported) { mylog("[SQLGetFunctions]"); #if (ODBCVER >= 0x3000) @@ -279,10 +279,10 @@ SQLGetFunctions(HDBC ConnectionHandle, #endif return PGAPI_GetFunctions(ConnectionHandle, FunctionId, Supported); } -RETCODE SQL_API +RETCODE SQL_API SQLGetInfo(HDBC ConnectionHandle, SQLUSMALLINT InfoType, PTR InfoValue, - SQLSMALLINT BufferLength, SQLSMALLINT * StringLength) + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength) { #if (ODBCVER >= 0x3000) RETCODE ret; @@ -303,7 +303,7 @@ SQLGetInfo(HDBC ConnectionHandle, #endif } -RETCODE SQL_API +RETCODE SQL_API SQLGetStmtOption(HSTMT StatementHandle, SQLUSMALLINT Option, PTR Value) { @@ -311,7 +311,7 @@ SQLGetStmtOption(HSTMT StatementHandle, return PGAPI_GetStmtOption(StatementHandle, Option, Value); } -RETCODE SQL_API +RETCODE SQL_API SQLGetTypeInfo(HSTMT StatementHandle, SQLSMALLINT DataType) { @@ -319,31 +319,31 @@ SQLGetTypeInfo(HSTMT StatementHandle, return PGAPI_GetTypeInfo(StatementHandle, DataType); } -RETCODE SQL_API +RETCODE SQL_API SQLNumResultCols(HSTMT StatementHandle, - SQLSMALLINT * ColumnCount) + SQLSMALLINT *ColumnCount) { mylog("[SQLNumResultCols]"); return PGAPI_NumResultCols(StatementHandle, ColumnCount); } -RETCODE SQL_API +RETCODE SQL_API SQLParamData(HSTMT StatementHandle, - PTR * Value) + PTR *Value) { mylog("[SQLParamData]"); return PGAPI_ParamData(StatementHandle, Value); } -RETCODE SQL_API +RETCODE SQL_API SQLPrepare(HSTMT StatementHandle, - SQLCHAR * StatementText, SQLINTEGER TextLength) + SQLCHAR *StatementText, SQLINTEGER TextLength) { mylog("[SQLPrepare]"); return PGAPI_Prepare(StatementHandle, StatementText, TextLength); } -RETCODE SQL_API +RETCODE SQL_API SQLPutData(HSTMT StatementHandle, PTR Data, SQLINTEGER StrLen_or_Ind) { @@ -351,15 +351,15 @@ SQLPutData(HSTMT StatementHandle, return PGAPI_PutData(StatementHandle, Data, StrLen_or_Ind); } -RETCODE SQL_API +RETCODE SQL_API SQLRowCount(HSTMT StatementHandle, - SQLINTEGER * RowCount) + SQLINTEGER *RowCount) { mylog("[SQLRowCount]"); return PGAPI_RowCount(StatementHandle, RowCount); } -RETCODE SQL_API +RETCODE SQL_API SQLSetConnectOption(HDBC ConnectionHandle, SQLUSMALLINT Option, SQLUINTEGER Value) { @@ -367,20 +367,20 @@ SQLSetConnectOption(HDBC ConnectionHandle, return PGAPI_SetConnectOption(ConnectionHandle, Option, Value); } -RETCODE SQL_API +RETCODE SQL_API SQLSetCursorName(HSTMT StatementHandle, - SQLCHAR * CursorName, SQLSMALLINT NameLength) + SQLCHAR *CursorName, SQLSMALLINT NameLength) { mylog("[SQLSetCursorName]"); return PGAPI_SetCursorName(StatementHandle, CursorName, NameLength); } -RETCODE SQL_API +RETCODE SQL_API SQLSetParam(HSTMT StatementHandle, SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, SQLSMALLINT ParameterType, SQLUINTEGER LengthPrecision, SQLSMALLINT ParameterScale, PTR ParameterValue, - SQLINTEGER * StrLen_or_Ind) + SQLINTEGER *StrLen_or_Ind) { mylog("[SQLSetParam]"); @@ -392,7 +392,7 @@ SQLSetParam(HSTMT StatementHandle, return SQL_ERROR; } -RETCODE SQL_API +RETCODE SQL_API SQLSetStmtOption(HSTMT StatementHandle, SQLUSMALLINT Option, SQLUINTEGER Value) { @@ -400,11 +400,11 @@ SQLSetStmtOption(HSTMT StatementHandle, return PGAPI_SetStmtOption(StatementHandle, Option, Value); } -RETCODE SQL_API +RETCODE SQL_API SQLSpecialColumns(HSTMT StatementHandle, - SQLUSMALLINT IdentifierType, SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, SQLCHAR * TableName, + SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName, + SQLSMALLINT NameLength1, SQLCHAR *SchemaName, + SQLSMALLINT NameLength2, SQLCHAR *TableName, SQLSMALLINT NameLength3, SQLUSMALLINT Scope, SQLUSMALLINT Nullable) { @@ -414,11 +414,11 @@ SQLSpecialColumns(HSTMT StatementHandle, Scope, Nullable); } -RETCODE SQL_API +RETCODE SQL_API SQLStatistics(HSTMT StatementHandle, - SQLCHAR * CatalogName, SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, SQLSMALLINT NameLength2, - SQLCHAR * TableName, SQLSMALLINT NameLength3, + SQLCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLCHAR *SchemaName, SQLSMALLINT NameLength2, + SQLCHAR *TableName, SQLSMALLINT NameLength3, SQLUSMALLINT Unique, SQLUSMALLINT Reserved) { mylog("[SQLStatistics]"); @@ -427,12 +427,12 @@ SQLStatistics(HSTMT StatementHandle, Reserved); } -RETCODE SQL_API +RETCODE SQL_API SQLTables(HSTMT StatementHandle, - SQLCHAR * CatalogName, SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, SQLSMALLINT NameLength2, - SQLCHAR * TableName, SQLSMALLINT NameLength3, - SQLCHAR * TableType, SQLSMALLINT NameLength4) + SQLCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLCHAR *SchemaName, SQLSMALLINT NameLength2, + SQLCHAR *TableName, SQLSMALLINT NameLength3, + SQLCHAR *TableType, SQLSMALLINT NameLength4) { mylog("[SQLTables]"); return PGAPI_Tables(StatementHandle, CatalogName, NameLength1, @@ -440,7 +440,7 @@ SQLTables(HSTMT StatementHandle, TableType, NameLength4); } -RETCODE SQL_API +RETCODE SQL_API SQLTransact(HENV EnvironmentHandle, HDBC ConnectionHandle, SQLUSMALLINT CompletionType) { @@ -448,31 +448,31 @@ SQLTransact(HENV EnvironmentHandle, return PGAPI_Transact(EnvironmentHandle, ConnectionHandle, CompletionType); } -RETCODE SQL_API +RETCODE SQL_API SQLColAttributes( HSTMT hstmt, SQLUSMALLINT icol, SQLUSMALLINT fDescType, PTR rgbDesc, SQLSMALLINT cbDescMax, - SQLSMALLINT * pcbDesc, - SQLINTEGER * pfDesc) + SQLSMALLINT *pcbDesc, + SQLINTEGER *pfDesc) { mylog("[SQLColAttributes]"); return PGAPI_ColAttributes(hstmt, icol, fDescType, rgbDesc, cbDescMax, pcbDesc, pfDesc); } -RETCODE SQL_API +RETCODE SQL_API SQLColumnPrivileges( HSTMT hstmt, - SQLCHAR * szCatalogName, + SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, - SQLCHAR * szSchemaName, + SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, - SQLCHAR * szTableName, + SQLCHAR *szTableName, SQLSMALLINT cbTableName, - SQLCHAR * szColumnName, + SQLCHAR *szColumnName, SQLSMALLINT cbColumnName) { mylog("[SQLColumnPrivileges]"); @@ -481,46 +481,46 @@ SQLColumnPrivileges( szColumnName, cbColumnName); } -RETCODE SQL_API +RETCODE SQL_API SQLDescribeParam( HSTMT hstmt, SQLUSMALLINT ipar, - SQLSMALLINT * pfSqlType, - SQLUINTEGER * pcbParamDef, - SQLSMALLINT * pibScale, - SQLSMALLINT * pfNullable) + SQLSMALLINT *pfSqlType, + SQLUINTEGER *pcbParamDef, + SQLSMALLINT *pibScale, + SQLSMALLINT *pfNullable) { mylog("[SQLDescribeParam]"); return PGAPI_DescribeParam(hstmt, ipar, pfSqlType, pcbParamDef, pibScale, pfNullable); } -RETCODE SQL_API +RETCODE SQL_API SQLExtendedFetch( HSTMT hstmt, SQLUSMALLINT fFetchType, SQLINTEGER irow, - SQLUINTEGER * pcrow, - SQLUSMALLINT * rgfRowStatus) + SQLUINTEGER *pcrow, + SQLUSMALLINT *rgfRowStatus) { mylog("[SQLExtendedFetch]"); return PGAPI_ExtendedFetch(hstmt, fFetchType, irow, pcrow, rgfRowStatus); } -RETCODE SQL_API +RETCODE SQL_API SQLForeignKeys( HSTMT hstmt, - SQLCHAR * szPkCatalogName, + SQLCHAR *szPkCatalogName, SQLSMALLINT cbPkCatalogName, - SQLCHAR * szPkSchemaName, + SQLCHAR *szPkSchemaName, SQLSMALLINT cbPkSchemaName, - SQLCHAR * szPkTableName, + SQLCHAR *szPkTableName, SQLSMALLINT cbPkTableName, - SQLCHAR * szFkCatalogName, + SQLCHAR *szFkCatalogName, SQLSMALLINT cbFkCatalogName, - SQLCHAR * szFkSchemaName, + SQLCHAR *szFkSchemaName, SQLSMALLINT cbFkSchemaName, - SQLCHAR * szFkTableName, + SQLCHAR *szFkTableName, SQLSMALLINT cbFkTableName) { mylog("[SQLForeignKeys]"); @@ -530,54 +530,54 @@ SQLForeignKeys( szFkSchemaName, cbFkSchemaName, szFkTableName, cbFkTableName); } -RETCODE SQL_API +RETCODE SQL_API SQLMoreResults(HSTMT hstmt) { mylog("[SQLMoreResults]"); return PGAPI_MoreResults(hstmt); } -RETCODE SQL_API +RETCODE SQL_API SQLNativeSql( HDBC hdbc, - SQLCHAR * szSqlStrIn, + SQLCHAR *szSqlStrIn, SQLINTEGER cbSqlStrIn, - SQLCHAR * szSqlStr, + SQLCHAR *szSqlStr, SQLINTEGER cbSqlStrMax, - SQLINTEGER * pcbSqlStr) + SQLINTEGER *pcbSqlStr) { mylog("[SQLNativeSql]"); return PGAPI_NativeSql(hdbc, szSqlStrIn, cbSqlStrIn, szSqlStr, cbSqlStrMax, pcbSqlStr); } -RETCODE SQL_API +RETCODE SQL_API SQLNumParams( HSTMT hstmt, - SQLSMALLINT * pcpar) + SQLSMALLINT *pcpar) { mylog("[SQLNumParams]"); return PGAPI_NumParams(hstmt, pcpar); } -RETCODE SQL_API +RETCODE SQL_API SQLParamOptions( HSTMT hstmt, SQLUINTEGER crow, - SQLUINTEGER * pirow) + SQLUINTEGER *pirow) { mylog("[SQLParamOptions]"); return PGAPI_ParamOptions(hstmt, crow, pirow); } -RETCODE SQL_API +RETCODE SQL_API SQLPrimaryKeys( HSTMT hstmt, - SQLCHAR * szCatalogName, + SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, - SQLCHAR * szSchemaName, + SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, - SQLCHAR * szTableName, + SQLCHAR *szTableName, SQLSMALLINT cbTableName) { mylog("[SQLPrimaryKeys]"); @@ -585,16 +585,16 @@ SQLPrimaryKeys( szSchemaName, cbSchemaName, szTableName, cbTableName); } -RETCODE SQL_API +RETCODE SQL_API SQLProcedureColumns( HSTMT hstmt, - SQLCHAR * szCatalogName, + SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, - SQLCHAR * szSchemaName, + SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, - SQLCHAR * szProcName, + SQLCHAR *szProcName, SQLSMALLINT cbProcName, - SQLCHAR * szColumnName, + SQLCHAR *szColumnName, SQLSMALLINT cbColumnName) { mylog("[SQLProcedureColumns]"); @@ -603,14 +603,14 @@ SQLProcedureColumns( szColumnName, cbColumnName); } -RETCODE SQL_API +RETCODE SQL_API SQLProcedures( HSTMT hstmt, - SQLCHAR * szCatalogName, + SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, - SQLCHAR * szSchemaName, + SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, - SQLCHAR * szProcName, + SQLCHAR *szProcName, SQLSMALLINT cbProcName) { mylog("[SQLProcedures]"); @@ -618,7 +618,7 @@ SQLProcedures( szSchemaName, cbSchemaName, szProcName, cbProcName); } -RETCODE SQL_API +RETCODE SQL_API SQLSetPos( HSTMT hstmt, SQLUSMALLINT irow, @@ -629,14 +629,14 @@ SQLSetPos( return PGAPI_SetPos(hstmt, irow, fOption, fLock); } -RETCODE SQL_API +RETCODE SQL_API SQLTablePrivileges( HSTMT hstmt, - SQLCHAR * szCatalogName, + SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, - SQLCHAR * szSchemaName, + SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, - SQLCHAR * szTableName, + SQLCHAR *szTableName, SQLSMALLINT cbTableName) { mylog("[SQLTablePrivileges]"); @@ -644,7 +644,7 @@ SQLTablePrivileges( szSchemaName, cbSchemaName, szTableName, cbTableName); } -RETCODE SQL_API +RETCODE SQL_API SQLBindParameter( HSTMT hstmt, SQLUSMALLINT ipar, @@ -655,7 +655,7 @@ SQLBindParameter( SQLSMALLINT ibScale, PTR rgbValue, SQLINTEGER cbValueMax, - SQLINTEGER * pcbValue) + SQLINTEGER *pcbValue) { mylog("[SQLBindParameter]"); return PGAPI_BindParameter(hstmt, ipar, fParamType, fCType, diff --git a/src/interfaces/odbc/odbcapi30.c b/src/interfaces/odbc/odbcapi30.c index ccd214a69dc..161940aed87 100644 --- a/src/interfaces/odbc/odbcapi30.c +++ b/src/interfaces/odbc/odbcapi30.c @@ -29,7 +29,7 @@ #include "pgapifunc.h" /* SQLAllocConnect/SQLAllocEnv/SQLAllocStmt -> SQLAllocHandle */ -RETCODE SQL_API +RETCODE SQL_API SQLAllocHandle(SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE * OutputHandle) { @@ -49,12 +49,12 @@ SQLAllocHandle(SQLSMALLINT HandleType, } /* SQLBindParameter/SQLSetParam -> SQLBindParam */ -RETCODE SQL_API +RETCODE SQL_API SQLBindParam(HSTMT StatementHandle, SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, SQLSMALLINT ParameterType, SQLUINTEGER LengthPrecision, SQLSMALLINT ParameterScale, PTR ParameterValue, - SQLINTEGER * StrLen_or_Ind) + SQLINTEGER *StrLen_or_Ind) { int BufferLength = 512; /* Is it OK ? */ @@ -63,7 +63,7 @@ SQLBindParam(HSTMT StatementHandle, } /* New function */ -RETCODE SQL_API +RETCODE SQL_API SQLCloseCursor(HSTMT StatementHandle) { mylog("[[SQLCloseCursor]]"); @@ -71,11 +71,11 @@ SQLCloseCursor(HSTMT StatementHandle) } /* SQLColAttributes -> SQLColAttribute */ -RETCODE SQL_API +RETCODE SQL_API SQLColAttribute(HSTMT StatementHandle, SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier, PTR CharacterAttribute, SQLSMALLINT BufferLength, - SQLSMALLINT * StringLength, PTR NumericAttribute) + SQLSMALLINT *StringLength, PTR NumericAttribute) { mylog("[[SQLColAttribute]]"); return PGAPI_ColAttributes(StatementHandle, ColumnNumber, @@ -84,7 +84,7 @@ SQLColAttribute(HSTMT StatementHandle, } /* new function */ -RETCODE SQL_API +RETCODE SQL_API SQLCopyDesc(SQLHDESC SourceDescHandle, SQLHDESC TargetDescHandle) { @@ -93,7 +93,7 @@ SQLCopyDesc(SQLHDESC SourceDescHandle, } /* SQLTransact -> SQLEndTran */ -RETCODE SQL_API +RETCODE SQL_API SQLEndTran(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMALLINT CompletionType) { @@ -113,7 +113,7 @@ SQLEndTran(SQLSMALLINT HandleType, SQLHANDLE Handle, } /* SQLExtendedFetch -> SQLFetchScroll */ -RETCODE SQL_API +RETCODE SQL_API SQLFetchScroll(HSTMT StatementHandle, SQLSMALLINT FetchOrientation, SQLINTEGER FetchOffset) { @@ -144,7 +144,7 @@ SQLFetchScroll(HSTMT StatementHandle, } /* SQLFree(Connect/Env/Stmt) -> SQLFreeHandle */ -RETCODE SQL_API +RETCODE SQL_API SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle) { mylog("[[SQLFreeHandle]]"); @@ -163,46 +163,46 @@ SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle) } /* new function */ -RETCODE SQL_API +RETCODE SQL_API SQLGetDescField(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength, - SQLINTEGER * StringLength) + SQLINTEGER *StringLength) { mylog("[[SQLGetDescField]]\n"); return SQL_ERROR; } /* new function */ -RETCODE SQL_API +RETCODE SQL_API SQLGetDescRec(SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, SQLCHAR * Name, - SQLSMALLINT BufferLength, SQLSMALLINT * StringLength, - SQLSMALLINT * Type, SQLSMALLINT * SubType, - SQLINTEGER * Length, SQLSMALLINT * Precision, - SQLSMALLINT * Scale, SQLSMALLINT * Nullable) + SQLSMALLINT RecNumber, SQLCHAR *Name, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength, + SQLSMALLINT *Type, SQLSMALLINT *SubType, + SQLINTEGER *Length, SQLSMALLINT *Precision, + SQLSMALLINT *Scale, SQLSMALLINT *Nullable) { mylog("[[SQLGetDescRec]]\n"); return SQL_ERROR; } /* new function */ -RETCODE SQL_API +RETCODE SQL_API SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier, PTR DiagInfo, SQLSMALLINT BufferLength, - SQLSMALLINT * StringLength) + SQLSMALLINT *StringLength) { mylog("[[SQLGetDiagField]]\n"); return SQL_ERROR; } /* SQLError -> SQLDiagRec */ -RETCODE SQL_API +RETCODE SQL_API SQLGetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle, - SQLSMALLINT RecNumber, SQLCHAR * Sqlstate, - SQLINTEGER * NativeError, SQLCHAR * MessageText, - SQLSMALLINT BufferLength, SQLSMALLINT * TextLength) + SQLSMALLINT RecNumber, SQLCHAR *Sqlstate, + SQLINTEGER *NativeError, SQLCHAR *MessageText, + SQLSMALLINT BufferLength, SQLSMALLINT *TextLength) { RETCODE ret; @@ -240,10 +240,10 @@ SQLGetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle, } /* new function */ -RETCODE SQL_API +RETCODE SQL_API SQLGetEnvAttr(HENV EnvironmentHandle, SQLINTEGER Attribute, PTR Value, - SQLINTEGER BufferLength, SQLINTEGER * StringLength) + SQLINTEGER BufferLength, SQLINTEGER *StringLength) { EnvironmentClass *env = (EnvironmentClass *) EnvironmentHandle; @@ -270,10 +270,10 @@ SQLGetEnvAttr(HENV EnvironmentHandle, } /* SQLGetConnectOption -> SQLGetconnectAttr */ -RETCODE SQL_API +RETCODE SQL_API SQLGetConnectAttr(HDBC ConnectionHandle, SQLINTEGER Attribute, PTR Value, - SQLINTEGER BufferLength, SQLINTEGER * StringLength) + SQLINTEGER BufferLength, SQLINTEGER *StringLength) { ConnectionClass *conn = (ConnectionClass *) ConnectionHandle; @@ -293,10 +293,10 @@ SQLGetConnectAttr(HDBC ConnectionHandle, } /* SQLGetStmtOption -> SQLGetStmtAttr */ -RETCODE SQL_API +RETCODE SQL_API SQLGetStmtAttr(HSTMT StatementHandle, SQLINTEGER Attribute, PTR Value, - SQLINTEGER BufferLength, SQLINTEGER * StringLength) + SQLINTEGER BufferLength, SQLINTEGER *StringLength) { static char *func = "SQLGetStmtAttr"; StatementClass *stmt = (StatementClass *) StatementHandle; @@ -341,7 +341,7 @@ SQLGetStmtAttr(HSTMT StatementHandle, *((HSTMT *) Value) = StatementHandle; /* this is useless */ len = 4; break; - case SQL_ATTR_AUTO_IPD:/* 10001 */ + case SQL_ATTR_AUTO_IPD: /* 10001 */ case SQL_ATTR_ROW_BIND_TYPE: /* == SQL_BIND_TYPE */ case SQL_ATTR_PARAMSET_SIZE: /* 22 */ case SQL_ATTR_PARAM_STATUS_PTR: /* 20 */ @@ -376,7 +376,7 @@ SQLGetStmtAttr(HSTMT StatementHandle, } /* SQLSetConnectOption -> SQLSetConnectAttr */ -RETCODE SQL_API +RETCODE SQL_API SQLSetConnectAttr(HDBC ConnectionHandle, SQLINTEGER Attribute, PTR Value, SQLINTEGER StringLength) @@ -399,7 +399,7 @@ SQLSetConnectAttr(HDBC ConnectionHandle, } /* new function */ -RETCODE SQL_API +RETCODE SQL_API SQLSetDescField(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength) @@ -409,20 +409,20 @@ SQLSetDescField(SQLHDESC DescriptorHandle, } /* new fucntion */ -RETCODE SQL_API +RETCODE SQL_API SQLSetDescRec(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, SQLSMALLINT Type, SQLSMALLINT SubType, SQLINTEGER Length, SQLSMALLINT Precision, SQLSMALLINT Scale, - PTR Data, SQLINTEGER * StringLength, - SQLINTEGER * Indicator) + PTR Data, SQLINTEGER *StringLength, + SQLINTEGER *Indicator) { mylog("[[SQLsetDescRec]]\n"); return SQL_ERROR; } /* new function */ -RETCODE SQL_API +RETCODE SQL_API SQLSetEnvAttr(HENV EnvironmentHandle, SQLINTEGER Attribute, PTR Value, SQLINTEGER StringLength) @@ -457,7 +457,7 @@ SQLSetEnvAttr(HENV EnvironmentHandle, } /* SQLSet(Param/Scroll/Stmt)Option -> SQLSetStmtAttr */ -RETCODE SQL_API +RETCODE SQL_API SQLSetStmtAttr(HSTMT StatementHandle, SQLINTEGER Attribute, PTR Value, SQLINTEGER StringLength) @@ -481,8 +481,8 @@ SQLSetStmtAttr(HSTMT StatementHandle, case SQL_ATTR_APP_ROW_DESC: /* 10010 */ case SQL_ATTR_APP_PARAM_DESC: /* 10011 */ - case SQL_ATTR_AUTO_IPD:/* 10001 */ - /* case SQL_ATTR_ROW_BIND_TYPE: *//* == SQL_BIND_TYPE */ + case SQL_ATTR_AUTO_IPD: /* 10001 */ + /* case SQL_ATTR_ROW_BIND_TYPE: */ /* == SQL_BIND_TYPE */ case SQL_ATTR_IMP_ROW_DESC: /* 10012 */ case SQL_ATTR_IMP_PARAM_DESC: /* 10013 */ case SQL_ATTR_METADATA_ID: /* 10014 */ @@ -607,7 +607,7 @@ PGAPI_GetFunctions30(HDBC hdbc, UWORD fFunction, UWORD FAR * pfExists) SQL_FUNC_ESET(pfExists, SQL_API_SQLSETPOS); /* 68 */ SQL_FUNC_ESET(pfExists, SQL_API_SQLSETSCROLLOPTIONS); /* 69 deprecated */ SQL_FUNC_ESET(pfExists, SQL_API_SQLTABLEPRIVILEGES); /* 70 */ - /* SQL_FUNC_ESET(pfExists, SQL_API_SQLDRIVERS); *//* 71 */ + /* SQL_FUNC_ESET(pfExists, SQL_API_SQLDRIVERS); */ /* 71 */ SQL_FUNC_ESET(pfExists, SQL_API_SQLBINDPARAMETER); /* 72 */ SQL_FUNC_ESET(pfExists, SQL_API_SQLALLOCHANDLE); /* 1001 */ diff --git a/src/interfaces/odbc/options.c b/src/interfaces/odbc/options.c index 5668d8f2d11..04331456c91 100644 --- a/src/interfaces/odbc/options.c +++ b/src/interfaces/odbc/options.c @@ -24,15 +24,15 @@ -RETCODE set_statement_option(ConnectionClass * conn, - StatementClass * stmt, +RETCODE set_statement_option(ConnectionClass *conn, + StatementClass *stmt, UWORD fOption, UDWORD vParam); RETCODE -set_statement_option(ConnectionClass * conn, - StatementClass * stmt, +set_statement_option(ConnectionClass *conn, + StatementClass *stmt, UWORD fOption, UDWORD vParam) { @@ -173,12 +173,12 @@ set_statement_option(ConnectionClass * conn, mylog("SetStmtOption: SQL_NOSCAN, vParam = %d\n", vParam); break; - case SQL_QUERY_TIMEOUT:/* ignored */ + case SQL_QUERY_TIMEOUT: /* ignored */ mylog("SetStmtOption: SQL_QUERY_TIMEOUT, vParam = %d\n", vParam); /* "0" returned in SQLGetStmtOption */ break; - case SQL_RETRIEVE_DATA:/* ignored, but saved */ + case SQL_RETRIEVE_DATA: /* ignored, but saved */ mylog("SetStmtOption(): SQL_RETRIEVE_DATA, vParam = %d\n", vParam); if (conn) conn->stmtOptions.retrieve_data = vParam; @@ -373,7 +373,7 @@ PGAPI_SetConnectOption( case SQL_CURRENT_QUALIFIER: /* ignored */ break; - case SQL_LOGIN_TIMEOUT:/* ignored */ + case SQL_LOGIN_TIMEOUT: /* ignored */ break; case SQL_PACKET_SIZE: /* ignored */ @@ -382,7 +382,7 @@ PGAPI_SetConnectOption( case SQL_QUIET_MODE: /* ignored */ break; - case SQL_TXN_ISOLATION:/* ignored */ + case SQL_TXN_ISOLATION: /* ignored */ break; /* These options should be handled by driver manager */ @@ -462,7 +462,7 @@ PGAPI_GetConnectOption( break; - case SQL_LOGIN_TIMEOUT:/* NOT SUPPORTED */ + case SQL_LOGIN_TIMEOUT: /* NOT SUPPORTED */ *((UDWORD *) pvParam) = 0; break; @@ -474,7 +474,7 @@ PGAPI_GetConnectOption( *((UDWORD *) pvParam) = (UDWORD) NULL; break; - case SQL_TXN_ISOLATION:/* NOT SUPPORTED */ + case SQL_TXN_ISOLATION: /* NOT SUPPORTED */ *((UDWORD *) pvParam) = SQL_TXN_SERIALIZABLE; break; @@ -632,11 +632,11 @@ PGAPI_GetStmtOption( *((SDWORD *) pvParam) = SQL_NOSCAN_ON; break; - case SQL_QUERY_TIMEOUT:/* NOT SUPPORTED */ + case SQL_QUERY_TIMEOUT: /* NOT SUPPORTED */ *((SDWORD *) pvParam) = 0; break; - case SQL_RETRIEVE_DATA:/* NOT SUPPORTED, but saved */ + case SQL_RETRIEVE_DATA: /* NOT SUPPORTED, but saved */ *((SDWORD *) pvParam) = stmt->options.retrieve_data; break; diff --git a/src/interfaces/odbc/parse.c b/src/interfaces/odbc/parse.c index 60d16d5c1ce..8a90cce35a5 100644 --- a/src/interfaces/odbc/parse.c +++ b/src/interfaces/odbc/parse.c @@ -43,8 +43,8 @@ #define COL_INCR 16 char *getNextToken(char *s, char *token, int smax, char *delim, char *quote, char *dquote, char *numeric); -void getColInfo(COL_INFO * col_info, FIELD_INFO * fi, int k); -char searchColInfo(COL_INFO * col_info, FIELD_INFO * fi); +void getColInfo(COL_INFO *col_info, FIELD_INFO *fi, int k); +char searchColInfo(COL_INFO *col_info, FIELD_INFO *fi); char * @@ -216,7 +216,7 @@ QR_set_field_info(stmt->result, 13, "FIELD_TYPE", PG_TYPE_INT4, 4); #endif void -getColInfo(COL_INFO * col_info, FIELD_INFO * fi, int k) +getColInfo(COL_INFO *col_info, FIELD_INFO *fi, int k) { char *str; @@ -236,7 +236,7 @@ getColInfo(COL_INFO * col_info, FIELD_INFO * fi, int k) char -searchColInfo(COL_INFO * col_info, FIELD_INFO * fi) +searchColInfo(COL_INFO *col_info, FIELD_INFO *fi) { int k, cmp; @@ -265,7 +265,7 @@ searchColInfo(COL_INFO * col_info, FIELD_INFO * fi) char -parse_statement(StatementClass * stmt) +parse_statement(StatementClass *stmt) { static char *func = "parse_statement"; char token[256]; diff --git a/src/interfaces/odbc/pgapifunc.h b/src/interfaces/odbc/pgapifunc.h index 465808f0ea7..dadabe1fac8 100644 --- a/src/interfaces/odbc/pgapifunc.h +++ b/src/interfaces/odbc/pgapifunc.h @@ -15,47 +15,47 @@ RETCODE SQL_API PGAPI_AllocConnect(HENV EnvironmentHandle, HDBC FAR * ConnectionHandle); RETCODE SQL_API PGAPI_AllocEnv(HENV FAR * EnvironmentHandle); RETCODE SQL_API PGAPI_AllocStmt(HDBC ConnectionHandle, - HSTMT * StatementHandle); + HSTMT *StatementHandle); RETCODE SQL_API PGAPI_BindCol(HSTMT StatementHandle, SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, PTR TargetValue, SQLINTEGER BufferLength, - SQLINTEGER * StrLen_or_Ind); + SQLINTEGER *StrLen_or_Ind); RETCODE SQL_API PGAPI_Cancel(HSTMT StatementHandle); RETCODE SQL_API PGAPI_Columns(HSTMT StatementHandle, - SQLCHAR * CatalogName, SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, SQLSMALLINT NameLength2, - SQLCHAR * TableName, SQLSMALLINT NameLength3, - SQLCHAR * ColumnName, SQLSMALLINT NameLength4); + SQLCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLCHAR *SchemaName, SQLSMALLINT NameLength2, + SQLCHAR *TableName, SQLSMALLINT NameLength3, + SQLCHAR *ColumnName, SQLSMALLINT NameLength4); RETCODE SQL_API PGAPI_Connect(HDBC ConnectionHandle, - SQLCHAR * ServerName, SQLSMALLINT NameLength1, - SQLCHAR * UserName, SQLSMALLINT NameLength2, - SQLCHAR * Authentication, SQLSMALLINT NameLength3); + SQLCHAR *ServerName, SQLSMALLINT NameLength1, + SQLCHAR *UserName, SQLSMALLINT NameLength2, + SQLCHAR *Authentication, SQLSMALLINT NameLength3); RETCODE SQL_API PGAPI_DriverConnect(HDBC hdbc, HWND hwnd, UCHAR FAR * szConnStrIn, SWORD cbConnStrIn, UCHAR FAR * szConnStrOut, SWORD cbConnStrOutMax, SWORD FAR * pcbConnStrOut, UWORD fDriverCompletion); RETCODE SQL_API PGAPI_BrowseConnect(HDBC hdbc, - SQLCHAR * szConnStrIn, SQLSMALLINT cbConnStrIn, - SQLCHAR * szConnStrOut, SQLSMALLINT cbConnStrOutMax, - SQLSMALLINT * pcbConnStrOut); + SQLCHAR *szConnStrIn, SQLSMALLINT cbConnStrIn, + SQLCHAR *szConnStrOut, SQLSMALLINT cbConnStrOutMax, + SQLSMALLINT *pcbConnStrOut); RETCODE SQL_API PGAPI_DataSources(HENV EnvironmentHandle, - SQLUSMALLINT Direction, SQLCHAR * ServerName, - SQLSMALLINT BufferLength1, SQLSMALLINT * NameLength1, - SQLCHAR * Description, SQLSMALLINT BufferLength2, - SQLSMALLINT * NameLength2); + SQLUSMALLINT Direction, SQLCHAR *ServerName, + SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, + SQLCHAR *Description, SQLSMALLINT BufferLength2, + SQLSMALLINT *NameLength2); RETCODE SQL_API PGAPI_DescribeCol(HSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, SQLCHAR * ColumnName, - SQLSMALLINT BufferLength, SQLSMALLINT * NameLength, - SQLSMALLINT * DataType, SQLUINTEGER * ColumnSize, - SQLSMALLINT * DecimalDigits, SQLSMALLINT * Nullable); + SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName, + SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, + SQLSMALLINT *DataType, SQLUINTEGER *ColumnSize, + SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable); RETCODE SQL_API PGAPI_Disconnect(HDBC ConnectionHandle); RETCODE SQL_API PGAPI_Error(HENV EnvironmentHandle, HDBC ConnectionHandle, HSTMT StatementHandle, - SQLCHAR * Sqlstate, SQLINTEGER * NativeError, - SQLCHAR * MessageText, SQLSMALLINT BufferLength, - SQLSMALLINT * TextLength); + SQLCHAR *Sqlstate, SQLINTEGER *NativeError, + SQLCHAR *MessageText, SQLSMALLINT BufferLength, + SQLSMALLINT *TextLength); RETCODE SQL_API PGAPI_ExecDirect(HSTMT StatementHandle, - SQLCHAR * StatementText, SQLINTEGER TextLength); + SQLCHAR *StatementText, SQLINTEGER TextLength); RETCODE SQL_API PGAPI_Execute(HSTMT StatementHandle); RETCODE SQL_API PGAPI_Fetch(HSTMT StatementHandle); RETCODE SQL_API PGAPI_FreeConnect(HDBC ConnectionHandle); @@ -65,63 +65,63 @@ RETCODE SQL_API PGAPI_FreeStmt(HSTMT StatementHandle, RETCODE SQL_API PGAPI_GetConnectOption(HDBC ConnectionHandle, SQLUSMALLINT Option, PTR Value); RETCODE SQL_API PGAPI_GetCursorName(HSTMT StatementHandle, - SQLCHAR * CursorName, SQLSMALLINT BufferLength, - SQLSMALLINT * NameLength); + SQLCHAR *CursorName, SQLSMALLINT BufferLength, + SQLSMALLINT *NameLength); RETCODE SQL_API PGAPI_GetData(HSTMT StatementHandle, SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, PTR TargetValue, SQLINTEGER BufferLength, - SQLINTEGER * StrLen_or_Ind); + SQLINTEGER *StrLen_or_Ind); RETCODE SQL_API PGAPI_GetFunctions(HDBC ConnectionHandle, - SQLUSMALLINT FunctionId, SQLUSMALLINT * Supported); + SQLUSMALLINT FunctionId, SQLUSMALLINT *Supported); RETCODE SQL_API PGAPI_GetFunctions30(HDBC ConnectionHandle, - SQLUSMALLINT FunctionId, SQLUSMALLINT * Supported); + SQLUSMALLINT FunctionId, SQLUSMALLINT *Supported); RETCODE SQL_API PGAPI_GetInfo(HDBC ConnectionHandle, SQLUSMALLINT InfoType, PTR InfoValue, - SQLSMALLINT BufferLength, SQLSMALLINT * StringLength); + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength); RETCODE SQL_API PGAPI_GetInfo30(HDBC ConnectionHandle, SQLUSMALLINT InfoType, PTR InfoValue, - SQLSMALLINT BufferLength, SQLSMALLINT * StringLength); + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength); RETCODE SQL_API PGAPI_GetStmtOption(HSTMT StatementHandle, SQLUSMALLINT Option, PTR Value); RETCODE SQL_API PGAPI_GetTypeInfo(HSTMT StatementHandle, SQLSMALLINT DataType); RETCODE SQL_API PGAPI_NumResultCols(HSTMT StatementHandle, - SQLSMALLINT * ColumnCount); + SQLSMALLINT *ColumnCount); RETCODE SQL_API PGAPI_ParamData(HSTMT StatementHandle, - PTR * Value); + PTR *Value); RETCODE SQL_API PGAPI_Prepare(HSTMT StatementHandle, - SQLCHAR * StatementText, SQLINTEGER TextLength); + SQLCHAR *StatementText, SQLINTEGER TextLength); RETCODE SQL_API PGAPI_PutData(HSTMT StatementHandle, PTR Data, SQLINTEGER StrLen_or_Ind); RETCODE SQL_API PGAPI_RowCount(HSTMT StatementHandle, - SQLINTEGER * RowCount); + SQLINTEGER *RowCount); RETCODE SQL_API PGAPI_SetConnectOption(HDBC ConnectionHandle, SQLUSMALLINT Option, SQLUINTEGER Value); RETCODE SQL_API PGAPI_SetCursorName(HSTMT StatementHandle, - SQLCHAR * CursorName, SQLSMALLINT NameLength); + SQLCHAR *CursorName, SQLSMALLINT NameLength); RETCODE SQL_API PGAPI_SetParam(HSTMT StatementHandle, SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, SQLSMALLINT ParameterType, SQLUINTEGER LengthPrecision, SQLSMALLINT ParameterScale, PTR ParameterValue, - SQLINTEGER * StrLen_or_Ind); + SQLINTEGER *StrLen_or_Ind); RETCODE SQL_API PGAPI_SetStmtOption(HSTMT StatementHandle, SQLUSMALLINT Option, SQLUINTEGER Value); RETCODE SQL_API PGAPI_SpecialColumns(HSTMT StatementHandle, - SQLUSMALLINT IdentifierType, SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, SQLCHAR * TableName, + SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName, + SQLSMALLINT NameLength1, SQLCHAR *SchemaName, + SQLSMALLINT NameLength2, SQLCHAR *TableName, SQLSMALLINT NameLength3, SQLUSMALLINT Scope, SQLUSMALLINT Nullable); RETCODE SQL_API PGAPI_Statistics(HSTMT StatementHandle, - SQLCHAR * CatalogName, SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, SQLSMALLINT NameLength2, - SQLCHAR * TableName, SQLSMALLINT NameLength3, + SQLCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLCHAR *SchemaName, SQLSMALLINT NameLength2, + SQLCHAR *TableName, SQLSMALLINT NameLength3, SQLUSMALLINT Unique, SQLUSMALLINT Reserved); RETCODE SQL_API PGAPI_Tables(HSTMT StatementHandle, - SQLCHAR * CatalogName, SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, SQLSMALLINT NameLength2, - SQLCHAR * TableName, SQLSMALLINT NameLength3, - SQLCHAR * TableType, SQLSMALLINT NameLength4); + SQLCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLCHAR *SchemaName, SQLSMALLINT NameLength2, + SQLCHAR *TableName, SQLSMALLINT NameLength3, + SQLCHAR *TableType, SQLSMALLINT NameLength4); RETCODE SQL_API PGAPI_Transact(HENV EnvironmentHandle, HDBC ConnectionHandle, SQLUSMALLINT CompletionType); RETCODE SQL_API PGAPI_ColAttributes( @@ -130,86 +130,86 @@ RETCODE SQL_API PGAPI_ColAttributes( SQLUSMALLINT fDescType, PTR rgbDesc, SQLSMALLINT cbDescMax, - SQLSMALLINT * pcbDesc, - SQLINTEGER * pfDesc); + SQLSMALLINT *pcbDesc, + SQLINTEGER *pfDesc); RETCODE SQL_API PGAPI_ColumnPrivileges( HSTMT hstmt, - SQLCHAR * szCatalogName, + SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, - SQLCHAR * szSchemaName, + SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, - SQLCHAR * szTableName, + SQLCHAR *szTableName, SQLSMALLINT cbTableName, - SQLCHAR * szColumnName, + SQLCHAR *szColumnName, SQLSMALLINT cbColumnName); RETCODE SQL_API PGAPI_DescribeParam( HSTMT hstmt, SQLUSMALLINT ipar, - SQLSMALLINT * pfSqlType, - SQLUINTEGER * pcbParamDef, - SQLSMALLINT * pibScale, - SQLSMALLINT * pfNullable); + SQLSMALLINT *pfSqlType, + SQLUINTEGER *pcbParamDef, + SQLSMALLINT *pibScale, + SQLSMALLINT *pfNullable); RETCODE SQL_API PGAPI_ExtendedFetch( HSTMT hstmt, SQLUSMALLINT fFetchType, SQLINTEGER irow, - SQLUINTEGER * pcrow, - SQLUSMALLINT * rgfRowStatus); + SQLUINTEGER *pcrow, + SQLUSMALLINT *rgfRowStatus); RETCODE SQL_API PGAPI_ForeignKeys( HSTMT hstmt, - SQLCHAR * szPkCatalogName, + SQLCHAR *szPkCatalogName, SQLSMALLINT cbPkCatalogName, - SQLCHAR * szPkSchemaName, + SQLCHAR *szPkSchemaName, SQLSMALLINT cbPkSchemaName, - SQLCHAR * szPkTableName, + SQLCHAR *szPkTableName, SQLSMALLINT cbPkTableName, - SQLCHAR * szFkCatalogName, + SQLCHAR *szFkCatalogName, SQLSMALLINT cbFkCatalogName, - SQLCHAR * szFkSchemaName, + SQLCHAR *szFkSchemaName, SQLSMALLINT cbFkSchemaName, - SQLCHAR * szFkTableName, + SQLCHAR *szFkTableName, SQLSMALLINT cbFkTableName); RETCODE SQL_API PGAPI_MoreResults( HSTMT hstmt); RETCODE SQL_API PGAPI_NativeSql( HDBC hdbc, - SQLCHAR * szSqlStrIn, + SQLCHAR *szSqlStrIn, SQLINTEGER cbSqlStrIn, - SQLCHAR * szSqlStr, + SQLCHAR *szSqlStr, SQLINTEGER cbSqlStrMax, - SQLINTEGER * pcbSqlStr); + SQLINTEGER *pcbSqlStr); RETCODE SQL_API PGAPI_NumParams( HSTMT hstmt, - SQLSMALLINT * pcpar); + SQLSMALLINT *pcpar); RETCODE SQL_API PGAPI_ParamOptions( HSTMT hstmt, SQLUINTEGER crow, - SQLUINTEGER * pirow); + SQLUINTEGER *pirow); RETCODE SQL_API PGAPI_PrimaryKeys( HSTMT hstmt, - SQLCHAR * szCatalogName, + SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, - SQLCHAR * szSchemaName, + SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, - SQLCHAR * szTableName, + SQLCHAR *szTableName, SQLSMALLINT cbTableName); RETCODE SQL_API PGAPI_ProcedureColumns( HSTMT hstmt, - SQLCHAR * szCatalogName, + SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, - SQLCHAR * szSchemaName, + SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, - SQLCHAR * szProcName, + SQLCHAR *szProcName, SQLSMALLINT cbProcName, - SQLCHAR * szColumnName, + SQLCHAR *szColumnName, SQLSMALLINT cbColumnName); RETCODE SQL_API PGAPI_Procedures( HSTMT hstmt, - SQLCHAR * szCatalogName, + SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, - SQLCHAR * szSchemaName, + SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, - SQLCHAR * szProcName, + SQLCHAR *szProcName, SQLSMALLINT cbProcName); RETCODE SQL_API PGAPI_SetPos( HSTMT hstmt, @@ -218,11 +218,11 @@ RETCODE SQL_API PGAPI_SetPos( SQLUSMALLINT fLock); RETCODE SQL_API PGAPI_TablePrivileges( HSTMT hstmt, - SQLCHAR * szCatalogName, + SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, - SQLCHAR * szSchemaName, + SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, - SQLCHAR * szTableName, + SQLCHAR *szTableName, SQLSMALLINT cbTableName); RETCODE SQL_API PGAPI_BindParameter( HSTMT hstmt, @@ -234,10 +234,11 @@ RETCODE SQL_API PGAPI_BindParameter( SQLSMALLINT ibScale, PTR rgbValue, SQLINTEGER cbValueMax, - SQLINTEGER * pcbValue); + SQLINTEGER *pcbValue); RETCODE SQL_API PGAPI_SetScrollOptions( HSTMT hstmt, UWORD fConcurrency, SDWORD crowKeyset, UWORD crowRowset); + #endif /* define_PG_API_FUNC_H__ */ diff --git a/src/interfaces/odbc/pgtypes.c b/src/interfaces/odbc/pgtypes.c index 6f1282a36cf..1f177a10c4b 100644 --- a/src/interfaces/odbc/pgtypes.c +++ b/src/interfaces/odbc/pgtypes.c @@ -25,7 +25,7 @@ -Int4 getCharPrecision(StatementClass * stmt, Int4 type, int col, int handle_unknown_size_as); +Int4 getCharPrecision(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_as); /* * these are the types we support. all of the pgtype_ functions should @@ -94,7 +94,7 @@ Int2 sqlTypes[] = { Int4 -sqltype_to_pgtype(StatementClass * stmt, SWORD fSqlType) +sqltype_to_pgtype(StatementClass *stmt, SWORD fSqlType) { Int4 pgType; ConnInfo *ci = &(SC_get_conn(stmt)->connInfo); @@ -190,7 +190,7 @@ sqltype_to_pgtype(StatementClass * stmt, SWORD fSqlType) * types that are unknown. All other pg routines in here return a suitable default. */ Int2 -pgtype_to_sqltype(StatementClass * stmt, Int4 type) +pgtype_to_sqltype(StatementClass *stmt, Int4 type) { ConnInfo *ci = &(SC_get_conn(stmt)->connInfo); @@ -266,7 +266,7 @@ pgtype_to_sqltype(StatementClass * stmt, Int4 type) Int2 -pgtype_to_ctype(StatementClass * stmt, Int4 type) +pgtype_to_ctype(StatementClass *stmt, Int4 type) { ConnInfo *ci = &(SC_get_conn(stmt)->connInfo); @@ -315,7 +315,7 @@ pgtype_to_ctype(StatementClass * stmt, Int4 type) char * -pgtype_to_name(StatementClass * stmt, Int4 type) +pgtype_to_name(StatementClass *stmt, Int4 type) { switch (type) { @@ -384,7 +384,7 @@ pgtype_to_name(StatementClass * stmt, Int4 type) static Int2 -getNumericScale(StatementClass * stmt, Int4 type, int col) +getNumericScale(StatementClass *stmt, Int4 type, int col) { Int4 atttypmod; QResultClass *result; @@ -421,7 +421,7 @@ getNumericScale(StatementClass * stmt, Int4 type, int col) static Int4 -getNumericPrecision(StatementClass * stmt, Int4 type, int col) +getNumericPrecision(StatementClass *stmt, Int4 type, int col) { Int4 atttypmod; QResultClass *result; @@ -458,7 +458,7 @@ getNumericPrecision(StatementClass * stmt, Int4 type, int col) Int4 -getCharPrecision(StatementClass * stmt, Int4 type, int col, int handle_unknown_size_as) +getCharPrecision(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_as) { int p = -1, maxsize; @@ -545,7 +545,7 @@ getCharPrecision(StatementClass * stmt, Int4 type, int col, int handle_unknown_s * This is used for functions SQLDescribeCol and SQLColAttributes. */ Int4 -pgtype_precision(StatementClass * stmt, Int4 type, int col, int handle_unknown_size_as) +pgtype_precision(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_as) { switch (type) { @@ -612,7 +612,7 @@ pgtype_precision(StatementClass * stmt, Int4 type, int col, int handle_unknown_s Int4 -pgtype_display_size(StatementClass * stmt, Int4 type, int col, int handle_unknown_size_as) +pgtype_display_size(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_as) { switch (type) { @@ -653,7 +653,7 @@ pgtype_display_size(StatementClass * stmt, Int4 type, int col, int handle_unknow * override this length with the atttypmod length from pg_attribute */ Int4 -pgtype_length(StatementClass * stmt, Int4 type, int col, int handle_unknown_size_as) +pgtype_length(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_as) { switch (type) { @@ -706,7 +706,7 @@ pgtype_length(StatementClass * stmt, Int4 type, int col, int handle_unknown_size Int2 -pgtype_scale(StatementClass * stmt, Int4 type, int col) +pgtype_scale(StatementClass *stmt, Int4 type, int col) { switch (type) { @@ -740,7 +740,7 @@ pgtype_scale(StatementClass * stmt, Int4 type, int col) Int2 -pgtype_radix(StatementClass * stmt, Int4 type) +pgtype_radix(StatementClass *stmt, Int4 type) { switch (type) { @@ -760,14 +760,14 @@ pgtype_radix(StatementClass * stmt, Int4 type) Int2 -pgtype_nullable(StatementClass * stmt, Int4 type) +pgtype_nullable(StatementClass *stmt, Int4 type) { return SQL_NULLABLE; /* everything should be nullable */ } Int2 -pgtype_auto_increment(StatementClass * stmt, Int4 type) +pgtype_auto_increment(StatementClass *stmt, Int4 type) { switch (type) { @@ -796,7 +796,7 @@ pgtype_auto_increment(StatementClass * stmt, Int4 type) Int2 -pgtype_case_sensitive(StatementClass * stmt, Int4 type) +pgtype_case_sensitive(StatementClass *stmt, Int4 type) { switch (type) { @@ -819,7 +819,7 @@ pgtype_case_sensitive(StatementClass * stmt, Int4 type) Int2 -pgtype_money(StatementClass * stmt, Int4 type) +pgtype_money(StatementClass *stmt, Int4 type) { switch (type) { @@ -832,7 +832,7 @@ pgtype_money(StatementClass * stmt, Int4 type) Int2 -pgtype_searchable(StatementClass * stmt, Int4 type) +pgtype_searchable(StatementClass *stmt, Int4 type) { switch (type) { @@ -854,7 +854,7 @@ pgtype_searchable(StatementClass * stmt, Int4 type) Int2 -pgtype_unsigned(StatementClass * stmt, Int4 type) +pgtype_unsigned(StatementClass *stmt, Int4 type) { switch (type) { @@ -878,7 +878,7 @@ pgtype_unsigned(StatementClass * stmt, Int4 type) char * -pgtype_literal_prefix(StatementClass * stmt, Int4 type) +pgtype_literal_prefix(StatementClass *stmt, Int4 type) { switch (type) { @@ -900,7 +900,7 @@ pgtype_literal_prefix(StatementClass * stmt, Int4 type) char * -pgtype_literal_suffix(StatementClass * stmt, Int4 type) +pgtype_literal_suffix(StatementClass *stmt, Int4 type) { switch (type) { @@ -922,7 +922,7 @@ pgtype_literal_suffix(StatementClass * stmt, Int4 type) char * -pgtype_create_params(StatementClass * stmt, Int4 type) +pgtype_create_params(StatementClass *stmt, Int4 type) { switch (type) { diff --git a/src/interfaces/odbc/pgtypes.h b/src/interfaces/odbc/pgtypes.h index 6761ec319e4..7bd33cf7512 100644 --- a/src/interfaces/odbc/pgtypes.h +++ b/src/interfaces/odbc/pgtypes.h @@ -68,29 +68,30 @@ extern Int2 sqlTypes[]; /* Defines for pgtype_precision */ #define PG_STATIC (-1) -Int4 sqltype_to_pgtype(StatementClass * stmt, Int2 fSqlType); +Int4 sqltype_to_pgtype(StatementClass *stmt, Int2 fSqlType); -Int2 pgtype_to_sqltype(StatementClass * stmt, Int4 type); -Int2 pgtype_to_ctype(StatementClass * stmt, Int4 type); -char *pgtype_to_name(StatementClass * stmt, Int4 type); +Int2 pgtype_to_sqltype(StatementClass *stmt, Int4 type); +Int2 pgtype_to_ctype(StatementClass *stmt, Int4 type); +char *pgtype_to_name(StatementClass *stmt, Int4 type); /* These functions can use static numbers or result sets(col parameter) */ -Int4 pgtype_precision(StatementClass * stmt, Int4 type, int col, int handle_unknown_size_as); -Int4 pgtype_display_size(StatementClass * stmt, Int4 type, int col, int handle_unknown_size_as); -Int4 pgtype_length(StatementClass * stmt, Int4 type, int col, int handle_unknown_size_as); +Int4 pgtype_precision(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_as); +Int4 pgtype_display_size(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_as); +Int4 pgtype_length(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_as); -Int2 pgtype_scale(StatementClass * stmt, Int4 type, int col); -Int2 pgtype_radix(StatementClass * stmt, Int4 type); -Int2 pgtype_nullable(StatementClass * stmt, Int4 type); -Int2 pgtype_auto_increment(StatementClass * stmt, Int4 type); -Int2 pgtype_case_sensitive(StatementClass * stmt, Int4 type); -Int2 pgtype_money(StatementClass * stmt, Int4 type); -Int2 pgtype_searchable(StatementClass * stmt, Int4 type); -Int2 pgtype_unsigned(StatementClass * stmt, Int4 type); -char *pgtype_literal_prefix(StatementClass * stmt, Int4 type); -char *pgtype_literal_suffix(StatementClass * stmt, Int4 type); -char *pgtype_create_params(StatementClass * stmt, Int4 type); +Int2 pgtype_scale(StatementClass *stmt, Int4 type, int col); +Int2 pgtype_radix(StatementClass *stmt, Int4 type); +Int2 pgtype_nullable(StatementClass *stmt, Int4 type); +Int2 pgtype_auto_increment(StatementClass *stmt, Int4 type); +Int2 pgtype_case_sensitive(StatementClass *stmt, Int4 type); +Int2 pgtype_money(StatementClass *stmt, Int4 type); +Int2 pgtype_searchable(StatementClass *stmt, Int4 type); +Int2 pgtype_unsigned(StatementClass *stmt, Int4 type); +char *pgtype_literal_prefix(StatementClass *stmt, Int4 type); +char *pgtype_literal_suffix(StatementClass *stmt, Int4 type); +char *pgtype_create_params(StatementClass *stmt, Int4 type); Int2 sqltype_to_default_ctype(Int2 sqltype); Int4 ctype_length(Int2 ctype); + #endif diff --git a/src/interfaces/odbc/psqlodbc.h b/src/interfaces/odbc/psqlodbc.h index 514922036bb..540e295d564 100644 --- a/src/interfaces/odbc/psqlodbc.h +++ b/src/interfaces/odbc/psqlodbc.h @@ -5,7 +5,7 @@ * * Comments: See "notice.txt" for copyright and license information. * - * $Id: psqlodbc.h,v 1.52 2001/10/25 05:50:15 momjian Exp $ + * $Id: psqlodbc.h,v 1.53 2001/10/28 06:26:14 momjian Exp $ * */ @@ -185,7 +185,7 @@ typedef struct GlobalValues_ char extra_systable_prefixes[MEDIUM_REGISTRY_LEN]; char conn_settings[LARGE_REGISTRY_LEN]; char protocol[SMALL_REGISTRY_LEN]; -} GLOBAL_VALUES; +} GLOBAL_VALUES; typedef struct StatementOptions_ { @@ -202,7 +202,7 @@ typedef struct StatementOptions_ UInt4 *rowsFetched; UInt2 *rowStatusArray; void *bookmark_ptr; -} StatementOptions; +} StatementOptions; /* Used to pass extra query info to send_query */ typedef struct QueryInfo_ @@ -210,7 +210,7 @@ typedef struct QueryInfo_ int row_size; QResultClass *result_in; char *cursor; -} QueryInfo; +} QueryInfo; void logs_on_off(int cnopen, int, int); @@ -249,4 +249,5 @@ void debug_memory_check(void); #define strdup debug_strdup #define free debug_free #endif /* _MEMORY_DEBUG_ */ + #endif diff --git a/src/interfaces/odbc/qresult.c b/src/interfaces/odbc/qresult.c index b9f088227f7..ca7a6dee9ea 100644 --- a/src/interfaces/odbc/qresult.c +++ b/src/interfaces/odbc/qresult.c @@ -39,7 +39,7 @@ * All info functions call this function to create the manual result set. */ void -QR_set_num_fields(QResultClass * self, int new_num_fields) +QR_set_num_fields(QResultClass *self, int new_num_fields) { mylog("in QR_set_num_fields\n"); @@ -54,28 +54,28 @@ QR_set_num_fields(QResultClass * self, int new_num_fields) void -QR_set_position(QResultClass * self, int pos) +QR_set_position(QResultClass *self, int pos) { self->tupleField = self->backend_tuples + ((self->base + pos) * self->num_fields); } void -QR_set_cache_size(QResultClass * self, int cache_size) +QR_set_cache_size(QResultClass *self, int cache_size) { self->cache_size = cache_size; } void -QR_set_rowset_size(QResultClass * self, int rowset_size) +QR_set_rowset_size(QResultClass *self, int rowset_size) { self->rowset_size = rowset_size; } void -QR_inc_base(QResultClass * self, int base_inc) +QR_inc_base(QResultClass *self, int base_inc) { self->base += base_inc; } @@ -128,7 +128,7 @@ QR_Constructor() void -QR_Destructor(QResultClass * self) +QR_Destructor(QResultClass *self) { mylog("QResult: in DESTRUCTOR\n"); @@ -168,7 +168,7 @@ QR_Destructor(QResultClass * self) void -QR_set_command(QResultClass * self, char *msg) +QR_set_command(QResultClass *self, char *msg) { if (self->command) free(self->command); @@ -178,7 +178,7 @@ QR_set_command(QResultClass * self, char *msg) void -QR_set_notice(QResultClass * self, char *msg) +QR_set_notice(QResultClass *self, char *msg) { if (self->notice) free(self->notice); @@ -188,7 +188,7 @@ QR_set_notice(QResultClass * self, char *msg) void -QR_free_memory(QResultClass * self) +QR_free_memory(QResultClass *self) { register int lf, row; @@ -211,7 +211,7 @@ QR_free_memory(QResultClass * self) free(tuple[lf].value); } } - tuple += num_fields; /* next row */ + tuple += num_fields; /* next row */ } free(self->backend_tuples); @@ -226,7 +226,7 @@ QR_free_memory(QResultClass * self) /* This function is called by send_query() */ char -QR_fetch_tuples(QResultClass * self, ConnectionClass * conn, char *cursor) +QR_fetch_tuples(QResultClass *self, ConnectionClass *conn, char *cursor) { int tuple_size; @@ -327,7 +327,7 @@ QR_fetch_tuples(QResultClass * self, ConnectionClass * conn, char *cursor) * We only close cursor/end the transaction if a cursor was used. */ int -QR_close(QResultClass * self) +QR_close(QResultClass *self) { QResultClass *res; @@ -379,7 +379,7 @@ QR_close(QResultClass * self) /* This function is called by fetch_tuples() AND SQLFetch() */ int -QR_next_tuple(QResultClass * self) +QR_next_tuple(QResultClass *self) { int id; QResultClass *res; @@ -620,7 +620,7 @@ QR_next_tuple(QResultClass * self) char -QR_read_tuple(QResultClass * self, char binary) +QR_read_tuple(QResultClass *self, char binary) { Int2 field_lf; TupleField *this_tuplefield; diff --git a/src/interfaces/odbc/qresult.h b/src/interfaces/odbc/qresult.h index 23e125247c5..251bc449c12 100644 --- a/src/interfaces/odbc/qresult.h +++ b/src/interfaces/odbc/qresult.h @@ -19,23 +19,22 @@ enum QueryResultCode_ { - PGRES_EMPTY_QUERY = 0, - PGRES_COMMAND_OK, /* a query command that doesn't - * return */ + PGRES_EMPTY_QUERY = 0, + PGRES_COMMAND_OK, /* a query command that doesn't return */ /* anything was executed properly by the backend */ - PGRES_TUPLES_OK,/* a query command that returns tuples */ + PGRES_TUPLES_OK, /* a query command that returns tuples */ /* was executed properly by the backend, PGresult */ /* contains the resulttuples */ - PGRES_COPY_OUT, - PGRES_COPY_IN, - PGRES_BAD_RESPONSE, /* an unexpected response was - * recv'd from the backend */ - PGRES_NONFATAL_ERROR, - PGRES_FATAL_ERROR, - PGRES_FIELDS_OK,/* field information from a query was + PGRES_COPY_OUT, + PGRES_COPY_IN, + PGRES_BAD_RESPONSE, /* an unexpected response was recv'd from + * the backend */ + PGRES_NONFATAL_ERROR, + PGRES_FATAL_ERROR, + PGRES_FIELDS_OK, /* field information from a query was * successful */ - PGRES_END_TUPLES, - PGRES_INTERNAL_ERROR + PGRES_END_TUPLES, + PGRES_INTERNAL_ERROR }; typedef enum QueryResultCode_ QueryResultCode; @@ -48,7 +47,7 @@ struct QResultClass_ * (backend) */ /* Stuff for declare/fetch tuples */ - int count_allocated; /* m(re)alloced count */ + int count_allocated; /* m(re)alloced count */ int fetch_count; /* logical rows read so far */ int fcount; /* actual rows read in the fetch */ int currTuple; @@ -113,19 +112,20 @@ struct QResultClass_ /* Core Functions */ QResultClass *QR_Constructor(void); -void QR_Destructor(QResultClass * self); -char QR_read_tuple(QResultClass * self, char binary); -int QR_next_tuple(QResultClass * self); -int QR_close(QResultClass * self); -char QR_fetch_tuples(QResultClass * self, ConnectionClass * conn, char *cursor); -void QR_free_memory(QResultClass * self); -void QR_set_command(QResultClass * self, char *msg); -void QR_set_notice(QResultClass * self, char *msg); - -void QR_set_num_fields(QResultClass * self, int new_num_fields); /* manual result only */ - -void QR_inc_base(QResultClass * self, int base_inc); -void QR_set_cache_size(QResultClass * self, int cache_size); -void QR_set_rowset_size(QResultClass * self, int rowset_size); -void QR_set_position(QResultClass * self, int pos); +void QR_Destructor(QResultClass *self); +char QR_read_tuple(QResultClass *self, char binary); +int QR_next_tuple(QResultClass *self); +int QR_close(QResultClass *self); +char QR_fetch_tuples(QResultClass *self, ConnectionClass *conn, char *cursor); +void QR_free_memory(QResultClass *self); +void QR_set_command(QResultClass *self, char *msg); +void QR_set_notice(QResultClass *self, char *msg); + +void QR_set_num_fields(QResultClass *self, int new_num_fields); /* manual result only */ + +void QR_inc_base(QResultClass *self, int base_inc); +void QR_set_cache_size(QResultClass *self, int cache_size); +void QR_set_rowset_size(QResultClass *self, int rowset_size); +void QR_set_position(QResultClass *self, int pos); + #endif diff --git a/src/interfaces/odbc/resource.h b/src/interfaces/odbc/resource.h index 688ff7a6b90..b60d0dfd4b2 100644 --- a/src/interfaces/odbc/resource.h +++ b/src/interfaces/odbc/resource.h @@ -62,4 +62,5 @@ #define _APS_NEXT_CONTROL_VALUE 1062
#define _APS_NEXT_SYMED_VALUE 101
#endif /*
*/ + #endif /*
*/ diff --git a/src/interfaces/odbc/results.c b/src/interfaces/odbc/results.c index 3565e3f8d55..7d9ce4c92fe 100644 --- a/src/interfaces/odbc/results.c +++ b/src/interfaces/odbc/results.c @@ -1220,7 +1220,7 @@ PGAPI_MoreResults( * Stuff for updatable cursors. */ static QResultClass * -positioned_load(StatementClass * stmt, BOOL latest, int res_cols, UInt4 oid, const char *tidval) +positioned_load(StatementClass *stmt, BOOL latest, int res_cols, UInt4 oid, const char *tidval) { int i; QResultClass *qres; @@ -1250,7 +1250,7 @@ positioned_load(StatementClass * stmt, BOOL latest, int res_cols, UInt4 oid, con } RETCODE SQL_API -SC_pos_reload(StatementClass * stmt, UWORD irow, UWORD * count) +SC_pos_reload(StatementClass *stmt, UWORD irow, UWORD *count) { int i, res_cols; @@ -1328,7 +1328,7 @@ SC_pos_reload(StatementClass * stmt, UWORD irow, UWORD * count) } RETCODE SQL_API -SC_pos_newload(StatementClass * stmt, UInt4 oid, const char *tidval) +SC_pos_newload(StatementClass *stmt, UInt4 oid, const char *tidval) { int i; QResultClass *res, @@ -1399,7 +1399,7 @@ SC_pos_newload(StatementClass * stmt, UInt4 oid, const char *tidval) } RETCODE SQL_API -SC_pos_update(StatementClass * stmt, +SC_pos_update(StatementClass *stmt, UWORD irow) { int i, @@ -1472,7 +1472,7 @@ SC_pos_update(StatementClass * stmt, mylog("%d used=%d\n", i, *bindings[i].used); if (*bindings[i].used != SQL_IGNORE) { - PGAPI_BindParameter(hstmt, (SQLUSMALLINT)++ j, + PGAPI_BindParameter(hstmt, (SQLUSMALLINT) ++j, SQL_PARAM_INPUT, bindings[i].returntype, pgtype_to_sqltype(stmt, QR_get_field_type(res, i)), QR_get_fieldsize(res, i), @@ -1533,7 +1533,7 @@ SC_pos_update(StatementClass * stmt, return ret; } RETCODE SQL_API -SC_pos_delete(StatementClass * stmt, +SC_pos_delete(StatementClass *stmt, UWORD irow) { int res_cols; @@ -1606,7 +1606,7 @@ SC_pos_delete(StatementClass * stmt, return ret; } RETCODE SQL_API -SC_pos_add(StatementClass * stmt, +SC_pos_add(StatementClass *stmt, UWORD irow) { int num_cols, @@ -1643,7 +1643,7 @@ SC_pos_add(StatementClass * stmt, sprintf(addstr, "%s, \"%s\"", addstr, stmt->fi[i]->name); else sprintf(addstr, "%s\"%s\"", addstr, stmt->fi[i]->name); - PGAPI_BindParameter(hstmt, (SQLUSMALLINT)++ add_cols, + PGAPI_BindParameter(hstmt, (SQLUSMALLINT) ++add_cols, SQL_PARAM_INPUT, bindings[i].returntype, pgtype_to_sqltype(stmt, QR_get_field_type(res, i)), QR_get_fieldsize(res, i), diff --git a/src/interfaces/odbc/setup.c b/src/interfaces/odbc/setup.c index c4562ab90dd..9db803a8340 100644 --- a/src/interfaces/odbc/setup.c +++ b/src/interfaces/odbc/setup.c @@ -25,7 +25,7 @@ #define INTFUNC __stdcall -extern HINSTANCE NEAR s_hModule; /* Saved module handle. */ +extern HINSTANCE NEAR s_hModule; /* Saved module handle. */ /* Constants */ #define MIN(x,y) ((x) < (y) ? (x) : (y)) @@ -303,14 +303,14 @@ ConfigDlgProc(HWND hdlg, case IDC_DRIVER: lpsetupdlg = (LPSETUPDLG) GetWindowLong(hdlg, DWL_USER); DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_OPTIONS_DRV), - hdlg, driver_optionsProc, (LPARAM) & lpsetupdlg->ci); + hdlg, driver_optionsProc, (LPARAM) &lpsetupdlg->ci); return TRUE; case IDC_DATASOURCE: lpsetupdlg = (LPSETUPDLG) GetWindowLong(hdlg, DWL_USER); DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_OPTIONS_DS), - hdlg, ds_optionsProc, (LPARAM) & lpsetupdlg->ci); + hdlg, ds_optionsProc, (LPARAM) &lpsetupdlg->ci); return TRUE; } diff --git a/src/interfaces/odbc/socket.c b/src/interfaces/odbc/socket.c index 8250fc87380..031a6779cba 100644 --- a/src/interfaces/odbc/socket.c +++ b/src/interfaces/odbc/socket.c @@ -35,7 +35,7 @@ extern GLOBAL_VALUES globals; void -SOCK_clear_error(SocketClass * self) +SOCK_clear_error(SocketClass *self) { self->errornumber = 0; self->errormsg = NULL; @@ -43,7 +43,7 @@ SOCK_clear_error(SocketClass * self) SocketClass * -SOCK_Constructor(const ConnectionClass * conn) +SOCK_Constructor(const ConnectionClass *conn) { SocketClass *rv; @@ -83,7 +83,7 @@ SOCK_Constructor(const ConnectionClass * conn) void -SOCK_Destructor(SocketClass * self) +SOCK_Destructor(SocketClass *self) { mylog("SOCK_Destructor\n"); if (self->socket != -1) @@ -104,7 +104,7 @@ SOCK_Destructor(SocketClass * self) char -SOCK_connect_to(SocketClass * self, unsigned short port, char *hostname) +SOCK_connect_to(SocketClass *self, unsigned short port, char *hostname) { struct hostent *host; struct sockaddr_in sadr; @@ -162,7 +162,7 @@ SOCK_connect_to(SocketClass * self, unsigned short port, char *hostname) void -SOCK_get_n_char(SocketClass * self, char *buffer, int len) +SOCK_get_n_char(SocketClass *self, char *buffer, int len) { int lf; @@ -179,7 +179,7 @@ SOCK_get_n_char(SocketClass * self, char *buffer, int len) void -SOCK_put_n_char(SocketClass * self, char *buffer, int len) +SOCK_put_n_char(SocketClass *self, char *buffer, int len) { int lf; @@ -201,7 +201,7 @@ SOCK_put_n_char(SocketClass * self, char *buffer, int len) * returns TRUE if truncation occurs. */ BOOL -SOCK_get_string(SocketClass * self, char *buffer, int bufsize) +SOCK_get_string(SocketClass *self, char *buffer, int bufsize) { register int lf = 0; @@ -215,7 +215,7 @@ SOCK_get_string(SocketClass * self, char *buffer, int bufsize) void -SOCK_put_string(SocketClass * self, char *string) +SOCK_put_string(SocketClass *self, char *string) { register int lf; int len; @@ -228,7 +228,7 @@ SOCK_put_string(SocketClass * self, char *string) int -SOCK_get_int(SocketClass * self, short len) +SOCK_get_int(SocketClass *self, short len) { switch (len) { @@ -263,7 +263,7 @@ SOCK_get_int(SocketClass * self, short len) void -SOCK_put_int(SocketClass * self, int value, short len) +SOCK_put_int(SocketClass *self, int value, short len) { unsigned int rv; @@ -288,7 +288,7 @@ SOCK_put_int(SocketClass * self, int value, short len) void -SOCK_flush_output(SocketClass * self) +SOCK_flush_output(SocketClass *self) { int written; @@ -303,7 +303,7 @@ SOCK_flush_output(SocketClass * self) unsigned char -SOCK_get_next_byte(SocketClass * self) +SOCK_get_next_byte(SocketClass *self) { if (self->buffer_read_in >= self->buffer_filled_in) { @@ -335,7 +335,7 @@ SOCK_get_next_byte(SocketClass * self) void -SOCK_put_next_byte(SocketClass * self, unsigned char next_byte) +SOCK_put_next_byte(SocketClass *self, unsigned char next_byte) { int bytes_sent; diff --git a/src/interfaces/odbc/socket.h b/src/interfaces/odbc/socket.h index 828372d5cb5..c49d9fe88d8 100644 --- a/src/interfaces/odbc/socket.h +++ b/src/interfaces/odbc/socket.h @@ -77,17 +77,18 @@ struct SocketClass_ /* Socket prototypes */ -SocketClass *SOCK_Constructor(const ConnectionClass * conn); -void SOCK_Destructor(SocketClass * self); -char SOCK_connect_to(SocketClass * self, unsigned short port, char *hostname); -void SOCK_get_n_char(SocketClass * self, char *buffer, int len); -void SOCK_put_n_char(SocketClass * self, char *buffer, int len); -BOOL SOCK_get_string(SocketClass * self, char *buffer, int bufsize); -void SOCK_put_string(SocketClass * self, char *string); -int SOCK_get_int(SocketClass * self, short len); -void SOCK_put_int(SocketClass * self, int value, short len); -void SOCK_flush_output(SocketClass * self); -unsigned char SOCK_get_next_byte(SocketClass * self); -void SOCK_put_next_byte(SocketClass * self, unsigned char next_byte); -void SOCK_clear_error(SocketClass * self); +SocketClass *SOCK_Constructor(const ConnectionClass *conn); +void SOCK_Destructor(SocketClass *self); +char SOCK_connect_to(SocketClass *self, unsigned short port, char *hostname); +void SOCK_get_n_char(SocketClass *self, char *buffer, int len); +void SOCK_put_n_char(SocketClass *self, char *buffer, int len); +BOOL SOCK_get_string(SocketClass *self, char *buffer, int bufsize); +void SOCK_put_string(SocketClass *self, char *string); +int SOCK_get_int(SocketClass *self, short len); +void SOCK_put_int(SocketClass *self, int value, short len); +void SOCK_flush_output(SocketClass *self); +unsigned char SOCK_get_next_byte(SocketClass *self); +void SOCK_put_next_byte(SocketClass *self, unsigned char next_byte); +void SOCK_clear_error(SocketClass *self); + #endif diff --git a/src/interfaces/odbc/statement.c b/src/interfaces/odbc/statement.c index f313f926f3c..b4e33d05923 100644 --- a/src/interfaces/odbc/statement.c +++ b/src/interfaces/odbc/statement.c @@ -35,7 +35,7 @@ static struct { int type; char *s; -} Statement_Type[] = +} Statement_Type[] = { { @@ -202,7 +202,7 @@ PGAPI_FreeStmt(HSTMT hstmt, * StatementClass implementation */ void -InitializeStatementOptions(StatementOptions * opt) +InitializeStatementOptions(StatementOptions *opt) { opt->maxRows = 0; /* driver returns all rows */ opt->maxLength = 0; /* driver returns all data for char/binary */ @@ -284,7 +284,7 @@ SC_Constructor(void) char -SC_Destructor(StatementClass * self) +SC_Destructor(StatementClass *self) { mylog("SC_Destructor: self=%u, self->result=%u, self->hdbc=%u\n", self, self->result, self->hdbc); SC_clear_error(self); @@ -356,7 +356,7 @@ SC_Destructor(StatementClass * self) * data-at-execution parameters that was allocated in SQLPutData. */ void -SC_free_params(StatementClass * self, char option) +SC_free_params(StatementClass *self, char option) { int i; @@ -421,7 +421,7 @@ statement_type(char *statement) * from SQLFreeStmt(SQL_CLOSE) */ char -SC_recycle_statement(StatementClass * self) +SC_recycle_statement(StatementClass *self) { ConnectionClass *conn; @@ -507,7 +507,7 @@ SC_recycle_statement(StatementClass * self) * Reset only parameters that have anything to do with results */ self->status = STMT_READY; - self->manual_result = FALSE; /* very important */ + self->manual_result = FALSE; /* very important */ self->currTuple = -1; self->rowset_start = -1; @@ -537,7 +537,7 @@ SC_recycle_statement(StatementClass * self) /* Pre-execute a statement (SQLPrepare/SQLDescribeCol) */ void -SC_pre_execute(StatementClass * self) +SC_pre_execute(StatementClass *self) { mylog("SC_pre_execute: status = %d\n", self->status); @@ -576,7 +576,7 @@ SC_pre_execute(StatementClass * self) /* This is only called from SQLFreeStmt(SQL_UNBIND) */ char -SC_unbind_cols(StatementClass * self) +SC_unbind_cols(StatementClass *self) { Int2 lf; @@ -597,7 +597,7 @@ SC_unbind_cols(StatementClass * self) void -SC_clear_error(StatementClass * self) +SC_clear_error(StatementClass *self) { if (self->errormsg_malloced && self->errormsg) free(self->errormsg); @@ -613,7 +613,7 @@ SC_clear_error(StatementClass * self) * of the result, statement, connection, and socket messages. */ char * -SC_create_errormsg(StatementClass * self) +SC_create_errormsg(StatementClass *self) { QResultClass *res = self->result; ConnectionClass *conn = self->hdbc; @@ -652,7 +652,7 @@ SC_create_errormsg(StatementClass * self) char -SC_get_error(StatementClass * self, int *number, char **message) +SC_get_error(StatementClass *self, int *number, char **message) { char rv; @@ -684,14 +684,14 @@ SC_get_error(StatementClass * self, int *number, char **message) * someday, such as mapping a key to a 32 bit value */ unsigned long -SC_get_bookmark(StatementClass * self) +SC_get_bookmark(StatementClass *self) { return (self->currTuple + 1); } RETCODE -SC_fetch(StatementClass * self) +SC_fetch(StatementClass *self) { static char *func = "SC_fetch"; QResultClass *res = self->result; @@ -741,7 +741,7 @@ SC_fetch(StatementClass * self) return SQL_NO_DATA_FOUND; } else if (retval > 0) - (self->currTuple)++; /* all is well */ + (self->currTuple)++; /* all is well */ else { mylog("SC_fetch: error\n"); @@ -876,7 +876,7 @@ SC_fetch(StatementClass * self) RETCODE -SC_execute(StatementClass * self) +SC_execute(StatementClass *self) { static char *func = "SC_execute"; ConnectionClass *conn; @@ -1107,7 +1107,7 @@ SC_execute(StatementClass * self) void -SC_log_error(char *func, char *desc, StatementClass * self) +SC_log_error(char *func, char *desc, StatementClass *self) { #ifdef PRN_NULLCHECK #define nullcheck(a) (a ? a : "(NULL)") diff --git a/src/interfaces/odbc/statement.h b/src/interfaces/odbc/statement.h index 801c334bf3a..9b52f25694a 100644 --- a/src/interfaces/odbc/statement.h +++ b/src/interfaces/odbc/statement.h @@ -23,10 +23,10 @@ typedef enum { - STMT_ALLOCATED, /* The statement handle is allocated, but + STMT_ALLOCATED, /* The statement handle is allocated, but * not used so far */ - STMT_READY, /* the statement is waiting to be executed */ - STMT_PREMATURE, /* ODBC states that it is legal to call + STMT_READY, /* the statement is waiting to be executed */ + STMT_PREMATURE, /* ODBC states that it is legal to call * e.g. SQLDescribeCol before a call to * SQLExecute, but after SQLPrepare. To * get all the necessary information in @@ -34,9 +34,9 @@ typedef enum * query _before_ the actual call to * SQLExecute, so that statement is * considered to be "premature". */ - STMT_FINISHED, /* statement execution has finished */ - STMT_EXECUTING /* statement execution is still going on */ -} STMT_Status; + STMT_FINISHED, /* statement execution has finished */ + STMT_EXECUTING /* statement execution is still going on */ +} STMT_Status; #define STMT_ROW_VERSION_CHANGED (-4) #define STMT_POS_BEFORE_RECORDSET (-3) @@ -79,18 +79,18 @@ typedef enum /* statement types */ enum { - STMT_TYPE_UNKNOWN = -2, - STMT_TYPE_OTHER = -1, - STMT_TYPE_SELECT = 0, - STMT_TYPE_INSERT, - STMT_TYPE_UPDATE, - STMT_TYPE_DELETE, - STMT_TYPE_CREATE, - STMT_TYPE_ALTER, - STMT_TYPE_DROP, - STMT_TYPE_GRANT, - STMT_TYPE_REVOKE, - STMT_TYPE_PROCCALL + STMT_TYPE_UNKNOWN = -2, + STMT_TYPE_OTHER = -1, + STMT_TYPE_SELECT = 0, + STMT_TYPE_INSERT, + STMT_TYPE_UPDATE, + STMT_TYPE_DELETE, + STMT_TYPE_CREATE, + STMT_TYPE_ALTER, + STMT_TYPE_DROP, + STMT_TYPE_GRANT, + STMT_TYPE_REVOKE, + STMT_TYPE_PROCCALL }; #define STMT_UPDATE(stmt) (stmt->statement_type > STMT_TYPE_SELECT) @@ -99,18 +99,18 @@ enum /* Parsing status */ enum { - STMT_PARSE_NONE = 0, - STMT_PARSE_COMPLETE, - STMT_PARSE_INCOMPLETE, - STMT_PARSE_FATAL, + STMT_PARSE_NONE = 0, + STMT_PARSE_COMPLETE, + STMT_PARSE_INCOMPLETE, + STMT_PARSE_FATAL, }; /* Result style */ enum { - STMT_FETCH_NONE = 0, - STMT_FETCH_NORMAL, - STMT_FETCH_EXTENDED, + STMT_FETCH_NONE = 0, + STMT_FETCH_NORMAL, + STMT_FETCH_EXTENDED, }; typedef struct @@ -118,7 +118,7 @@ typedef struct COL_INFO *col_info; /* cached SQLColumns info for this table */ char name[MAX_TABLE_LEN + 1]; char alias[MAX_TABLE_LEN + 1]; -} TABLE_INFO; +} TABLE_INFO; typedef struct { @@ -137,7 +137,7 @@ typedef struct char dot[MAX_TABLE_LEN + 1]; char name[MAX_COLUMN_LEN + 1]; char alias[MAX_COLUMN_LEN + 1]; -} FIELD_INFO; +} FIELD_INFO; /******** Statement Handle ***********/ @@ -234,21 +234,21 @@ struct StatementClass_ /* Statement prototypes */ StatementClass *SC_Constructor(void); -void InitializeStatementOptions(StatementOptions * opt); -char SC_Destructor(StatementClass * self); +void InitializeStatementOptions(StatementOptions *opt); +char SC_Destructor(StatementClass *self); int statement_type(char *statement); -char parse_statement(StatementClass * stmt); -void SC_pre_execute(StatementClass * self); -char SC_unbind_cols(StatementClass * self); -char SC_recycle_statement(StatementClass * self); - -void SC_clear_error(StatementClass * self); -char SC_get_error(StatementClass * self, int *number, char **message); -char *SC_create_errormsg(StatementClass * self); -RETCODE SC_execute(StatementClass * self); -RETCODE SC_fetch(StatementClass * self); -void SC_free_params(StatementClass * self, char option); -void SC_log_error(char *func, char *desc, StatementClass * self); -unsigned long SC_get_bookmark(StatementClass * self); +char parse_statement(StatementClass *stmt); +void SC_pre_execute(StatementClass *self); +char SC_unbind_cols(StatementClass *self); +char SC_recycle_statement(StatementClass *self); + +void SC_clear_error(StatementClass *self); +char SC_get_error(StatementClass *self, int *number, char **message); +char *SC_create_errormsg(StatementClass *self); +RETCODE SC_execute(StatementClass *self); +RETCODE SC_fetch(StatementClass *self); +void SC_free_params(StatementClass *self, char option); +void SC_log_error(char *func, char *desc, StatementClass *self); +unsigned long SC_get_bookmark(StatementClass *self); #endif diff --git a/src/interfaces/odbc/tuple.c b/src/interfaces/odbc/tuple.c index 94d0bc17d32..512f36d2b23 100644 --- a/src/interfaces/odbc/tuple.c +++ b/src/interfaces/odbc/tuple.c @@ -24,7 +24,7 @@ void -set_tuplefield_null(TupleField * tuple_field) +set_tuplefield_null(TupleField *tuple_field) { tuple_field->len = 0; tuple_field->value = NULL; /* strdup(""); */ @@ -32,7 +32,7 @@ set_tuplefield_null(TupleField * tuple_field) void -set_tuplefield_string(TupleField * tuple_field, char *string) +set_tuplefield_string(TupleField *tuple_field, char *string) { tuple_field->len = strlen(string); tuple_field->value = malloc(strlen(string) + 1); @@ -41,7 +41,7 @@ set_tuplefield_string(TupleField * tuple_field, char *string) void -set_tuplefield_int2(TupleField * tuple_field, Int2 value) +set_tuplefield_int2(TupleField *tuple_field, Int2 value) { char buffer[10]; @@ -54,7 +54,7 @@ set_tuplefield_int2(TupleField * tuple_field, Int2 value) void -set_tuplefield_int4(TupleField * tuple_field, Int4 value) +set_tuplefield_int4(TupleField *tuple_field, Int4 value) { char buffer[15]; diff --git a/src/interfaces/odbc/tuple.h b/src/interfaces/odbc/tuple.h index 6cd87cb9dbb..fdc1a5f9eaa 100644 --- a/src/interfaces/odbc/tuple.h +++ b/src/interfaces/odbc/tuple.h @@ -38,8 +38,9 @@ struct TupleNode_ #define set_nullfield_int2(FLD, VAL) ((VAL) != -1 ? set_tuplefield_int2(FLD, (VAL)) : set_tuplefield_null(FLD)) #define set_nullfield_int4(FLD, VAL) ((VAL) != -1 ? set_tuplefield_int4(FLD, (VAL)) : set_tuplefield_null(FLD)) -void set_tuplefield_null(TupleField * tuple_field); -void set_tuplefield_string(TupleField * tuple_field, char *string); -void set_tuplefield_int2(TupleField * tuple_field, Int2 value); -void set_tuplefield_int4(TupleField * tuple_field, Int4 value); +void set_tuplefield_null(TupleField *tuple_field); +void set_tuplefield_string(TupleField *tuple_field, char *string); +void set_tuplefield_int2(TupleField *tuple_field, Int2 value); +void set_tuplefield_int4(TupleField *tuple_field, Int4 value); + #endif diff --git a/src/interfaces/odbc/tuplelist.c b/src/interfaces/odbc/tuplelist.c index e00ab430062..0ae2130bff4 100644 --- a/src/interfaces/odbc/tuplelist.c +++ b/src/interfaces/odbc/tuplelist.c @@ -44,7 +44,7 @@ TL_Constructor(UInt4 fieldcnt) void -TL_Destructor(TupleListClass * self) +TL_Destructor(TupleListClass *self) { int lf; TupleNode *node, @@ -70,7 +70,7 @@ TL_Destructor(TupleListClass * self) void * -TL_get_fieldval(TupleListClass * self, Int4 tupleno, Int2 fieldno) +TL_get_fieldval(TupleListClass *self, Int4 tupleno, Int2 fieldno) { Int4 lf; Int4 delta, @@ -181,7 +181,7 @@ TL_get_fieldval(TupleListClass * self, Int4 tupleno, Int2 fieldno) char -TL_add_tuple(TupleListClass * self, TupleNode * new_field) +TL_add_tuple(TupleListClass *self, TupleNode *new_field) { /* * we append the tuple at the end of the doubly linked list of the diff --git a/src/interfaces/odbc/tuplelist.h b/src/interfaces/odbc/tuplelist.h index 5ce2613e86a..3dc98dd78ff 100644 --- a/src/interfaces/odbc/tuplelist.h +++ b/src/interfaces/odbc/tuplelist.h @@ -28,7 +28,8 @@ struct TupleListClass_ /* Create a TupleList. Each tuple consits of fieldcnt columns */ TupleListClass *TL_Constructor(UInt4 fieldcnt); -void TL_Destructor(TupleListClass * self); -void *TL_get_fieldval(TupleListClass * self, Int4 tupleno, Int2 fieldno); -char TL_add_tuple(TupleListClass * self, TupleNode * new_field); +void TL_Destructor(TupleListClass *self); +void *TL_get_fieldval(TupleListClass *self, Int4 tupleno, Int2 fieldno); +char TL_add_tuple(TupleListClass *self, TupleNode *new_field); + #endif diff --git a/src/interfaces/python/pgmodule.c b/src/interfaces/python/pgmodule.c index 38fc4f2d7c6..7b959e94299 100644 --- a/src/interfaces/python/pgmodule.c +++ b/src/interfaces/python/pgmodule.c @@ -94,8 +94,8 @@ const char *__movename[5] = static PyObject *pg_default_host; /* default database host */ static PyObject *pg_default_base; /* default database name */ -static PyObject *pg_default_opt; /* default connection options */ -static PyObject *pg_default_tty; /* default debug tty */ +static PyObject *pg_default_opt; /* default connection options */ +static PyObject *pg_default_tty; /* default debug tty */ static PyObject *pg_default_port; /* default connection port */ static PyObject *pg_default_user; /* default username */ static PyObject *pg_default_passwd; /* default password */ @@ -111,7 +111,7 @@ int *get_type_array(PGresult *result, int nfields); typedef struct { - PyObject_HEAD + PyObject_HEAD int valid; /* validity flag */ PGconn *cnx; /* PostGres connection handle */ PGresult *last_result; /* last result content */ @@ -139,7 +139,7 @@ pgobject_New(void) typedef struct { - PyObject_HEAD + PyObject_HEAD PGresult *last_result; /* last result content */ int result_type; /* type of previous result */ long current_pos; /* current position in last result */ @@ -154,7 +154,7 @@ staticforward PyTypeObject PgQueryType; typedef struct { - PyObject_HEAD + PyObject_HEAD int valid; /* validity flag */ pgobject *pgcnx; /* parent connection object */ PGresult *last_result; /* last result content */ @@ -175,8 +175,8 @@ staticforward PyTypeObject PgSourceType; typedef struct { - PyObject_HEAD - pgobject * pgcnx; /* parent connection object */ + PyObject_HEAD + pgobject * pgcnx; /* parent connection object */ Oid lo_oid; /* large object oid */ int lo_fd; /* large object fd */ } pglargeobject; diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h index cc3918b3c35..3d228fa755f 100644 --- a/src/pl/plpgsql/src/plpgsql.h +++ b/src/pl/plpgsql/src/plpgsql.h @@ -3,7 +3,7 @@ * procedural language * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.20 2001/10/25 05:50:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.21 2001/10/28 06:26:15 momjian Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -53,11 +53,11 @@ */ enum { - PLPGSQL_NSTYPE_LABEL, - PLPGSQL_NSTYPE_VAR, - PLPGSQL_NSTYPE_ROW, - PLPGSQL_NSTYPE_REC, - PLPGSQL_NSTYPE_RECFIELD + PLPGSQL_NSTYPE_LABEL, + PLPGSQL_NSTYPE_VAR, + PLPGSQL_NSTYPE_ROW, + PLPGSQL_NSTYPE_REC, + PLPGSQL_NSTYPE_RECFIELD }; /* ---------- @@ -66,12 +66,12 @@ enum */ enum { - PLPGSQL_DTYPE_VAR, - PLPGSQL_DTYPE_ROW, - PLPGSQL_DTYPE_REC, - PLPGSQL_DTYPE_RECFIELD, - PLPGSQL_DTYPE_EXPR, - PLPGSQL_DTYPE_TRIGARG + PLPGSQL_DTYPE_VAR, + PLPGSQL_DTYPE_ROW, + PLPGSQL_DTYPE_REC, + PLPGSQL_DTYPE_RECFIELD, + PLPGSQL_DTYPE_EXPR, + PLPGSQL_DTYPE_TRIGARG }; /* ---------- @@ -80,24 +80,24 @@ enum */ enum { - PLPGSQL_STMT_BLOCK, - PLPGSQL_STMT_ASSIGN, - PLPGSQL_STMT_IF, - PLPGSQL_STMT_LOOP, - PLPGSQL_STMT_WHILE, - PLPGSQL_STMT_FORI, - PLPGSQL_STMT_FORS, - PLPGSQL_STMT_SELECT, - PLPGSQL_STMT_EXIT, - PLPGSQL_STMT_RETURN, - PLPGSQL_STMT_RAISE, - PLPGSQL_STMT_EXECSQL, - PLPGSQL_STMT_DYNEXECUTE, - PLPGSQL_STMT_DYNFORS, - PLPGSQL_STMT_GETDIAG, - PLPGSQL_STMT_OPEN, - PLPGSQL_STMT_FETCH, - PLPGSQL_STMT_CLOSE + PLPGSQL_STMT_BLOCK, + PLPGSQL_STMT_ASSIGN, + PLPGSQL_STMT_IF, + PLPGSQL_STMT_LOOP, + PLPGSQL_STMT_WHILE, + PLPGSQL_STMT_FORI, + PLPGSQL_STMT_FORS, + PLPGSQL_STMT_SELECT, + PLPGSQL_STMT_EXIT, + PLPGSQL_STMT_RETURN, + PLPGSQL_STMT_RAISE, + PLPGSQL_STMT_EXECSQL, + PLPGSQL_STMT_DYNEXECUTE, + PLPGSQL_STMT_DYNFORS, + PLPGSQL_STMT_GETDIAG, + PLPGSQL_STMT_OPEN, + PLPGSQL_STMT_FETCH, + PLPGSQL_STMT_CLOSE }; @@ -107,9 +107,9 @@ enum */ enum { - PLPGSQL_RC_OK, - PLPGSQL_RC_EXIT, - PLPGSQL_RC_RETURN + PLPGSQL_RC_OK, + PLPGSQL_RC_EXIT, + PLPGSQL_RC_RETURN }; /* ---------- @@ -118,8 +118,8 @@ enum */ enum { - PLPGSQL_GETDIAG_ROW_COUNT, - PLPGSQL_GETDIAG_RESULT_OID + PLPGSQL_GETDIAG_ROW_COUNT, + PLPGSQL_GETDIAG_RESULT_OID }; @@ -611,4 +611,5 @@ extern int plpgsql_base_yylex(void); extern int plpgsql_yylex(void); extern void plpgsql_push_back_token(int token); extern void plpgsql_setinput(char *s, int functype); + #endif /* PLPGSQL_H */ diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c index 3483d21ae33..b8f0335cf30 100644 --- a/src/pl/plpython/plpython.c +++ b/src/pl/plpython/plpython.c @@ -29,7 +29,7 @@ * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.10 2001/10/25 05:50:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.11 2001/10/28 06:26:15 momjian Exp $ * ********************************************************************* */ @@ -1686,7 +1686,7 @@ PyMethodDef PLy_plan_methods[] = { PySequenceMethods PLy_result_as_sequence = { - (inquiry) PLy_result_length,/* sq_length */ + (inquiry) PLy_result_length, /* sq_length */ (binaryfunc) 0, /* sq_concat */ (intargfunc) 0, /* sq_repeat */ (intargfunc) PLy_result_item, /* sq_item */ diff --git a/src/pl/plpython/plpython.h b/src/pl/plpython/plpython.h index 266640efc83..35e962f3b7a 100644 --- a/src/pl/plpython/plpython.h +++ b/src/pl/plpython/plpython.h @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/pl/plpython/Attic/plpython.h,v 1.3 2001/10/25 05:50:21 momjian Exp $ */ +/* $Header: /cvsroot/pgsql/src/pl/plpython/Attic/plpython.h,v 1.4 2001/10/28 06:26:15 momjian Exp $ */ #ifndef PLPYTHON_H #define PLPYTHON_H @@ -64,4 +64,5 @@ #define mark() #define refc(O) #endif + #endif /* PLPYTHON_H */ diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent index 5321876d8a4..e675b1715f1 100755 --- a/src/tools/pgindent/pgindent +++ b/src/tools/pgindent/pgindent @@ -1446,7 +1446,8 @@ do -Twchar_t \ /tmp/$$a >/tmp/$$ 2>&1 if [ "$?" -ne 0 -o -s /tmp/$$ ] - then echo "$FILE" + then echo + echo "$FILE" cat /tmp/$$ fi cat /tmp/$$a | @@ -1458,8 +1459,6 @@ do sed 's;^}[ ][ ]*/\*;} /*;' | # pull in #endif comments sed 's;^#endif[ ][ ]*/\*;#endif /*;' | -# add space after comments that start on tab stops - sed 's:\([^ ]\)\(/\*.*\*/\)$:\1 \2:' | # work around #else indenting next line if #ifdef defines variables at top # work around misindenting of function with no variables defined awk ' @@ -1474,6 +1473,8 @@ do # remove tabs and retab with four spaces detab -t8 -qc | entab -t4 -qc | +# add space after comments that start on tab stops + sed 's:\([^ ]\)\(/\*.*\*/\)$:\1 \2:' | # move trailing * in function return type sed 's;^\([A-Za-z_][^ ]*\)[ ][ ]*\*$;\1 *;' | # remove un-needed braces around single statements diff --git a/src/utils/dllinit.c b/src/utils/dllinit.c index 83439c0865e..67dc1f82aa5 100644 --- a/src/utils/dllinit.c +++ b/src/utils/dllinit.c @@ -104,4 +104,5 @@ DllMain( } return TRUE; } + #endif /* CYGWIN_VERSION_DLL_MAJOR < 1001 */ |