1
0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +03:00

Another pgindent run. Fixes enum indenting, and improves #endif

spacing.  Also adds space for one-line comments.
This commit is contained in:
Bruce Momjian
2001-10-28 06:26:15 +00:00
parent c29797deeb
commit 6783b2372e
525 changed files with 2429 additions and 2049 deletions

View File

@ -486,7 +486,7 @@ tskey_cmp(const void *a, const void *b)
TimestampGetDatum(((TSKEY *) (((RIX *) a)->r))->lower), TimestampGetDatum(((TSKEY *) (((RIX *) a)->r))->lower),
TimestampGetDatum(((TSKEY *) (((RIX *) b)->r))->lower) TimestampGetDatum(((TSKEY *) (((RIX *) b)->r))->lower)
) )
); );
} }
/************************************************** /**************************************************

View File

@ -59,7 +59,7 @@ typedef struct
{ {
u_char dbf_name[DBF_NAMELEN]; /* field-name terminated with \0 */ u_char dbf_name[DBF_NAMELEN]; /* field-name terminated with \0 */
u_char dbf_type; /* field-type */ 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_flen; /* field-length */
u_char dbf_dec; /* number of decimal positions if type is u_char dbf_dec; /* number of decimal positions if type is
* 'N' */ * 'N' */
@ -135,4 +135,5 @@ extern long get_long(u_char *cp);
extern void put_long(u_char *cp, long lval); extern void put_long(u_char *cp, long lval);
extern short get_short(u_char *cp); extern short get_short(u_char *cp);
extern void put_short(u_char *cp, short lval); extern void put_short(u_char *cp, short lval);
#endif /* _DBF_H */ #endif /* _DBF_H */

View File

@ -66,4 +66,5 @@ extern Datum dblink_tok(PG_FUNCTION_ARGS);
* Internal declarations * Internal declarations
*/ */
dblink_results *init_dblink_results(MemoryContext fn_mcxt); dblink_results *init_dblink_results(MemoryContext fn_mcxt);
#endif /* DBLINK_H */ #endif /* DBLINK_H */

View File

@ -1,7 +1,7 @@
/* /*
* PostgreSQL type definitions for managed LargeObjects. * 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 */ Blob *lo_in(char *str); /* Create from String */
char *lo_out(Blob * addr); /* Output oid as String */ char *lo_out(Blob * addr); /* Output oid as String */
Oid lo_oid(Blob * addr); /* Return oid as an oid */ Oid lo_oid(Blob * addr); /* Return oid as an oid */
Blob *lo(Oid oid); /* Return Blob based on oid */ Blob *lo(Oid oid); /* Return Blob based on oid */
Datum lo_manage(PG_FUNCTION_ARGS); /* Trigger handler */ Datum lo_manage(PG_FUNCTION_ARGS); /* Trigger handler */
@ -139,7 +139,7 @@ lo_manage(PG_FUNCTION_ARGS)
TupleDesc tupdesc; /* Tuple Descriptor */ TupleDesc tupdesc; /* Tuple Descriptor */
HeapTuple rettuple; /* Tuple to be returned */ HeapTuple rettuple; /* Tuple to be returned */
bool isdelete; /* are we deleting? */ 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 */ HeapTuple trigtuple; /* The original value of tuple */
if (!CALLED_AS_TRIGGER(fcinfo)) if (!CALLED_AS_TRIGGER(fcinfo))

View File

@ -6,4 +6,5 @@ int unlisten(char *relname);
int max(int x, int y); int max(int x, int y);
int min(int x, int y); int min(int x, int y);
int active_listeners(text *relname); int active_listeners(text *relname);
#endif #endif

View File

@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------
* pg_dumplo * 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 * Karel Zak 1999-2000
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
@ -64,11 +64,11 @@ typedef struct
typedef enum typedef enum
{ {
ACTION_NONE, ACTION_NONE,
ACTION_SHOW, ACTION_SHOW,
ACTION_EXPORT_ATTR, ACTION_EXPORT_ATTR,
ACTION_EXPORT_ALL, ACTION_EXPORT_ALL,
ACTION_IMPORT ACTION_IMPORT
} PGLODUMP_ACTIONS; } PGLODUMP_ACTIONS;
extern char *progname; extern char *progname;
@ -78,4 +78,5 @@ extern void index_file(LODumpMaster * pgLO);
extern void load_lolist(LODumpMaster * pgLO); extern void load_lolist(LODumpMaster * pgLO);
extern void pglo_export(LODumpMaster * pgLO); extern void pglo_export(LODumpMaster * pgLO);
extern void pglo_import(LODumpMaster * pgLO); extern void pglo_import(LODumpMaster * pgLO);
#endif /* PG_DUMPLO_H */ #endif /* PG_DUMPLO_H */

View File

@ -23,7 +23,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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); readFile = XLogFileOpen(readId, readSeg);
if (readFile < 0) if (readFile < 0)
goto next_record_is_invalid; 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; targetPageOff = ((RecPtr->xrecoff % XLogSegSize) / BLCKSZ) * BLCKSZ;

View File

@ -79,4 +79,5 @@ void blf_ecb_decrypt(blf_ctx *, uint8 *, uint32);
void blf_cbc_encrypt(blf_ctx *, uint8 *, uint8 *, uint32); void blf_cbc_encrypt(blf_ctx *, uint8 *, uint8 *, uint32);
void blf_cbc_decrypt(blf_ctx *, uint8 *, uint8 *, uint32); void blf_cbc_decrypt(blf_ctx *, uint8 *, uint8 *, uint32);
#endif #endif

View File

@ -159,14 +159,14 @@ static uint8 pbox[32] = {
static uint32 _crypt_bits32[32] = static uint32 _crypt_bits32[32] =
{ {
0x80000000, 0x40000000, 0x20000000, 0x10000000, 0x80000000, 0x40000000, 0x20000000, 0x10000000,
0x08000000, 0x04000000, 0x02000000, 0x01000000, 0x08000000, 0x04000000, 0x02000000, 0x01000000,
0x00800000, 0x00400000, 0x00200000, 0x00100000, 0x00800000, 0x00400000, 0x00200000, 0x00100000,
0x00080000, 0x00040000, 0x00020000, 0x00010000, 0x00080000, 0x00040000, 0x00020000, 0x00010000,
0x00008000, 0x00004000, 0x00002000, 0x00001000, 0x00008000, 0x00004000, 0x00002000, 0x00001000,
0x00000800, 0x00000400, 0x00000200, 0x00000100, 0x00000800, 0x00000400, 0x00000200, 0x00000100,
0x00000080, 0x00000040, 0x00000020, 0x00000010, 0x00000080, 0x00000040, 0x00000020, 0x00000010,
0x00000008, 0x00000004, 0x00000002, 0x00000001 0x00000008, 0x00000004, 0x00000002, 0x00000001
}; };
static uint8 _crypt_bits8[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static uint8 _crypt_bits8[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};

View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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; char *name;
void (*init) (PX_MD * h); void (*init) (PX_MD * h);
} int_digest_list[] = } int_digest_list[] =
{ {
{ {
@ -520,7 +520,7 @@ static struct
{ {
char *name; char *name;
PX_Cipher *(*load) (void); PX_Cipher *(*load) (void);
} int_ciphers[] = } int_ciphers[] =
{ {
{ {

View File

@ -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 $ */ /* $KAME: md5.h,v 1.3 2000/02/22 14:01:18 itojun Exp $ */
/* /*
@ -75,4 +75,5 @@ do { \
md5_pad((y)); \ md5_pad((y)); \
md5_result((x), (y)); \ md5_result((x), (y)); \
} while (0) } while (0)
#endif /* ! _NETINET6_MD5_H_ */ #endif /* ! _NETINET6_MD5_H_ */

View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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> #include <postgres.h>
@ -331,28 +331,28 @@ struct
"bf-cbc", "bf-cbc",
{ {
gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size, 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", "bf-ecb",
{ {
gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size, 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", "bf-cfb",
{ {
gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size, 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", "bf-ofb",
{ {
gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size, 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
} }
}, },
{ {

View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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 #ifndef _PG_CRYPTO_H
@ -45,4 +45,5 @@ Datum pg_decrypt(PG_FUNCTION_ARGS);
Datum pg_encrypt_iv(PG_FUNCTION_ARGS); Datum pg_encrypt_iv(PG_FUNCTION_ARGS);
Datum pg_decrypt_iv(PG_FUNCTION_ARGS); Datum pg_decrypt_iv(PG_FUNCTION_ARGS);
Datum pg_cipher_exists(PG_FUNCTION_ARGS); Datum pg_cipher_exists(PG_FUNCTION_ARGS);
#endif #endif

View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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> #include <postgres.h>
@ -75,7 +75,7 @@ static struct
unsigned id_len; unsigned id_len;
char *(*crypt) (const char *psw, const char *salt, char *(*crypt) (const char *psw, const char *salt,
char *buf, unsigned len); char *buf, unsigned len);
} px_crypt_list[] = } px_crypt_list[] =
{ {
{ {

View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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 #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 *px_crypt_md5(const char *pw, const char *salt,
char *dst, unsigned dstlen); char *dst, unsigned dstlen);
#endif /* !PX_SYSTEM_CRYPT */ #endif /* !PX_SYSTEM_CRYPT */
#endif /* _PX_CRYPT_H */ #endif /* _PX_CRYPT_H */

View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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; return -1;
} }
#endif /* RAND_OPENSSL */ #endif /* RAND_OPENSSL */

View File

@ -664,4 +664,5 @@ main()
printf("\n};\n\n"); printf("\n};\n\n");
return 0; return 0;
} }
#endif #endif

View File

@ -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 $ */ /* $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]; digest[19] = ctxt->h.b8[16];
#endif #endif
} }
#endif /* unsupported */ #endif /* unsupported */

View File

@ -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 $ */ /* $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 SHA1Final(x, y) sha1_result((y), (x))
#define SHA1_RESULTLEN (160/8) #define SHA1_RESULTLEN (160/8)
#endif /* _NETINET6_SHA1_H_ */ #endif /* _NETINET6_SHA1_H_ */

View File

@ -43,7 +43,7 @@ _rserv_log_()
char **args; /* argument: argnum */ char **args; /* argument: argnum */
Relation rel; /* triggered relation */ Relation rel; /* triggered relation */
HeapTuple tuple; /* tuple to return */ HeapTuple tuple; /* tuple to return */
HeapTuple newtuple = NULL; /* tuple to return */ HeapTuple newtuple = NULL; /* tuple to return */
TupleDesc tupdesc; /* tuple description */ TupleDesc tupdesc; /* tuple description */
int keynum; int keynum;
char *key; char *key;

View File

@ -52,7 +52,7 @@ check_primary_key(PG_FUNCTION_ARGS)
HeapTuple tuple = NULL; /* tuple to return */ HeapTuple tuple = NULL; /* tuple to return */
TupleDesc tupdesc; /* tuple description */ TupleDesc tupdesc; /* tuple description */
EPlan *plan; /* prepared plan */ 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 */ bool isnull; /* to know is some column NULL or not */
char ident[2 * NAMEDATALEN]; /* to identify myself */ char ident[2 * NAMEDATALEN]; /* to identify myself */
int ret; int ret;
@ -235,10 +235,10 @@ check_foreign_key(PG_FUNCTION_ARGS)
char *relname; /* referencing relation name */ char *relname; /* referencing relation name */
Relation rel; /* triggered relation */ Relation rel; /* triggered relation */
HeapTuple trigtuple = NULL; /* tuple to being changed */ HeapTuple trigtuple = NULL; /* tuple to being changed */
HeapTuple newtuple = NULL; /* tuple to return */ HeapTuple newtuple = NULL; /* tuple to return */
TupleDesc tupdesc; /* tuple description */ TupleDesc tupdesc; /* tuple description */
EPlan *plan; /* prepared plan(s) */ 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 isnull; /* to know is some column NULL or not */
bool isequal = true; /* are keys in both tuples equal (in bool isequal = true; /* are keys in both tuples equal (in
* UPDATE) */ * UPDATE) */

View File

@ -6,4 +6,5 @@ extern unsigned int crc32_sz(char *buf, int size);
/* Returns crc32 of null-terminated string */ /* Returns crc32 of null-terminated string */
#define crc32(buf) crc32_sz((buf),strlen(buf)) #define crc32(buf) crc32_sz((buf),strlen(buf))
#endif #endif

View File

@ -25,4 +25,5 @@
#define FILEPATH 19 #define FILEPATH 19
extern const char *descr[]; extern const char *descr[];
#endif #endif

View File

@ -62,4 +62,5 @@ typedef struct
#define GETSIGN(x) ( (BITVECP)( (char*)x+GTHDRSIZE ) ) #define GETSIGN(x) ( (BITVECP)( (char*)x+GTHDRSIZE ) )
#define GETARR(x) ( (int4*)( (char*)x+GTHDRSIZE ) ) #define GETARR(x) ( (int4*)( (char*)x+GTHDRSIZE ) )
#define ARRNELEM(x) ( ( ((GISTTYPE*)x)->len - GTHDRSIZE )/sizeof(int4) ) #define ARRNELEM(x) ( ( ((GISTTYPE*)x)->len - GTHDRSIZE )/sizeof(int4) )
#endif #endif

View File

@ -6,4 +6,5 @@ void initmorph(void);
char *lemmatize(char *word, int *len, int type); char *lemmatize(char *word, int *len, int type);
bool is_stoptype(int type); bool is_stoptype(int type);
#endif #endif

View File

@ -7,4 +7,5 @@ int tsearch_yylex(void);
void start_parse_str(char *, int); void start_parse_str(char *, int);
void start_parse_fh(FILE *, int); void start_parse_fh(FILE *, int);
void end_parse(void); void end_parse(void);
#endif #endif

View File

@ -104,7 +104,7 @@ gettoken_query(QPRS_STATE * state, int4 *val, int4 *lenval, char **strval)
{ {
switch (state->state) switch (state->state)
{ {
case WAITOPERAND: case WAITOPERAND:
if (*(state->buf) == '!') if (*(state->buf) == '!')
{ {
(state->buf)++; (state->buf)++;
@ -408,7 +408,7 @@ rexecqtxt(PG_FUNCTION_ARGS)
execqtxt, execqtxt,
PG_GETARG_DATUM(1), PG_GETARG_DATUM(1),
PG_GETARG_DATUM(0) PG_GETARG_DATUM(0)
); );
} }
Datum Datum

View File

@ -48,4 +48,5 @@ typedef struct
bool execute(ITEM * curitem, void *checkval, bool execute(ITEM * curitem, void *checkval,
bool calcnot, bool (*chkcond) (void *checkval, ITEM * val)); bool calcnot, bool (*chkcond) (void *checkval, ITEM * val));
#endif #endif

View File

@ -3,4 +3,5 @@
ITEM *clean_NOT(ITEM * ptr, int4 *len); ITEM *clean_NOT(ITEM * ptr, int4 *len);
ITEM *clean_fakeval(ITEM * ptr, int4 *len); ITEM *clean_fakeval(ITEM * ptr, int4 *len);
#endif #endif

View File

@ -327,7 +327,7 @@ typedef struct
{ {
uint16 len; uint16 len;
char *word; char *word;
} WORD; } WORD;
typedef struct typedef struct
{ {
@ -402,7 +402,7 @@ compareWORD(const void *a, const void *b)
} }
static int static int
uniqueWORD(WORD * a, int4 l) uniqueWORD(WORD *a, int4 l)
{ {
WORD *ptr, WORD *ptr,
*res; *res;

View File

@ -44,4 +44,5 @@ typedef struct
} TI_IN_STATE; } TI_IN_STATE;
int4 gettoken_txtidx(TI_IN_STATE * state); int4 gettoken_txtidx(TI_IN_STATE * state);
#endif #endif

View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * 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, return (RelationInvokeStrategy(r, &GISTEvaluationData, attnum, s,
left, right)); left, right));
} }
#endif #endif

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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, return (RelationInvokeStrategy(rel, &HTEvaluationData, attno, strat,
left, right)); left, right));
} }
#endif #endif

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* many of the old access method routines have been turned into * 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 */ scan->flags = 0x0; /* XXX should have a symbolic name */
} }
#endif #endif

View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * 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) */ #endif /* defined(ISTRATDEBUG) */

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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, return (RelationInvokeStrategy(rel, &BTEvaluationData, attno, strat,
left, right)); left, right));
} }
#endif #endif

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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; right_avail_space;
int total_num_tuples, int total_num_tuples,
num_tuples_without_seeds, 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 float diff; /* diff between cost of putting tuple left
* or right */ * or right */
SPLITCOST *cost_vector; SPLITCOST *cost_vector;
@ -1063,7 +1063,7 @@ rtpicksplit(Relation r,
else else
{ {
elog(ERROR, "rtpicksplit: failed to find a workable page split"); 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) if (choose_left)

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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? */ /* if you only have "contained-by", how do you determine equality? */
static uint16 RTContainedByTermData[] = { static uint16 RTContainedByTermData[] = {
2, /* make two comparisons */ 2, /* make two comparisons */
RTContainedByStrategyNumber,/* use "a contained-by b" */ RTContainedByStrategyNumber, /* use "a contained-by b" */
0x0, /* without any magic */ 0x0, /* without any magic */
RTContainedByStrategyNumber,/* then use contained-by, */ RTContainedByStrategyNumber, /* then use contained-by, */
SK_COMMUTE /* swapping a and b */ SK_COMMUTE /* swapping a and b */
}; };

View File

@ -13,7 +13,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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 typedef enum
{ {
CLOG_PAGE_EMPTY,/* CLOG buffer is not in use */ CLOG_PAGE_EMPTY, /* CLOG buffer is not in use */
CLOG_PAGE_READ_IN_PROGRESS, /* CLOG page is being read CLOG_PAGE_READ_IN_PROGRESS, /* CLOG page is being read in */
* in */ CLOG_PAGE_CLEAN, /* CLOG page is valid and not dirty */
CLOG_PAGE_CLEAN,/* CLOG page is valid and not dirty */ CLOG_PAGE_DIRTY, /* CLOG page is valid but needs write */
CLOG_PAGE_DIRTY,/* CLOG page is valid but needs write */ CLOG_PAGE_WRITE_IN_PROGRESS /* CLOG page is being written out in */
CLOG_PAGE_WRITE_IN_PROGRESS /* CLOG page is being
* written out in */
} ClogPageStatus; } ClogPageStatus;
/* /*

View File

@ -6,7 +6,7 @@
* Copyright (c) 2000, PostgreSQL Global Development Group * Copyright (c) 2000, PostgreSQL Global Development Group
* *
* IDENTIFICATION * 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 * 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 * (InvalidOid); and as long as we have to check that, it seems a good
* idea to skip over everything below BootstrapObjectIdData too. * idea to skip over everything below BootstrapObjectIdData too. (This
* (This basically just reduces the odds of OID collision right after * basically just reduces the odds of OID collision right after a wrap
* a wrap occurs.) Note we are relying on unsigned comparison here. * occurs.) Note we are relying on unsigned comparison here.
*/ */
if (ShmemVariableCache->nextOid < ((Oid) BootstrapObjectIdData)) if (ShmemVariableCache->nextOid < ((Oid) BootstrapObjectIdData))
{ {

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* Transaction aborts can now occur two ways: * Transaction aborts can now occur two ways:
@ -994,7 +994,7 @@ CommitTransaction(void)
AtCommit_Memory(); AtCommit_Memory();
AtEOXact_Files(); AtEOXact_Files();
SharedBufferChanged = false; /* safest place to do it */ SharedBufferChanged = false; /* safest place to do it */
/* Count transaction commit in statistics collector */ /* Count transaction commit in statistics collector */
pgstat_count_xact_commit(); pgstat_count_xact_commit();
@ -1097,7 +1097,7 @@ AbortTransaction(void)
AtEOXact_Files(); AtEOXact_Files();
AtAbort_Locks(); AtAbort_Locks();
SharedBufferChanged = false; /* safest place to do it */ SharedBufferChanged = false; /* safest place to do it */
/* Count transaction abort in statistics collector */ /* Count transaction abort in statistics collector */
pgstat_count_xact_rollback(); pgstat_count_xact_rollback();

View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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 */ /* And fill the new page's header */
NewPage->xlp_magic = XLOG_PAGE_MAGIC; 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_sui = ThisStartUpID;
NewPage->xlp_pageaddr.xlogid = NewPageEndPtr.xlogid; NewPage->xlp_pageaddr.xlogid = NewPageEndPtr.xlogid;
NewPage->xlp_pageaddr.xrecoff = NewPageEndPtr.xrecoff - BLCKSZ; NewPage->xlp_pageaddr.xrecoff = NewPageEndPtr.xrecoff - BLCKSZ;
@ -1762,7 +1762,7 @@ ReadRecord(XLogRecPtr *RecPtr, int emode, char *buffer)
readFile = XLogFileOpen(readId, readSeg, (emode == LOG)); readFile = XLogFileOpen(readId, readSeg, (emode == LOG));
if (readFile < 0) if (readFile < 0)
goto next_record_is_invalid; 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; targetPageOff = ((RecPtr->xrecoff % XLogSegSize) / BLCKSZ) * BLCKSZ;

View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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" #include "nodes/parsenodes.h"
extern void beginRecipe(RecipeStmt *stmt); extern void beginRecipe(RecipeStmt *stmt);
#endif /* RECIPE_H */ #endif /* RECIPE_H */

View File

@ -10,7 +10,7 @@
* doesn't work! - jolly 8/19/95 * 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 * NOTES
* At the point the version is defined, 2 physical relations are created * 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); */ /* printf("%s\n",rule_buf); */
} }
#endif #endif

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* The PerformAddAttribute() code, like most of the relation * The PerformAddAttribute() code, like most of the relation
@ -2083,7 +2083,7 @@ LockTableCommand(LockStmt *lockstmt)
LockRelation(rel, lockstmt->mode); LockRelation(rel, lockstmt->mode);
heap_close(rel, NoLock); /* close rel, keep lock */ heap_close(rel, NoLock); /* close rel, keep lock */
} }
} }

View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * 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 * DESCRIPTION
* The "DefineFoo" routines take the parse tree and pick out the * The "DefineFoo" routines take the parse tree and pick out the
@ -356,7 +356,7 @@ DefineOperator(char *oprName,
List *parameters) List *parameters)
{ {
uint16 precedence = 0; /* operator precedence */ uint16 precedence = 0; /* operator precedence */
bool canHash = false; /* operator hashes */ bool canHash = false; /* operator hashes */
bool isLeftAssociative = true; /* operator is left bool isLeftAssociative = true; /* operator is left
* associative */ * associative */
char *functionName = NULL; /* function for operator */ char *functionName = NULL; /* function for operator */
@ -367,7 +367,7 @@ DefineOperator(char *oprName,
char *negatorName = NULL; /* optional negator operator name */ char *negatorName = NULL; /* optional negator operator name */
char *restrictionName = NULL; /* optional restrict. sel. char *restrictionName = NULL; /* optional restrict. sel.
* procedure */ * 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 *sortName1 = NULL; /* optional first sort operator */
char *sortName2 = NULL; /* optional second sort operator */ char *sortName2 = NULL; /* optional second sort operator */
List *pl; List *pl;
@ -446,7 +446,7 @@ DefineOperator(char *oprName,
OperatorCreate(oprName, /* operator name */ OperatorCreate(oprName, /* operator name */
typeName1, /* first type name */ typeName1, /* first type name */
typeName2, /* second type name */ typeName2, /* second type name */
functionName,/* function for operator */ functionName, /* function for operator */
precedence, /* operator precedence */ precedence, /* operator precedence */
isLeftAssociative, /* operator is left associative */ isLeftAssociative, /* operator is left associative */
commutatorName, /* optional commutator operator commutatorName, /* optional commutator operator
@ -544,7 +544,7 @@ DefineType(char *typeName, List *parameters)
char delimiter = DEFAULT_TYPDELIM; char delimiter = DEFAULT_TYPDELIM;
char *shadow_type; char *shadow_type;
List *pl; List *pl;
char alignment = 'i'; /* default alignment */ char alignment = 'i'; /* default alignment */
char storage = 'p'; /* default TOAST storage method */ char storage = 'p'; /* default TOAST storage method */
/* /*
@ -676,7 +676,7 @@ DefineType(char *typeName, List *parameters)
-1, /* internal size */ -1, /* internal size */
-1, /* external size */ -1, /* external size */
'b', /* type-type (base type) */ 'b', /* type-type (base type) */
DEFAULT_TYPDELIM,/* array element delimiter */ DEFAULT_TYPDELIM, /* array element delimiter */
"array_in", /* input procedure */ "array_in", /* input procedure */
"array_out", /* output procedure */ "array_out", /* output procedure */
"array_in", /* receive procedure */ "array_in", /* receive procedure */

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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) if (new->increment_by > 0)
new->max_value = SEQ_MAXVALUE; /* ascending seq */ new->max_value = SEQ_MAXVALUE; /* ascending seq */
else else
new->max_value = -1; /* descending seq */ new->max_value = -1; /* descending seq */
} }
else else
new->max_value = get_param(max_value); new->max_value = get_param(max_value);

View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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; int max_id;
List *item, List *item,
*option; *option;
char *password = NULL; /* PostgreSQL user password */ char *password = NULL; /* PostgreSQL user password */
bool encrypt_password = Password_encryption; /* encrypt password? */ bool encrypt_password = Password_encryption; /* encrypt password? */
char encrypted_password[MD5_PASSWD_LEN + 1]; char encrypted_password[MD5_PASSWD_LEN + 1];
int sysid = 0; /* PgSQL system id (valid if havesysid) */ int sysid = 0; /* PgSQL system id (valid if havesysid) */
bool createdb = false; /* Can the user create databases? */ bool createdb = false; /* Can the user create databases? */
bool createuser = false; /* Can this user create users? */ 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 char *validUntil = NULL; /* The time the login is valid
* until */ * until */
DefElem *dpassword = NULL; DefElem *dpassword = NULL;
@ -447,11 +447,11 @@ AlterUser(AlterUserStmt *stmt)
new_tuple; new_tuple;
bool null; bool null;
List *option; List *option;
char *password = NULL; /* PostgreSQL user password */ char *password = NULL; /* PostgreSQL user password */
bool encrypt_password = Password_encryption; /* encrypt password? */ bool encrypt_password = Password_encryption; /* encrypt password? */
char encrypted_password[MD5_PASSWD_LEN + 1]; char encrypted_password[MD5_PASSWD_LEN + 1];
int createdb = -1; /* Can the user create databases? */ 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 char *validUntil = NULL; /* The time the login is valid
* until */ * until */
DefElem *dpassword = NULL; DefElem *dpassword = NULL;
@ -954,7 +954,7 @@ CreateGroup(CreateGroupStmt *stmt)
userarray = palloc(ARR_OVERHEAD(1) + length(newlist) * sizeof(int32)); userarray = palloc(ARR_OVERHEAD(1) + length(newlist) * sizeof(int32));
userarray->size = ARR_OVERHEAD(1) + length(newlist) * sizeof(int32); userarray->size = ARR_OVERHEAD(1) + length(newlist) * sizeof(int32);
userarray->flags = 0; 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_LBOUND(userarray)[0] = 1; /* axis starts at one */
ARR_DIMS(userarray)[0] = length(newlist); /* axis is this long */ ARR_DIMS(userarray)[0] = length(newlist); /* axis is this long */
/* fill the array */ /* fill the array */
@ -1150,7 +1150,7 @@ AlterGroup(AlterGroupStmt *stmt, const char *tag)
} }
} /* endif alter group add user */ } /* 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; Datum datum;
bool null; bool null;

View File

@ -13,7 +13,7 @@
* *
* *
* IDENTIFICATION * 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 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_pages; /* Number of pages in pagedesc */
int num_allocated_pages; /* Number of allocated pages in int num_allocated_pages; /* Number of allocated pages in
* pagedesc */ * pagedesc */

View File

@ -31,7 +31,7 @@
* *
* *
* IDENTIFICATION * 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 */ BlockNumber nonempty_pages; /* actually, last nonempty page + 1 */
/* List of TIDs of tuples we intend to delete */ /* List of TIDs of tuples we intend to delete */
/* NB: this list is ordered by TID address */ /* NB: this list is ordered by TID address */
int num_dead_tuples; /* current # of entries */ int num_dead_tuples; /* current # of entries */
int max_dead_tuples; /* # slots allocated in array */ int max_dead_tuples; /* # slots allocated in array */
ItemPointer dead_tuples; /* array of ItemPointerData */ ItemPointer dead_tuples; /* array of ItemPointerData */
/* Array or heap of per-page info about free space */ /* Array or heap of per-page info about free space */
/* We use a simple array until it fills up, then convert to heap */ /* 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 num_free_pages; /* current # of entries */
int max_free_pages; /* # slots allocated in arrays */ int max_free_pages; /* # slots allocated in arrays */
BlockNumber *free_pages; /* array or heap of block numbers */ 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; } LVRelStats;

View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * 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; return false;
} }
#endif #endif

View File

@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * 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->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. * Drop the pin on the referenced buffer, if there is one.

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 typedef enum
{ {
F_EXEC_START, F_EXEC_RUN, F_EXEC_DONE F_EXEC_START, F_EXEC_RUN, F_EXEC_DONE
} ExecStatus; } ExecStatus;
typedef struct local_es typedef struct local_es

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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); qual = lnext(qual);
} }
if (!prev_matches) 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 */ /* Duplicate tuple, so drop it and loop back for another */
ExecClearTuple(slot); ExecClearTuple(slot);
} }
@ -701,10 +701,10 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent)
Expr *clause; /* one clause of index qual */ Expr *clause; /* one clause of index qual */
Oper *op; /* operator used in clause */ Oper *op; /* operator used in clause */
Node *leftop; /* expr on lhs of operator */ Node *leftop; /* expr on lhs of operator */
Node *rightop; /* expr on rhs ... */ Node *rightop; /* expr on rhs ... */
bits16 flags = 0; bits16 flags = 0;
int scanvar; /* which var identifies varattno */ int scanvar; /* which var identifies varattno */
AttrNumber varattno = 0; /* att number used in scan */ AttrNumber varattno = 0; /* att number used in scan */
Oid opid; /* operator id used in scan */ Oid opid; /* operator id used in scan */
Datum scanvalue = 0; /* value used in scan (if const) */ Datum scanvalue = 0; /* value used in scan (if const) */

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 * Similarly, when scanning backwards, we must re-fetch the last
* tuple in the offset region before we can return NULL. Otherwise * tuple in the offset region before we can return NULL. Otherwise
* we won't be correctly aligned to start going forward again. * we won't be correctly aligned to start going forward again. So,
* So, although you might think we can quit when position equals * although you might think we can quit when position equals
* offset + 1, we have to fetch a subplan tuple first, and then * offset + 1, we have to fetch a subplan tuple first, and then
* exit when position = offset. * exit when position = offset.
*/ */

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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: default:
elog(ERROR, "ExecMergeJoin: unsupported join type %d", elog(ERROR, "ExecMergeJoin: unsupported join type %d",
(int) node->join.jointype); (int) node->join.jointype);
doFillOuter = false; /* keep compiler quiet */ doFillOuter = false; /* keep compiler quiet */
doFillInner = false; doFillInner = false;
break; break;
} }

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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. * tuple table slot is cleared.
*/ */
slot = ExecStoreTuple(tuple,/* tuple to store */ slot = ExecStoreTuple(tuple, /* tuple to store */
slot, /* slot to store in */ slot, /* slot to store in */
scandesc->rs_cbuf, /* buffer associated with scandesc->rs_cbuf, /* buffer associated with
* this tuple */ * this tuple */

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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. * with palloc() and so should not be pfree()'d.
*/ */
ExecStoreTuple(tuple, /* tuple to store */ ExecStoreTuple(tuple, /* tuple to store */
slot,/* slot to store in */ slot, /* slot to store in */
buffer, /* buffer associated with tuple */ buffer, /* buffer associated with tuple */
false); /* don't pfree */ false); /* don't pfree */

View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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; return output;
} }
#endif #endif

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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); sendAuthRequest(pam_port_cludge, AUTH_REQ_PASSWORD);
if (pq_eof() == EOF || pq_getint(&len, 4) == EOF) 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); initStringInfo(&buf);

View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * 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]); pfree((struct CharsetItem *) ChArray[i]);
} }
} }
#endif /* CYR_RECODE */ #endif /* CYR_RECODE */

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 else
return false; return false;
} }
#endif #endif

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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). ** Destructively modifies the join tree (via predicate pullup).
*/ */
static void static void
xfunc_predmig(JoinPath pathnode,/* root of the join tree */ xfunc_predmig(JoinPath pathnode, /* root of the join tree */
Stream streamroot, Stream streamroot,
Stream laststream,/* for recursive calls -- these are the Stream laststream,/* for recursive calls -- these are the
* root of the stream under construction, * 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_groupup((Stream) get_downstream(temp))) &&
get_grouprank(parent) < get_grouprank(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_groupup(temp, true);
set_groupcost(temp, set_groupcost(temp,
get_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 ** xfunc_free_stream

View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * 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, xfunc_pullup(Query *queryInfo,
Path childpath, Path childpath,
JoinPath parentpath, 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 whichchild, /* whether child is INNER or OUTER of join */
int clausetype) /* whether clause to pull is join or local */ int clausetype) /* whether clause to pull is join or local */
{ {

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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"); printf("\n");
fflush(stdout); fflush(stdout);
} }
#endif /* OPTIMIZER_DEBUG */ #endif /* OPTIMIZER_DEBUG */

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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->indexinfo = lappend(pathnode->indexinfo, best_indexinfo);
pathnode->indexqual = lappend(pathnode->indexqual, best_indexqual); 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.startup_cost = best_startup_cost;
pathnode->path.total_cost += best_total_cost; pathnode->path.total_cost += best_total_cost;

View File

@ -11,7 +11,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * 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) if (key1 == NIL && key2 == NIL)
return PATHKEYS_EQUAL; return PATHKEYS_EQUAL;
if (key1 != NIL) if (key1 != NIL)
return PATHKEYS_BETTER1; /* key1 is longer */ return PATHKEYS_BETTER1; /* key1 is longer */
return PATHKEYS_BETTER2; /* key2 is longer */ return PATHKEYS_BETTER2; /* key2 is longer */
} }
@ -367,7 +367,7 @@ compare_noncanonical_pathkeys(List *keys1, List *keys2)
if (key1 == NIL && key2 == NIL) if (key1 == NIL && key2 == NIL)
return PATHKEYS_EQUAL; return PATHKEYS_EQUAL;
if (key1 != NIL) if (key1 != NIL)
return PATHKEYS_BETTER1; /* key1 is longer */ return PATHKEYS_BETTER1; /* key1 is longer */
return PATHKEYS_BETTER2; /* key2 is longer */ return PATHKEYS_BETTER2; /* key2 is longer */
} }

View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * 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. * the returned varattno must be 1.
*/ */
Assert(index->indproc != InvalidOid); 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 */ /* classlist[0] is the only class of a functional index */
*opclass = index->classlist[0]; *opclass = index->classlist[0];
@ -1895,4 +1895,5 @@ generate_fjoin(List *tlist)
return newTlist; return newTlist;
return tlist; /* do nothing for now - ay 10/94 */ return tlist; /* do nothing for now - ay 10/94 */
} }
#endif #endif

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 * target list entries for upper Var references wouldn't do the
* right thing (the entries wouldn't go to NULL when they're * right thing (the entries wouldn't go to NULL when they're
* supposed to). Suppressing the pullup is an ugly, * supposed to). Suppressing the pullup is an ugly,
* performance-losing hack, but I see no alternative for now. * performance-losing hack, but I see no alternative for now. Find
* Find a better way to handle this when we redesign query trees * a better way to handle this when we redesign query trees ---
* --- tgl 4/30/01. * tgl 4/30/01.
*/ */
switch (j->jointype) switch (j->jointype)
{ {

View File

@ -216,4 +216,5 @@ inspectOpNode(Expr *expr)
secondExpr = lsecond(expr->args); secondExpr = lsecond(expr->args);
return (firstExpr && secondExpr && nodeTag(firstExpr) == T_Var && nodeTag(secondExpr) == T_Const); return (firstExpr && secondExpr && nodeTag(firstExpr) == T_Var && nodeTag(secondExpr) == T_Const);
} }
#endif /* ENABLE_KEY_SET_QUERY */ #endif /* ENABLE_KEY_SET_QUERY */

View File

@ -14,7 +14,7 @@
* *
* *
* IDENTIFICATION * 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); adjust_inherited_attrs_mutator((Node *) oldinfo->clause, context);
newinfo->subclauseindices = NIL; newinfo->subclauseindices = NIL;
newinfo->eval_cost = -1; /* reset these too */ newinfo->eval_cost = -1; /* reset these too */
newinfo->this_selec = -1; newinfo->this_selec = -1;
newinfo->left_pathkey = NIL; /* and these */ newinfo->left_pathkey = NIL; /* and these */
newinfo->right_pathkey = NIL; newinfo->right_pathkey = NIL;

View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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 = makeNode(Constraint);
constraint->contype = CONSTR_UNIQUE; constraint->contype = CONSTR_UNIQUE;
constraint->name = NULL; /* assign later */ constraint->name = NULL; /* assign later */
column->constraints = lappend(column->constraints, constraint); column->constraints = lappend(column->constraints, constraint);
constraint = makeNode(Constraint); constraint = makeNode(Constraint);

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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); right = make_operand(opname, rtree, rtypeId, opform->oprright);
} }
newop = makeOper(oprid(tup),/* opno */ newop = makeOper(oprid(tup), /* opno */
InvalidOid,/* opid */ InvalidOid, /* opid */
opform->oprresult); /* operator result type */ opform->oprresult); /* operator result type */
result = makeNode(Expr); result = makeNode(Expr);
@ -467,7 +467,7 @@ make_const(Value *value)
case T_String: case T_String:
val = DirectFunctionCall1(textin, CStringGetDatum(strVal(value))); val = DirectFunctionCall1(textin, CStringGetDatum(strVal(value)));
typeid = UNKNOWNOID; /* will be coerced later */ typeid = UNKNOWNOID; /* will be coerced later */
typelen = -1; /* variable len */ typelen = -1; /* variable len */
typebyval = false; typebyval = false;
break; break;

View File

@ -607,4 +607,5 @@ findMain(void)
free(buf); free(buf);
return ret; return ret;
} }
#endif /* HAVE_DLOPEN */ #endif /* HAVE_DLOPEN */

View File

@ -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 * @(#)dlfcn.h 1.4 revision of 95/04/25 09:36:52
* This is an unpublished work copyright (c) 1992 HELIOS Software GmbH * This is an unpublished work copyright (c) 1992 HELIOS Software GmbH
@ -42,6 +42,7 @@ extern "C"
void *dlsym(void *handle, const char *symbol); void *dlsym(void *handle, const char *symbol);
char *dlerror(void); char *dlerror(void);
int dlclose(void *handle); int dlclose(void *handle);
#else #else
void *dlopen(); void *dlopen();
void *dlsym(); void *dlsym();
@ -60,4 +61,5 @@ extern "C"
#define pg_dlsym dlsym #define pg_dlsym dlsym
#define pg_dlclose dlclose #define pg_dlclose dlclose
#define pg_dlerror dlerror #define pg_dlerror dlerror
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */

View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * 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); return dld_strerror(dld_errno);
} }
#endif /* not HAVE_DLOPEN */ #endif /* not HAVE_DLOPEN */

View File

@ -33,4 +33,5 @@ do { \
free(handle); \ free(handle); \
} while (0) } while (0)
#endif /* not HAVE_DLOPEN */ #endif /* not HAVE_DLOPEN */
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */

View File

@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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_dlsym dlsym
#define pg_dlclose dlclose #define pg_dlclose dlclose
#define pg_dlerror dlerror #define pg_dlerror dlerror
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */

View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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_dlopen(const char *filename, int num);
void *BSD44_derived_dlsym(void *handle, const char *name); void *BSD44_derived_dlsym(void *handle, const char *name);
void BSD44_derived_dlclose(void *handle); void BSD44_derived_dlclose(void *handle);
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */

View File

@ -30,4 +30,5 @@
#define pg_dlsym dlsym #define pg_dlsym dlsym
#define pg_dlclose dlclose #define pg_dlclose dlclose
#define pg_dlerror dlerror #define pg_dlerror dlerror
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */

View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * 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); return dld_strerror(dld_errno);
#endif #endif
} }
#endif #endif

View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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_dlclose dlclose
#define pg_dlerror dlerror #define pg_dlerror dlerror
#endif /* HAVE_DLOPEN */ #endif /* HAVE_DLOPEN */
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */

View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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_dlopen(const char *filename, int num);
void *BSD44_derived_dlsym(void *handle, const char *name); void *BSD44_derived_dlsym(void *handle, const char *name);
void BSD44_derived_dlclose(void *handle); void BSD44_derived_dlclose(void *handle);
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */

View File

@ -22,4 +22,5 @@ char *next_dlerror(void);
#define pg_dlerror next_dlerror #define pg_dlerror next_dlerror
/* port.c */ /* port.c */
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */

View File

@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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_dlopen(const char *filename, int num);
void *BSD44_derived_dlsym(void *handle, const char *name); void *BSD44_derived_dlsym(void *handle, const char *name);
void BSD44_derived_dlclose(void *handle); void BSD44_derived_dlclose(void *handle);
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */

View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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_dlsym(h, f) ((PGFunction) dlsym(h, f))
#define pg_dlclose(h) dlclose(h) #define pg_dlclose(h) dlclose(h)
#define pg_dlerror() dlerror() #define pg_dlerror() dlerror()
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */

View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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 #define pg_dlerror dlerror
/* port.c */ /* port.c */
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */

View File

@ -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 #ifndef DYNLOADER_SOLARIS_H
#define DYNLOADER_SOLARIS_H #define DYNLOADER_SOLARIS_H
@ -10,4 +10,5 @@
#define pg_dlsym dlsym #define pg_dlsym dlsym
#define pg_dlclose dlclose #define pg_dlclose dlclose
#define pg_dlerror dlerror #define pg_dlerror dlerror
#endif /* DYNLOADER_SOLARIS_H */ #endif /* DYNLOADER_SOLARIS_H */

View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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_dlsym dlsym
#define pg_dlclose dlclose #define pg_dlclose dlclose
#define pg_dlerror dlerror #define pg_dlerror dlerror
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */

View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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_dlsym dlsym
#define pg_dlclose dlclose #define pg_dlclose dlclose
#define pg_dlerror dlerror #define pg_dlerror dlerror
#endif /* DYNLOADER_H */ #endif /* DYNLOADER_H */

View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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 typedef enum
{ {
DL_NEEDRELOC, /* still need relocation */ DL_NEEDRELOC, /* still need relocation */
DL_RELOCATED, /* no relocation necessary */ DL_RELOCATED, /* no relocation necessary */
DL_INPROG /* relocation in progress */ DL_INPROG /* relocation in progress */
} dlRStatus; } dlRStatus;
typedef struct JmpTbl typedef struct JmpTbl
@ -120,4 +120,5 @@ extern char *dl_error( /* void */ );
extern char **dl_undefinedSymbols( /* int *count */ ); extern char **dl_undefinedSymbols( /* int *count */ );
extern void dl_printAllSymbols( /* void *handle */ ); extern void dl_printAllSymbols( /* void *handle */ );
extern void dl_setLibraries( /* char *libs */ ); extern void dl_setLibraries( /* char *libs */ );
#endif /* _DL_HEADER_ */ #endif /* _DL_HEADER_ */

View File

@ -30,4 +30,5 @@
#define pg_dlsym dlsym #define pg_dlsym dlsym
#define pg_dlclose dlclose #define pg_dlclose dlclose
#define pg_dlerror dlerror #define pg_dlerror dlerror
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */

View File

@ -30,4 +30,5 @@
#define pg_dlsym dlsym #define pg_dlsym dlsym
#define pg_dlclose dlclose #define pg_dlclose dlclose
#define pg_dlerror dlerror #define pg_dlerror dlerror
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */

View File

@ -30,4 +30,5 @@
#define pg_dlsym dlsym #define pg_dlsym dlsym
#define pg_dlclose dlclose #define pg_dlclose dlclose
#define pg_dlerror dlerror #define pg_dlerror dlerror
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */

View File

@ -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" #include "c.h"
@ -78,4 +78,5 @@ isinf(double x)
return -1; return -1;
return 0; return 0;
} }
#endif #endif

View File

@ -55,4 +55,5 @@ getcwd(char *buf, size_t size)
{ {
return getwd(buf); return getwd(buf);
} }
#endif #endif

View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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. */ /* Control Commands. */
#define IPC_RMID 0 /* remove identifier */ #define IPC_RMID 0 /* remove identifier */
#define IPC_STAT 1 /* get shm status */ #define IPC_STAT 1 /* get shm status */
#endif /* _SYS_IPC_H */ #endif /* _SYS_IPC_H */

View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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); nsets = PROC_SEM_MAP_ENTRIES(MaxBackends);
sem_info_size = sizeof(struct sem_info) + (nsets - 1) * sizeof(struct sem_set_info); sem_info_size = sizeof(struct sem_info) + (nsets - 1) * sizeof(struct sem_set_info);
ltrunc(fd, sem_info_size, SEEK_SET); 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 */ { /* error is EBADF */
close(fd); close(fd);
return -1; return -1;

View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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 #ifdef __cplusplus
} }
#endif #endif
#endif /* _SYS_SEM_H */ #endif /* _SYS_SEM_H */

View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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 #ifdef __cplusplus
} }
#endif #endif
#endif /* _SYS_SHM_H */ #endif /* _SYS_SHM_H */

Some files were not shown because too many files have changed in this diff Show More