rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New pgindent run with fixes suggested by Tom. Patch manually reviewed, 

initdb/regression tests pass.
This commit is contained in:
Bruce Momjian 2001-11-05 17:46:40 +00:00
parent 34153b2052
commit ea08e6cd55
503 changed files with 1648 additions and 1610 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/btree_gist/btree_gist.c
View File

@ -15,20 +15,20 @@ typedef struct intkey
{
int4 lower;
int4 upper;
} INT4KEY;
} INT4KEY;
typedef struct tskey
{
Timestamp lower;
Timestamp upper;
} TSKEY;
} TSKEY;
/* used for sorting */
typedef struct rix
{
int index;
char *r;
} RIX;
} RIX;
/*
** int4key in/out

4
contrib/chkpass/chkpass.c
View File

@ -4,7 +4,7 @@
* darcy@druid.net
* http://www.druid.net/darcy/
*
* $Id: chkpass.c,v 1.5 2001/10/25 05:49:19 momjian Exp $
* $Id: chkpass.c,v 1.6 2001/11/05 17:46:22 momjian Exp $
* best viewed with tabs set to 4
*/
@ -32,7 +32,7 @@
typedef struct chkpass
{
char password[16];
} chkpass;
} chkpass;
/*
* Various forward declarations:

2
contrib/cube/cubedata.h
View File

@ -3,4 +3,4 @@ typedef struct NDBOX
unsigned int size; /* required to be a Postgres varlena type */
unsigned int dim;
float x[1];
} NDBOX;
} NDBOX;

12
contrib/dbase/dbf.h
View File

@ -51,7 +51,7 @@ typedef struct
u_char dbh_hlen[2]; /* length of this header */
u_char dbh_rlen[2]; /* length of a record */
u_char dbh_stub[20]; /* misc stuff we don't need */
} dbf_header;
} dbf_header;
/* disk field-description */
@ -64,7 +64,7 @@ typedef struct
u_char dbf_dec; /* number of decimal positions if type is
* 'N' */
u_char dbf_stub[14]; /* stuff we don't need */
} dbf_field;
} dbf_field;
/* memory field-description */
@ -74,7 +74,7 @@ typedef struct
u_char db_type; /* field-type */
u_char db_flen; /* field-length */
u_char db_dec; /* number of decimal positions */
} f_descr;
} f_descr;
/* memory dfb-header */
@ -95,7 +95,7 @@ typedef struct
u_char *db_buff; /* record-buffer to save malloc()'s */
f_descr *db_fields; /* pointer to an array of field-
* descriptions */
} dbhead;
} dbhead;
/* structure that contains everything a user wants from a field, including
the contents (in ASCII). Warning! db_flen may be bigger than the actual
@ -109,7 +109,7 @@ typedef struct
u_char db_flen; /* field-length */
u_char db_dec; /* number of decimal positions */
u_char *db_contents; /* contents of the field in ASCII */
} field;
} field;
/* prototypes for functions */
@ -136,4 +136,4 @@ 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 */
#endif /* _DBF_H */

4
contrib/dblink/dblink.h
View File

@ -54,7 +54,7 @@ typedef struct
*/
PGresult *res;
} dblink_results;
} dblink_results;
/*
* External declarations
@ -67,4 +67,4 @@ extern Datum dblink_tok(PG_FUNCTION_ARGS);
*/
dblink_results *init_dblink_results(MemoryContext fn_mcxt);
#endif /* DBLINK_H */
#endif /* DBLINK_H */

6
contrib/fulltextindex/fti.c
View File

@ -103,7 +103,7 @@ char *StopWords[] = { /* list of words to skip in indexing */
"the",
"yes"
};
#endif /* USE_STOP_WORDS */
#endif /* USE_STOP_WORDS */
/* stuff for caching query-plans, stolen from contrib/spi/\*.c */
typedef struct
@ -111,7 +111,7 @@ typedef struct
char *ident;
int nplans;
void **splan;
} EPlan;
} EPlan;
static EPlan *InsertPlans = NULL;
static EPlan *DeletePlans = NULL;
@ -403,7 +403,7 @@ is_stopword(char *text)
else
StopHigh = StopMiddle;
}
#endif /* USE_STOP_WORDS */
#endif /* USE_STOP_WORDS */
return (false);
}

2
contrib/fuzzystrmatch/fuzzystrmatch.h
View File

@ -169,4 +169,4 @@ char _codes[26] = {
/* These prevent GH from becoming F */
#define NOGHTOF(c) (ENCODE(c) & 16) /* BDH */
#endif /* FUZZYSTRMATCH_H */
#endif /* FUZZYSTRMATCH_H */

6
contrib/isbn_issn/isbn_issn.c
View File

@ -1,7 +1,7 @@
/*
* PostgreSQL type definitions for ISBNs.
*
* $Id: isbn_issn.c,v 1.3 2001/02/10 02:31:25 tgl Exp $
* $Id: isbn_issn.c,v 1.4 2001/11/05 17:46:23 momjian Exp $
*/
#include "postgres.h"
@ -16,7 +16,7 @@ typedef struct isbn
{
char num[13];
char pad[3];
} isbn;
} isbn;
/*
* Various forward declarations:
@ -204,7 +204,7 @@ typedef struct issn
{
char num[9];
char pad[7];
} issn;
} issn;
/*
* Various forward declarations:

10
contrib/pg_dumplo/pg_dumplo.h
View File

@ -1,7 +1,7 @@
/* -------------------------------------------------------------------------
* pg_dumplo
*
* $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/pg_dumplo.h,v 1.6 2001/10/28 06:25:40 momjian Exp $
* $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/pg_dumplo.h,v 1.7 2001/11/05 17:46:23 momjian Exp $
*
* Karel Zak 1999-2000
* -------------------------------------------------------------------------
@ -41,7 +41,7 @@ typedef struct
char *lo_table,
*lo_attr;
Oid lo_oid;
} LOlist;
} LOlist;
typedef struct
{
@ -60,7 +60,7 @@ typedef struct
quiet;
PGresult *res;
PGconn *conn;
} LODumpMaster;
} LODumpMaster;
typedef enum
{
@ -69,7 +69,7 @@ typedef enum
ACTION_EXPORT_ATTR,
ACTION_EXPORT_ALL,
ACTION_IMPORT
} PGLODUMP_ACTIONS;
} PGLODUMP_ACTIONS;
extern char *progname;
@ -79,4 +79,4 @@ extern void load_lolist(LODumpMaster * pgLO);
extern void pglo_export(LODumpMaster * pgLO);
extern void pglo_import(LODumpMaster * pgLO);
#endif /* PG_DUMPLO_H */
#endif /* PG_DUMPLO_H */

2
contrib/pg_logger/pg_logger.c
View File

@ -18,7 +18,7 @@ struct
const char *tag;
int size;
int priority;
} tags[] =
} tags[] =
{
{

14
contrib/pg_resetxlog/pg_resetxlog.c
View File

@ -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.9 2001/10/28 06:25:41 momjian Exp $
* $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.10 2001/11/05 17:46:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -221,7 +221,7 @@ typedef struct crc64V0
{
uint32 crc1;
uint32 crc2;
} crc64V0;
} crc64V0;
static uint32 crc_tableV0[] = {
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
@ -309,7 +309,7 @@ typedef struct ControlFileDataV0
char lc_collate[LOCALE_NAME_BUFLEN_V0];
char lc_ctype[LOCALE_NAME_BUFLEN_V0];
char archdir[MAXPGPATH]; /* where to move offline log files */
} ControlFileDataV0;
} ControlFileDataV0;
typedef struct CheckPointV0
{
@ -323,7 +323,7 @@ typedef struct CheckPointV0
TransactionId nextXid;
Oid nextOid;
bool Shutdown;
} CheckPointV0;
} CheckPointV0;
typedef struct XLogRecordV0
{
@ -334,14 +334,14 @@ typedef struct XLogRecordV0
uint16 xl_len; /* total len of record *data* */
uint8 xl_info;
RmgrId xl_rmid; /* resource manager inserted this record */
} XLogRecordV0;
} XLogRecordV0;
#define SizeOfXLogRecordV0 DOUBLEALIGN(sizeof(XLogRecordV0))
typedef struct XLogContRecordV0
{
uint16 xl_len; /* len of data left */
} XLogContRecordV0;
} XLogContRecordV0;
#define SizeOfXLogContRecordV0 DOUBLEALIGN(sizeof(XLogContRecordV0))
@ -351,7 +351,7 @@ typedef struct XLogPageHeaderDataV0
{
uint32 xlp_magic;
uint16 xlp_info;
} XLogPageHeaderDataV0;
} XLogPageHeaderDataV0;
#define SizeOfXLogPHDV0 DOUBLEALIGN(sizeof(XLogPageHeaderDataV0))

10
contrib/pgbench/pgbench.c
View File

@ -1,5 +1,5 @@
/*
* $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.12 2001/10/25 05:49:19 momjian Exp $
* $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.13 2001/11/05 17:46:23 momjian Exp $
*
* pgbench: a simple TPC-B like benchmark program for PostgreSQL
* written by Tatsuo Ishii
@ -39,7 +39,7 @@
/* for getrlimit */
#include <sys/resource.h>
#endif /* WIN32 */
#endif /* WIN32 */
/********************************************************************
* some configurable parameters */
@ -90,7 +90,7 @@ typedef struct
int tid; /* teller id for this transaction */
int delta;
int abalance;
} CState;
} CState;
static void
usage()
@ -680,7 +680,7 @@ main(int argc, char **argv)
#else /* but BSD doesn't ... */
if (getrlimit(RLIMIT_OFILE, &rlim) == -1)
{
#endif /* HAVE_RLIMIT_NOFILE */
#endif /* HAVE_RLIMIT_NOFILE */
fprintf(stderr, "getrlimit failed. reason: %s\n", strerror(errno));
exit(1);
}
@ -690,7 +690,7 @@ main(int argc, char **argv)
fprintf(stderr, "Use limit/ulimt to increase the limit before using pgbench.\n");
exit(1);
}
#endif /* #ifndef __CYGWIN__ */
#endif /* #ifndef __CYGWIN__ */
break;
case 'C':
is_connect = 1;

2
contrib/pgcrypto/blf.c
View File

@ -48,7 +48,7 @@
#define inline __inline
#else /* !__GNUC__ */
#define inline
#endif /* !__GNUC__ */
#endif /* !__GNUC__ */
/* Function for Feistel Networks */

2
contrib/pgcrypto/blf.h
View File

@ -50,7 +50,7 @@ typedef struct BlowfishContext
{
uint32 S[4][256]; /* S-Boxes */
uint32 P[BLF_N + 2]; /* Subkeys */
} blf_ctx;
} blf_ctx;
/* Raw access to customized Blowfish
* blf_key is just:

2
contrib/pgcrypto/crypt-blowfish.c
View File

@ -61,7 +61,7 @@ typedef struct
{
BF_word S[4][0x100];
BF_key P;
} BF_ctx;
} BF_ctx;
/*
* Magic IV for 64 Blowfish encryptions that we do at the end.

2
contrib/pgcrypto/crypt-des.c
View File

@ -713,7 +713,7 @@ px_crypt_des(const char *key, const char *setting)
p = output + strlen(output);
}
else
#endif /* !DISABLE_XDES */
#endif /* !DISABLE_XDES */
{
/*
* "old"-style: setting - 2 bytes of salt key - up to 8 characters

6
contrib/pgcrypto/internal.c
View File

@ -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.7 2001/10/28 06:25:41 momjian Exp $
* $Id: internal.c,v 1.8 2001/11/05 17:46:23 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[] =
{
{

6
contrib/pgcrypto/md5.h
View File

@ -1,4 +1,4 @@
/* $Id: md5.h,v 1.6 2001/10/28 06:25:41 momjian Exp $ */
/* $Id: md5.h,v 1.7 2001/11/05 17:46:23 momjian Exp $ */
/* $KAME: md5.h,v 1.3 2000/02/22 14:01:18 itojun Exp $ */
/*
@ -59,7 +59,7 @@ typedef struct
unsigned int md5_i;
uint8 md5_buf[MD5_BUFLEN];
} md5_ctxt;
} md5_ctxt;
extern void md5_init(md5_ctxt *);
extern void md5_loop(md5_ctxt *, const uint8 *, unsigned int);
@ -76,4 +76,4 @@ do { \
md5_result((x), (y)); \
} while (0)
#endif /* ! _NETINET6_MD5_H_ */
#endif /* ! _NETINET6_MD5_H_ */

14
contrib/pgcrypto/openssl.c
View File

@ -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.7 2001/10/28 06:25:41 momjian Exp $
* $Id: openssl.c,v 1.8 2001/11/05 17:46:23 momjian Exp $
*/
#include <postgres.h>
@ -110,7 +110,7 @@ typedef struct
uint8 iv[EVP_MAX_IV_LENGTH];
uint klen;
uint init;
} ossldata;
} ossldata;
/* generic EVP */
@ -324,35 +324,35 @@ struct
{
char *name;
PX_Cipher cf;
} spec_types[] =
} spec_types[] =
{
{
"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
}
},
{

4
contrib/pgcrypto/px-crypt.c
View File

@ -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.4 2001/10/28 06:25:41 momjian Exp $
* $Id: px-crypt.c,v 1.5 2001/11/05 17:46:23 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[] =
{
{

6
contrib/pgcrypto/px-crypt.h
View File

@ -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.4 2001/10/28 06:25:41 momjian Exp $
* $Id: px-crypt.h,v 1.5 2001/11/05 17:46:23 momjian Exp $
*/
#ifndef _PX_CRYPT_H
@ -88,6 +88,6 @@ char *px_crypt_des(const char *key, const char *setting);
/* crypt-md5.c */
char *px_crypt_md5(const char *pw, const char *salt,
char *dst, unsigned dstlen);
#endif /* !PX_SYSTEM_CRYPT */
#endif /* !PX_SYSTEM_CRYPT */
#endif /* _PX_CRYPT_H */
#endif /* _PX_CRYPT_H */

4
contrib/pgcrypto/px.h
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: px.h,v 1.3 2001/10/25 05:49:20 momjian Exp $
* $Id: px.h,v 1.4 2001/11/05 17:46:23 momjian Exp $
*/
#ifndef __PX_H
@ -180,4 +180,4 @@ const char *px_resolve_alias(const PX_Alias * aliases, const char *name);
(c)->decrypt(c, data, dlen, res, rlen)
#define px_combo_free(c) (c)->free(c)
#endif /* __PX_H */
#endif /* __PX_H */

8
contrib/pgcrypto/random.c
View File

@ -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.4 2001/10/28 06:25:41 momjian Exp $
* $Id: random.c,v 1.5 2001/11/05 17:46:23 momjian Exp $
*/
@ -77,7 +77,7 @@ px_get_random_bytes(uint8 *dst, unsigned count)
close(fd);
return res;
}
#endif /* RAND_DEV */
#endif /* RAND_DEV */
#ifdef RAND_SILLY
@ -90,7 +90,7 @@ px_get_random_bytes(uint8 *dst, unsigned count)
*dst++ = random();
return i;
}
#endif /* RAND_SILLY */
#endif /* RAND_SILLY */
#ifdef RAND_OPENSSL
@ -125,4 +125,4 @@ px_get_random_bytes(uint8 *dst, unsigned count)
return -1;
}
#endif /* RAND_OPENSSL */
#endif /* RAND_OPENSSL */

4
contrib/pgcrypto/rijndael.c
View File

@ -97,7 +97,7 @@ static u4byte il_tab[4][256];
#endif
static u4byte tab_gen = 0;
#endif /* !PRE_CALC_TABLES */
#endif /* !PRE_CALC_TABLES */
#define ff_mult(a,b) (a && b ? pow_tab[(log_tab[a] + log_tab[b]) % 255] : 0)
@ -251,7 +251,7 @@ gen_tabs(void)
}
tab_gen = 1;
#endif /* !PRE_CALC_TABLES */
#endif /* !PRE_CALC_TABLES */
}

4
contrib/pgcrypto/rijndael.h
View File

@ -33,7 +33,7 @@ typedef struct _rijndael_ctx
int decrypt;
u4byte e_key[64];
u4byte d_key[64];
} rijndael_ctx;
} rijndael_ctx;
/* 2. Standard interface for AES cryptographic routines */
@ -54,4 +54,4 @@ void aes_ecb_decrypt(rijndael_ctx * ctx, uint8 *data, unsigned len);
void aes_cbc_encrypt(rijndael_ctx * ctx, uint8 *iva, uint8 *data, unsigned len);
void aes_cbc_decrypt(rijndael_ctx * ctx, uint8 *iva, uint8 *data, unsigned len);
#endif /* _RIJNDAEL_H_ */
#endif /* _RIJNDAEL_H_ */

4
contrib/pgcrypto/sha1.c
View File

@ -1,4 +1,4 @@
/* $Id: sha1.c,v 1.9 2001/10/28 06:25:41 momjian Exp $ */
/* $Id: sha1.c,v 1.10 2001/11/05 17:46:23 momjian Exp $ */
/* $KAME: sha1.c,v 1.3 2000/02/22 14:01:18 itojun Exp $ */
/*
@ -346,4 +346,4 @@ sha1_result(struct sha1_ctxt * ctxt, uint8 *digest0)
#endif
}
#endif /* unsupported */
#endif /* unsupported */

4
contrib/pgcrypto/sha1.h
View File

@ -1,4 +1,4 @@
/* $Id: sha1.h,v 1.7 2001/10/28 06:25:41 momjian Exp $ */
/* $Id: sha1.h,v 1.8 2001/11/05 17:46:23 momjian Exp $ */
/* $KAME: sha1.h,v 1.4 2000/02/22 14:01:18 itojun Exp $ */
/*
@ -72,4 +72,4 @@ typedef struct sha1_ctxt SHA1_CTX;
#define SHA1_RESULTLEN (160/8)
#endif /* _NETINET6_SHA1_H_ */
#endif /* _NETINET6_SHA1_H_ */

2
contrib/seg/segdata.h
View File

@ -6,4 +6,4 @@ typedef struct SEG
char u_sigd;
char l_ext;
char u_ext;
} SEG;
} SEG;

2
contrib/spi/refint.c
View File

@ -17,7 +17,7 @@ typedef struct
char *ident;
int nplans;
void **splan;
} EPlan;
} EPlan;
static EPlan *FPlans = NULL;
static int nFPlans = 0;

2
contrib/spi/timetravel.c
View File

@ -17,7 +17,7 @@ typedef struct
{
char *ident;
void *splan;
} EPlan;
} EPlan;
static EPlan *Plans = NULL; /* for UPDATE/DELETE */
static int nPlans = 0;

2
contrib/tsearch/gistidx.h
View File

@ -46,7 +46,7 @@ typedef struct
int4 len;
int4 flag;
char data[1];
} GISTTYPE;
} GISTTYPE;
#define ARRKEY 0x01
#define SIGNKEY 0x02

2
contrib/tsearch/morph.c
View File

@ -34,7 +34,7 @@ typedef struct
char *(*lemmatize) (void *, char *, int *);
int (*is_stoplemm) (void *, char *, int);
int (*is_stemstoplemm) (void *, char *, int);
} DICT;
} DICT;
/* insert all dictionaries */
#define DICT_BODY

8
contrib/tsearch/query.c
View File

@ -72,7 +72,7 @@ typedef struct NODE
int2 distance;
int2 length;
struct NODE *next;
} NODE;
} NODE;
typedef struct
{
@ -92,7 +92,7 @@ typedef struct
/* state for value's parser */
TI_IN_STATE valstate;
} QPRS_STATE;
} QPRS_STATE;
/*
* get token from query string
@ -322,7 +322,7 @@ typedef struct
WordEntry *arre;
char *values;
char *operand;
} CHKVAL;
} CHKVAL;
/*
* compare 2 string values
@ -626,7 +626,7 @@ typedef struct
char *cur;
char *op;
int4 buflen;
} INFIX;
} INFIX;
#define RESIZEBUF(inf,addsize) \
while( ( inf->cur - inf->buf ) + addsize + 1 >= inf->buflen ) \

4
contrib/tsearch/query.h
View File

@ -17,7 +17,7 @@ typedef struct ITEM
/* user-friendly value */
uint16 distance;
uint16 length;
} ITEM;
} ITEM;
/*
*Storage:
@ -28,7 +28,7 @@ typedef struct
int4 len;
int4 size;
char data[1];
} QUERYTYPE;
} QUERYTYPE;
#define HDRSIZEQT ( 2*sizeof(int4) )
#define COMPUTESIZE(size,lenofoperand) ( HDRSIZEQT + size * sizeof(ITEM) + lenofoperand )

4
contrib/tsearch/rewrite.c
View File

@ -24,7 +24,7 @@ typedef struct NODE
struct NODE *left;
struct NODE *right;
ITEM *valnode;
} NODE;
} NODE;
/*
* make query tree from plain view of query
@ -50,7 +50,7 @@ typedef struct
ITEM *ptr;
int4 len;
int4 cur;
} PLAINTREE;
} PLAINTREE;
static void
plainnode(PLAINTREE * state, NODE * node)

2
contrib/tsearch/txtidx.c
View File

@ -334,7 +334,7 @@ typedef struct
WORD *words;
int4 lenwords;
int4 curwords;
} PRSTEXT;
} PRSTEXT;
/*
* Parse text to lexems

6
contrib/tsearch/txtidx.h
View File

@ -18,14 +18,14 @@ typedef struct
{
uint16 len;
uint16 pos;
} WordEntry;
} WordEntry;
typedef struct
{
int4 len;
int4 size;
char data[1];
} txtidx;
} txtidx;
#define DATAHDRSIZE (sizeof(int4)*2)
#define CALCDATASIZE(x, lenstr) ( x * sizeof(WordEntry) + DATAHDRSIZE + lenstr )
@ -41,7 +41,7 @@ typedef struct
int4 len;
int4 state;
bool oprisdelim;
} TI_IN_STATE;
} TI_IN_STATE;
int4 gettoken_txtidx(TI_IN_STATE * state);

4
contrib/xml/pgxml.h
View File

@ -24,7 +24,7 @@ typedef struct
char *results[MAXRESULTS];
int32 reslens[MAXRESULTS];
char *resbuf; /* pointer to the result buffer for pfree */
} XPath_Results;
} XPath_Results;
@ -36,7 +36,7 @@ typedef struct
char *resptr;
int32 reslen;
XPath_Results *xpres;
} pgxml_udata;
} pgxml_udata;
#define UD ((pgxml_udata *) userData)

4
src/backend/access/gist/gist.c
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.85 2001/10/25 05:49:20 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.86 2001/11/05 17:46:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -1934,7 +1934,7 @@ gist_dumptree(Relation r, int level, BlockNumber blk, OffsetNumber coff)
ReleaseBuffer(buffer);
pfree(pred);
}
#endif /* defined GISTDEBUG */
#endif /* defined GISTDEBUG */
void
gist_redo(XLogRecPtr lsn, XLogRecord *record)

20
src/backend/access/heap/heapam.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.127 2001/11/02 16:30:29 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.128 2001/11/05 17:46:23 momjian Exp $
*
*
* INTERFACE ROUTINES
@ -156,7 +156,7 @@ heapgettup(Relation relation,
elog(DEBUG, "heapgettup: relation(%c)=`%s', %p",
relation->rd_rel->relkind, RelationGetRelationName(relation),
snapshot);
#endif /* !defined(HEAPDEBUGALL) */
#endif /* !defined(HEAPDEBUGALL) */
if (!ItemPointerIsValid(tid))
{
@ -433,7 +433,7 @@ fastgetattr(HeapTuple tup, int attnum, TupleDesc tupleDesc,
)
);
}
#endif /* defined(DISABLE_COMPLEX_MACRO) */
#endif /* defined(DISABLE_COMPLEX_MACRO) */
/* ----------------------------------------------------------------
@ -501,12 +501,12 @@ relation_openr(const char *relationName, LOCKMODE lockmode)
/*
* Check for shared-cache-inval messages before trying to open the
* relation. This is needed to cover the case where the name identifies
* a rel that has been dropped and recreated since the start of our
* transaction: if we don't flush the old relcache entry then we'll
* latch onto that entry and suffer an error when we do LockRelation.
* Note that relation_open does not need to do this, since a relation's
* OID never changes.
* relation. This is needed to cover the case where the name
* identifies a rel that has been dropped and recreated since the
* start of our transaction: if we don't flush the old relcache entry
* then we'll latch onto that entry and suffer an error when we do
* LockRelation. Note that relation_open does not need to do this,
* since a relation's OID never changes.
*
* We skip this if asked for NoLock, on the assumption that the caller
* has already ensured some appropriate lock is held.
@ -757,7 +757,7 @@ elog(DEBUG, "heap_getnext([%s,nkeys=%d],backw=%d) called", \
#define HEAPDEBUG_1
#define HEAPDEBUG_2
#define HEAPDEBUG_3
#endif /* !defined(HEAPDEBUGALL) */
#endif /* !defined(HEAPDEBUGALL) */
HeapTuple

4
src/backend/access/heap/tuptoaster.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/heap/tuptoaster.c,v 1.25 2001/10/25 05:49:21 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/access/heap/tuptoaster.c,v 1.26 2001/11/05 17:46:23 momjian Exp $
*
*
* INTERFACE ROUTINES
@ -1085,4 +1085,4 @@ toast_fetch_datum(varattrib *attr)
return result;
}
#endif /* TUPLE_TOASTER_ACTIVE */
#endif /* TUPLE_TOASTER_ACTIVE */

4
src/backend/access/index/istrat.c
View File

@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.55 2001/10/28 06:25:41 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.56 2001/11/05 17:46:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -641,4 +641,4 @@ IndexStrategyDisplay(IndexStrategy indexStrategy,
}
}
#endif /* defined(ISTRATDEBUG) */
#endif /* defined(ISTRATDEBUG) */

6
src/backend/access/nbtree/nbtree.c
View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.83 2001/10/25 05:49:21 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.84 2001/11/05 17:46:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -119,7 +119,7 @@ btbuild(PG_FUNCTION_ARGS)
#ifdef BTREE_BUILD_STATS
if (Show_btree_build_stats)
ResetUsage();
#endif /* BTREE_BUILD_STATS */
#endif /* BTREE_BUILD_STATS */
/*
* We expect to be called exactly once for any index relation. If
@ -175,7 +175,7 @@ btbuild(PG_FUNCTION_ARGS)
ShowUsage();
ResetUsage();
}
#endif /* BTREE_BUILD_STATS */
#endif /* BTREE_BUILD_STATS */
/* all done */
BuildingBtree = false;

4
src/backend/access/nbtree/nbtsort.c
View File

@ -35,7 +35,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsort.c,v 1.61 2001/10/25 05:49:21 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsort.c,v 1.62 2001/11/05 17:46:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -164,7 +164,7 @@ _bt_leafbuild(BTSpool *btspool, BTSpool *btspool2)
ShowUsage();
ResetUsage();
}
#endif /* BTREE_BUILD_STATS */
#endif /* BTREE_BUILD_STATS */
tuplesort_performsort(btspool->sortstate);
if (btspool2)

4
src/backend/access/rtree/rtree.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.67 2001/10/28 06:25:42 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.68 2001/11/05 17:46:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -1340,7 +1340,7 @@ _rtdump(Relation r)
ReleaseBuffer(buf);
}
}
#endif /* defined RTDEBUG */
#endif /* defined RTDEBUG */
void
rtree_redo(XLogRecPtr lsn, XLogRecord *record)

4
src/backend/access/transam/transam.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.49 2001/10/25 05:49:22 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.50 2001/11/05 17:46:24 momjian Exp $
*
* NOTES
* This file contains the high level access-method interface to the
@ -197,7 +197,7 @@ TransactionIdIsInProgress(TransactionId transactionId)
return TransactionLogTest(transactionId, TRANSACTION_STATUS_IN_PROGRESS);
}
#endif /* NOT_USED */
#endif /* NOT_USED */
/* --------------------------------
* TransactionId Commit

6
src/backend/access/transam/xlog.c
View File

@ -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.81 2001/11/04 19:55:31 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.82 2001/11/05 17:46:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -2052,7 +2052,7 @@ WriteControlFile(void)
#else /* not USE_LOCALE */
strcpy(ControlFile->lc_collate, "C");
strcpy(ControlFile->lc_ctype, "C");
#endif /* not USE_LOCALE */
#endif /* not USE_LOCALE */
/* Contents are protected with a CRC */
INIT_CRC64(ControlFile->crc);
@ -2187,7 +2187,7 @@ ReadControlFile(void)
"\tLC_CTYPE '%s', but the server was compiled without locale support.\n"
"\tIt looks like you need to initdb or recompile.",
ControlFile->lc_collate, ControlFile->lc_ctype);
#endif /* not USE_LOCALE */
#endif /* not USE_LOCALE */
}
void

4
src/backend/catalog/aclchk.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.52 2001/10/25 05:49:22 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.53 2001/11/05 17:46:24 momjian Exp $
*
* NOTES
* See acl.h.
@ -61,7 +61,7 @@ dumpacl(Acl *acl)
DatumGetCString(DirectFunctionCall1(aclitemout,
PointerGetDatum(aip + i))));
}
#endif /* ACLDEBUG */
#endif /* ACLDEBUG */
/*

4
src/backend/catalog/index.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.168 2001/11/02 16:30:29 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.169 2001/11/05 17:46:24 momjian Exp $
*
*
* INTERFACE ROUTINES
@ -2027,7 +2027,7 @@ reindex_relation(Oid relid, bool force)
else
elog(ERROR, "the target relation %u is nailed", relid);
}
#endif /* ENABLE_REINDEX_NAILED_RELATIONS */
#endif /* ENABLE_REINDEX_NAILED_RELATIONS */
/*
* Shared system indexes must be overwritten because it's impossible

4
src/backend/catalog/pg_proc.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.62 2001/10/25 05:49:23 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.63 2001/11/05 17:46:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -157,7 +157,7 @@ ProcedureCreate(char *procedureName,
return retval;
#else
elog(ERROR, "lookup for procedure by source needs fix (Jan)");
#endif /* SETS_FIXED */
#endif /* SETS_FIXED */
}
}

14
src/backend/commands/_deadcode/recipe.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.14 2001/10/25 05:49:27 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.15 2001/11/05 17:46:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -54,13 +54,13 @@ typedef struct _teePlanInfo
char *tpi_relName;
Query *tpi_parsetree;
Plan *tpi_plan;
} TeePlanInfo;
} TeePlanInfo;
typedef struct _teeInfo
{
int num;
TeePlanInfo *val;
} TeeInfo;
} TeeInfo;
QueryTreeList *appendQlist(QueryTreeList * q1, QueryTreeList * q2);
void OffsetVarAttno(Node *node, int varno, int offset);
@ -186,7 +186,7 @@ beginRecipe(RecipeStmt *stmt)
#ifdef DEBUG_RECIPE
elog(NOTICE, "beginRecipe: eyes[%d] = %s\n", i, e->nodeName);
#endif /* DEBUG_RECIPE */
#endif /* DEBUG_RECIPE */
qList = tg_parseSubQuery(r, e->inNodes->val[0], teeInfo);
@ -835,7 +835,7 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo)
#ifdef DEBUG_RECIPE
elog(NOTICE, "calling parser with %s", elem->src);
#endif /* DEBUG_RECIPE */
#endif /* DEBUG_RECIPE */
parameterCount = getParamTypes(elem, typev);
@ -878,7 +878,7 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo)
#ifdef DEBUG_RECIPE
elog(NOTICE, "calling parser with %s", newquery);
#endif /* DEBUG_RECIPE */
#endif /* DEBUG_RECIPE */
qList = parser(newquery, typev, parameterCount);
if (qList->len > 1)
@ -1315,4 +1315,4 @@ replaceTeeScans(Plan *plan, Query *parsetree, TeeInfo * teeInfo)
}
#endif /* TIOGA */
#endif /* TIOGA */

4
src/backend/commands/_deadcode/recipe.h
View File

@ -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.5 2001/10/28 06:25:43 momjian Exp $
* $Id: recipe.h,v 1.6 2001/11/05 17:46:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -17,4 +17,4 @@
extern void beginRecipe(RecipeStmt *stmt);
#endif /* RECIPE_H */
#endif /* RECIPE_H */

6
src/backend/commands/_deadcode/version.c
View File

@ -10,7 +10,7 @@
* doesn't work! - jolly 8/19/95
*
*
* $Id: version.c,v 1.28 2001/10/28 06:25:43 momjian Exp $
* $Id: version.c,v 1.29 2001/11/05 17:46:25 momjian Exp $
*
* NOTES
* At the point the version is defined, 2 physical relations are created
@ -287,7 +287,7 @@ VersionDelete(char *vname, char *bname, char *snapshot)
vname, vname, vname, bname, bname, snapshot, bname);
eval_as_new_xact(rule_buf);
#endif /* OLD_REWRITE */
#endif /* OLD_REWRITE */
}
#endif
@ -338,7 +338,7 @@ VersionReplace(char *vname, char *bname, char *snapshot)
vname, vname, vname, attr_list, bname, bname, snapshot, vname, bname);
eval_as_new_xact(rule_buf);
#endif /* OLD_REWRITE */
#endif /* OLD_REWRITE */
/* printf("%s\n",rule_buf); */
}

8
src/backend/commands/command.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.149 2001/11/02 16:30:29 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.150 2001/11/05 17:46:24 momjian Exp $
*
* NOTES
* The PerformAddAttribute() code, like most of the relation
@ -819,7 +819,7 @@ typedef struct SysScanDescData
IndexScanDesc iscan;
HeapTupleData tuple;
Buffer buffer;
} SysScanDescData, *SysScanDesc;
} SysScanDescData, *SysScanDesc;
static void *
systable_beginscan(Relation rel, const char *indexRelname, int nkeys, ScanKey entry)
@ -1017,7 +1017,7 @@ RemoveColumnReferences(Oid reloid, int attnum, bool checkonly, HeapTuple reltup)
return checkok;
}
#endif /* _DROP_COLUMN_HACK__ */
#endif /* _DROP_COLUMN_HACK__ */
/*
* ALTER TABLE DROP COLUMN
@ -1174,7 +1174,7 @@ AlterTableDropColumn(const char *relationName,
heap_close(rel, NoLock);
#else
elog(ERROR, "ALTER TABLE / DROP COLUMN is not implemented");
#endif /* _DROP_COLUMN_HACK__ */
#endif /* _DROP_COLUMN_HACK__ */
}

4
src/backend/commands/remove.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.64 2001/10/25 05:49:25 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.65 2001/11/05 17:46:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -227,7 +227,7 @@ AttributeAndRelationRemove(Oid typeOid)
}
heap_close(rel, RowExclusiveLock);
}
#endif /* NOTYET */
#endif /* NOTYET */
/*
* TypeRemove

6
src/backend/commands/rename.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.60 2001/11/02 16:30:29 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.61 2001/11/05 17:46:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -258,8 +258,8 @@ renamerel(const char *oldrelname, const char *newrelname)
return; /* all done... */
/*
* Grab an exclusive lock on the target table or index, which we will NOT
* release until end of transaction.
* Grab an exclusive lock on the target table or index, which we will
* NOT release until end of transaction.
*/
targetrelation = relation_openr(oldrelname, AccessExclusiveLock);

4
src/backend/commands/sequence.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.66 2001/10/28 06:25:42 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.67 2001/11/05 17:46:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -38,7 +38,7 @@
#endif
#else /* INT64_IS_BUSTED */
#define SEQ_MAXVALUE ((int64) 0x7FFFFFFF)
#endif /* INT64_IS_BUSTED */
#endif /* INT64_IS_BUSTED */
#define SEQ_MINVALUE (-SEQ_MAXVALUE)

19
src/backend/commands/user.c
View File

@ -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.89 2001/11/04 19:55:31 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.90 2001/11/05 17:46:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -101,12 +101,13 @@ write_password_file(Relation rel)
str_n = DatumGetCString(DirectFunctionCall1(nameout, datum_n));
datum_p = heap_getattr(tuple, Anum_pg_shadow_passwd, dsc, &null_p);
/*
* It can be argued that people having a null password shouldn't
* be allowed to connect under password authentication, because
* they need to have a password set up first. If you think assuming an
* empty password in that case is better, change this logic to look
* something like the code for valuntil.
* they need to have a password set up first. If you think
* assuming an empty password in that case is better, change this
* logic to look something like the code for valuntil.
*/
if (null_p)
{
@ -132,9 +133,9 @@ write_password_file(Relation rel)
elog(ERROR, "Invalid user password '%s'", str_p);
/*
* The extra columns we emit here are not really necessary. To remove
* them, the parser in backend/libpq/crypt.c would need to be
* adjusted.
* The extra columns we emit here are not really necessary. To
* remove them, the parser in backend/libpq/crypt.c would need to
* be adjusted.
*/
fprintf(fp,
"%s"
@ -168,8 +169,8 @@ write_password_file(Relation rel)
FreeFile(fp);
/*
* Rename the temp file to its final name, deleting the old pg_pwd.
* We expect that rename(2) is an atomic action.
* Rename the temp file to its final name, deleting the old pg_pwd. We
* expect that rename(2) is an atomic action.
*/
if (rename(tempname, filename))
elog(ERROR, "rename %s to %s: %m", tempname, filename);

6
src/backend/commands/vacuum.c
View File

@ -13,7 +13,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.211 2001/10/28 06:25:43 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.212 2001/11/05 17:46:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -860,7 +860,7 @@ full_vacuum_rel(Relation onerel, VacuumStmt *vacstmt)
Irel = (Relation *) NULL;
activate_indexes_of_a_table(RelationGetRelid(onerel), false);
}
#endif /* NOT_USED */
#endif /* NOT_USED */
/* Clean/scan index relation(s) */
if (Irel != (Relation *) NULL)
@ -912,7 +912,7 @@ full_vacuum_rel(Relation onerel, VacuumStmt *vacstmt)
#ifdef NOT_USED
if (reindex)
activate_indexes_of_a_table(RelationGetRelid(onerel), true);
#endif /* NOT_USED */
#endif /* NOT_USED */
/* update shared free space map with final free space info */
vac_update_fsm(onerel, &fraged_pages, vacrelstats->rel_pages);

16
src/backend/libpq/auth.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.71 2001/10/28 06:25:44 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.72 2001/11/05 17:46:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -60,7 +60,7 @@ static struct pam_conv pam_passw_conv = {
static char *pam_passwd = NULL; /* Workaround for Solaris 2.6 brokenness */
static Port *pam_port_cludge; /* Workaround for passing "Port *port"
* into pam_passwd_conv_proc */
#endif /* USE_PAM */
#endif /* USE_PAM */
#ifdef KRB4
/*----------------------------------------------------------------
@ -144,7 +144,7 @@ pg_krb4_recvauth(Port *port)
return STATUS_ERROR;
}
#endif /* KRB4 */
#endif /* KRB4 */
#ifdef KRB5
@ -325,7 +325,7 @@ pg_krb5_recvauth(Port *port)
return STATUS_ERROR;
}
#endif /* KRB5 */
#endif /* KRB5 */
/*
@ -467,7 +467,7 @@ auth_failed(Port *port, int status)
case uaPAM:
authmethod = "PAM";
break;
#endif /* USE_PAM */
#endif /* USE_PAM */
}
elog(FATAL, "%s authentication failed for user \"%s\"",
@ -586,7 +586,7 @@ ClientAuthentication(Port *port)
pam_port_cludge = port;
status = CheckPAMAuth(port, port->user, "");
break;
#endif /* USE_PAM */
#endif /* USE_PAM */
case uaTrust:
status = STATUS_OK;
@ -819,7 +819,7 @@ CheckPAMAuth(Port *port, char *user, char *password)
else
return STATUS_ERROR;
}
#endif /* USE_PAM */
#endif /* USE_PAM */
/*
@ -920,7 +920,7 @@ map_old_to_new(Port *port, UserAuth old, int status)
case uaReject:
#ifdef USE_PAM
case uaPAM:
#endif /* USE_PAM */
#endif /* USE_PAM */
status = STATUS_ERROR;
break;

18
src/backend/libpq/crypt.c
View File

@ -9,7 +9,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/libpq/crypt.c,v 1.41 2001/11/02 18:39:57 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/crypt.c,v 1.42 2001/11/05 17:46:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -31,8 +31,8 @@
#define CRYPT_PWD_FILE "pg_pwd"
static char **pwd_cache = NULL;
static int pwd_cache_count = 0;
static char **pwd_cache = NULL;
static int pwd_cache_count = 0;
/*
* crypt_getpwdfilename --- get full pathname of password file
@ -91,8 +91,8 @@ compar_user(const void *user_a, const void *user_b)
login_b = *((char **) user_b);
/*
* We only really want to compare the user logins which are first
* and are terminated by CRYPT_PWD_FILE_SEPSTR. (NB: this code
* We only really want to compare the user logins which are first and
* are terminated by CRYPT_PWD_FILE_SEPSTR. (NB: this code
* effectively assumes that CRYPT_PWD_FILE_SEPSTR is just one char.)
*/
len_a = strcspn(login_a, CRYPT_PWD_FILE_SEPSTR);
@ -134,10 +134,10 @@ load_password_cache(void)
}
/*
* Read the file and store its lines in current memory context,
* which we expect will be PostmasterContext. That context will
* live as long as we need the cache to live, ie, until just after
* each postmaster child has completed client authentication.
* Read the file and store its lines in current memory context, which
* we expect will be PostmasterContext. That context will live as
* long as we need the cache to live, ie, until just after each
* postmaster child has completed client authentication.
*/
while (fgets(buffer, sizeof(buffer), pwd_file) != NULL)
{

4
src/backend/libpq/hba.c
View File

@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.76 2001/10/28 06:25:44 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.77 2001/11/05 17:46:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -1262,4 +1262,4 @@ GetCharSetByHost(char *TableName, int host, const char *DataDir)
}
}
#endif /* CYR_RECODE */
#endif /* CYR_RECODE */

6
src/backend/libpq/pqcomm.c
View File

@ -29,7 +29,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: pqcomm.c,v 1.122 2001/10/25 05:49:30 momjian Exp $
* $Id: pqcomm.c,v 1.123 2001/11/05 17:46:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -232,7 +232,7 @@ StreamServerPort(int family, char *hostName, unsigned short portNumber,
*/
unlink(sock_path);
}
#endif /* HAVE_UNIX_SOCKETS */
#endif /* HAVE_UNIX_SOCKETS */
if (family == AF_INET)
{
@ -344,7 +344,7 @@ StreamServerPort(int family, char *hostName, unsigned short portNumber,
return STATUS_ERROR;
}
}
#endif /* HAVE_UNIX_SOCKETS */
#endif /* HAVE_UNIX_SOCKETS */
/*
* Select appropriate accept-queue length limit. PG_SOMAXCONN is only

4
src/backend/libpq/pqpacket.c
View File

@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.29 2001/03/22 03:59:30 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.30 2001/11/05 17:46:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -65,7 +65,7 @@ PacketReceiveFragment(Port *port)
got = read(port->sock, pkt->ptr, pkt->nrtodo);
#else
got = recv(port->sock, pkt->ptr, pkt->nrtodo, 0);
#endif /* __BEOS__ */
#endif /* __BEOS__ */
if (got > 0)
{
pkt->nrtodo -= got;

4
src/backend/libpq/pqsignal.c
View File

@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.24 2001/09/21 17:06:12 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.25 2001/11/05 17:46:25 momjian Exp $
*
* NOTES
* This shouldn't be in libpq, but the monitor and some other
@ -147,5 +147,5 @@ pqsignal(int signo, pqsigfunc func)
if (sigaction(signo, &act, &oact) < 0)
return SIG_ERR;
return oact.sa_handler;
#endif /* !HAVE_POSIX_SIGNALS */
#endif /* !HAVE_POSIX_SIGNALS */
}

12
src/backend/main/main.c
View File

@ -13,7 +13,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.48 2001/10/25 05:49:30 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.49 2001/11/05 17:46:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -67,11 +67,11 @@ main(int argc, char *argv[])
#if defined(__alpha)
#ifdef NOFIXADE
int buffer[] = {SSIN_UACPROC, UAC_SIGBUS};
#endif /* NOFIXADE */
#endif /* NOFIXADE */
#ifdef NOPRINTADE
int buffer[] = {SSIN_UACPROC, UAC_NOPRINT};
#endif /* NOPRINTADE */
#endif /* __alpha */
#endif /* NOPRINTADE */
#endif /* __alpha */
#if defined(NOFIXADE) || defined(NOPRINTADE)
@ -84,7 +84,7 @@ main(int argc, char *argv[])
(unsigned long) NULL) < 0)
fprintf(stderr, gettext("%s: setsysinfo failed: %s\n"), argv[0], strerror(errno));
#endif
#endif /* NOFIXADE || NOPRINTADE */
#endif /* NOFIXADE || NOPRINTADE */
#ifdef __BEOS__
/* BeOS-specific actions on startup */
@ -159,7 +159,7 @@ main(int argc, char *argv[])
));
exit(1);
}
#endif /* __BEOS__ */
#endif /* __BEOS__ */
/*
* Also make sure that real and effective uids are the same.

4
src/backend/optimizer/path/_deadcode/predmig.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.13 2001/10/30 05:38:55 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.14 2001/11/05 17:46:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -72,7 +72,7 @@ static int xfunc_stream_compare(void *arg1, void *arg2);
static bool xfunc_check_stream(Stream node);
static bool xfunc_in_stream(Stream node, Stream stream);
/* ----------------- MAIN FUNCTIONS ------------------------ */
/* ----------------- MAIN FUNCTIONS ------------------------ */
/*
** xfunc_do_predmig
** wrapper for Predicate Migration. It calls xfunc_predmig until no

4
src/backend/optimizer/path/allpaths.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.81 2001/10/28 06:25:44 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.82 2001/11/05 17:46:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -669,4 +669,4 @@ debug_print_rel(Query *root, RelOptInfo *rel)
fflush(stdout);
}
#endif /* OPTIMIZER_DEBUG */
#endif /* OPTIMIZER_DEBUG */

4
src/backend/optimizer/path/clausesel.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.47 2001/10/25 05:49:32 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.48 2001/11/05 17:46:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -520,7 +520,7 @@ clause_selectivity(Query *root,
#ifdef SELECTIVITY_DEBUG
elog(NOTICE, "clause_selectivity: s1 %f", s1);
#endif /* SELECTIVITY_DEBUG */
#endif /* SELECTIVITY_DEBUG */
return s1;
}

4
src/backend/optimizer/plan/planner.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.112 2001/10/30 19:58:58 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.113 2001/11/05 17:46:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -176,7 +176,7 @@ subquery_planner(Query *parse, double tuple_fraction)
/*
* Check for ungrouped variables passed to subplans in targetlist and
* HAVING clause (but not in WHERE or JOIN/ON clauses, since those are
* evaluated before grouping). We can't do this any earlier because
* evaluated before grouping). We can't do this any earlier because
* we must use the preprocessed targetlist for comparisons of grouped
* expressions.
*/

8
src/backend/optimizer/plan/setrefs.c
View File

@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.72 2001/10/30 19:58:58 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.73 2001/11/05 17:46:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -309,7 +309,7 @@ set_uppernode_references(Plan *plan, Index subvarno)
{
TargetEntry *tle = (TargetEntry *) lfirst(l);
if (tle->expr && ! IsA(tle->expr, Var))
if (tle->expr && !IsA(tle->expr, Var))
{
tlist_has_non_vars = true;
break;
@ -327,7 +327,7 @@ set_uppernode_references(Plan *plan, Index subvarno)
subplan_targetlist,
tlist_has_non_vars);
output_targetlist = lappend(output_targetlist,
makeTargetEntry(tle->resdom, newexpr));
makeTargetEntry(tle->resdom, newexpr));
}
plan->targetlist = output_targetlist;
@ -493,7 +493,7 @@ replace_vars_with_subplan_refs_mutator(Node *node,
resdom->restype,
resdom->restypmod,
0);
newvar->varnoold = 0; /* wasn't ever a plain Var */
newvar->varnoold = 0; /* wasn't ever a plain Var */
newvar->varoattno = 0;
return (Node *) newvar;
}

2
src/backend/optimizer/prep/prepkeyset.c
View File

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

30
src/backend/optimizer/prep/preptlist.c
View File

@ -15,7 +15,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.45 2001/11/02 20:23:02 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.46 2001/11/05 17:46:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -202,7 +202,7 @@ expand_targetlist(List *tlist, int command_type,
if (COLUMN_IS_DROPPED(att_tup))
new_expr = (Node *) makeNullConst(atttype);
else
#endif /* _DROP_COLUMN_HACK__ */
#endif /* _DROP_COLUMN_HACK__ */
new_expr = (Node *) makeVar(result_relation,
attrno,
atttype,
@ -211,7 +211,7 @@ expand_targetlist(List *tlist, int command_type,
break;
default:
elog(ERROR, "expand_targetlist: unexpected command_type");
new_expr = NULL; /* keep compiler quiet */
new_expr = NULL; /* keep compiler quiet */
break;
}
@ -373,7 +373,7 @@ build_column_default(Relation rel, int attrno)
{
if (attrno == defval[ndef].adnum)
{
Oid type_id;
Oid type_id;
/*
* Found it, convert string representation to node tree.
@ -381,10 +381,11 @@ build_column_default(Relation rel, int attrno)
expr = stringToNode(defval[ndef].adbin);
/*
* Make sure the value is coerced to the target column type
* (might not be right type yet if it's not a constant!)
* This should match the parser's processing of non-defaulted
* expressions --- see updateTargetListEntry().
* Make sure the value is coerced to the target column
* type (might not be right type yet if it's not a
* constant!) This should match the parser's processing of
* non-defaulted expressions --- see
* updateTargetListEntry().
*/
type_id = exprType(expr);
@ -392,6 +393,7 @@ build_column_default(Relation rel, int attrno)
{
expr = CoerceTargetExpr(NULL, expr, type_id,
atttype, atttypmod);
/*
* This really shouldn't fail; should have checked the
* default's type when it was created ...
@ -418,13 +420,15 @@ build_column_default(Relation rel, int attrno)
/*
* No per-column default, so look for a default for the type itself.
* If there isn't one, we generate a NULL constant of the correct type.
* If there isn't one, we generate a NULL constant of the correct
* type.
*/
if (att_tup->attisset)
{
/*
* Set attributes are represented as OIDs no matter what the set
* element type is, and the element type's default is irrelevant too.
* element type is, and the element type's default is irrelevant
* too.
*/
hasdefault = false;
typedefault = (Datum) 0;
@ -440,7 +444,7 @@ build_column_default(Relation rel, int attrno)
typedefault = (Datum) 0;
}
else
#endif /* _DROP_COLUMN_HACK__ */
#endif /* _DROP_COLUMN_HACK__ */
hasdefault = get_typdefault(atttype, &typedefault);
get_typlenbyval(atttype, &typlen, &typbyval);
@ -451,12 +455,12 @@ build_column_default(Relation rel, int attrno)
typedefault,
!hasdefault,
typbyval,
false, /* not a set */
false, /* not a set */
false);
/*
* If the column is a fixed-length type, it may need a length coercion
* as well as a type coercion. But NULLs don't need that.
* as well as a type coercion. But NULLs don't need that.
*/
if (hasdefault)
expr = coerce_type_typmod(NULL, expr,

27
src/backend/optimizer/util/clauses.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.90 2001/10/30 19:58:58 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.91 2001/11/05 17:46:26 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@ -43,14 +43,14 @@ typedef struct
{
Query *query;
List *groupClauses;
} check_subplans_for_ungrouped_vars_context;
} check_subplans_for_ungrouped_vars_context;
static bool contain_agg_clause_walker(Node *node, void *context);
static bool pull_agg_clause_walker(Node *node, List **listptr);
static bool contain_subplans_walker(Node *node, void *context);
static bool pull_subplans_walker(Node *node, List **listptr);
static bool check_subplans_for_ungrouped_vars_walker(Node *node,
check_subplans_for_ungrouped_vars_context *context);
check_subplans_for_ungrouped_vars_context * context);
static bool contain_noncachable_functions_walker(Node *node, void *context);
static Node *eval_const_expressions_mutator(Node *node, void *context);
static Expr *simplify_op_or_func(Expr *expr, List *args);
@ -525,7 +525,7 @@ pull_subplans_walker(Node *node, List **listptr)
*
* A deficiency in this scheme is that any outer reference var must be
* grouped by itself; we don't recognize groupable expressions within
* subselects. For example, consider
* subselects. For example, consider
* SELECT
* (SELECT x FROM bar where y = (foo.a + foo.b))
* FROM foo
@ -536,12 +536,13 @@ void
check_subplans_for_ungrouped_vars(Query *query)
{
check_subplans_for_ungrouped_vars_context context;
List *gl;
List *gl;
context.query = query;
/*
* Build a list of the acceptable GROUP BY expressions for use in
* the walker (to avoid repeated scans of the targetlist within the
* Build a list of the acceptable GROUP BY expressions for use in the
* walker (to avoid repeated scans of the targetlist within the
* recursive routine).
*/
context.groupClauses = NIL;
@ -555,9 +556,9 @@ check_subplans_for_ungrouped_vars(Query *query)
}
/*
* Recursively scan the targetlist and the HAVING clause.
* WHERE and JOIN/ON conditions are not examined, since they are
* evaluated before grouping.
* Recursively scan the targetlist and the HAVING clause. WHERE and
* JOIN/ON conditions are not examined, since they are evaluated
* before grouping.
*/
check_subplans_for_ungrouped_vars_walker((Node *) query->targetList,
&context);
@ -569,13 +570,13 @@ check_subplans_for_ungrouped_vars(Query *query)
static bool
check_subplans_for_ungrouped_vars_walker(Node *node,
check_subplans_for_ungrouped_vars_context *context)
check_subplans_for_ungrouped_vars_context * context)
{
List *gl;
if (node == NULL)
return false;
if (IsA(node, Const) || IsA(node, Param))
if (IsA(node, Const) ||IsA(node, Param))
return false; /* constants are always acceptable */
/*
@ -648,7 +649,7 @@ check_subplans_for_ungrouped_vars_walker(Node *node,
char *attname;
Assert(var->varno > 0 &&
(int) var->varno <= length(context->query->rtable));
(int) var->varno <= length(context->query->rtable));
rte = rt_fetch(var->varno, context->query->rtable);
attname = get_rte_attribute_name(rte, var->varattno);
elog(ERROR, "Sub-SELECT uses un-GROUPed attribute %s.%s from outer query",

12
src/backend/parser/analyze.c
View File

@ -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.210 2001/11/05 05:00:14 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.211 2001/11/05 17:46:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -504,8 +504,8 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
}
/*
* XXX It is possible that the targetlist has fewer entries than were in
* the columns list. We do not consider this an error. Perhaps we
* XXX It is possible that the targetlist has fewer entries than were
* in the columns list. We do not consider this an error. Perhaps we
* should, if the columns list was explicitly given?
*/
@ -1241,7 +1241,7 @@ transformIndexConstraints(ParseState *pstate, CreateStmtContext *cxt)
elog(NOTICE, "%s / %s%s will create implicit index '%s' for table '%s'",
cxt->stmtType,
(strcmp(cxt->stmtType,"ALTER TABLE") == 0) ? "ADD " : "",
(strcmp(cxt->stmtType, "ALTER TABLE") == 0) ? "ADD " : "",
(index->primary ? "PRIMARY KEY" : "UNIQUE"),
index->idxname, cxt->relname);
}
@ -2393,12 +2393,12 @@ static void
applyColumnNames(List *dst, List *src)
{
if (length(src) > length(dst))
elog(ERROR,"CREATE TABLE AS specifies too many column names");
elog(ERROR, "CREATE TABLE AS specifies too many column names");
while (src != NIL && dst != NIL)
{
TargetEntry *d = (TargetEntry *) lfirst(dst);
ColumnDef *s = (ColumnDef *) lfirst(src);
ColumnDef *s = (ColumnDef *) lfirst(src);
Assert(d->resdom && !d->resdom->resjunk);

4
src/backend/parser/parse_relation.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.59 2001/10/25 05:49:40 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.60 2001/11/05 17:46:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -737,7 +737,7 @@ expandRTE(ParseState *pstate, RangeTblEntry *rte,
#ifdef _DROP_COLUMN_HACK__
if (COLUMN_IS_DROPPED(attr))
continue;
#endif /* _DROP_COLUMN_HACK__ */
#endif /* _DROP_COLUMN_HACK__ */
if (colnames)
{

4
src/backend/parser/parse_target.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.75 2001/10/25 05:49:40 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.76 2001/11/05 17:46:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -356,7 +356,7 @@ checkInsertTargets(ParseState *pstate, List *cols, List **attrnos)
#ifdef _DROP_COLUMN_HACK__
if (COLUMN_IS_DROPPED(attr[i]))
continue;
#endif /* _DROP_COLUMN_HACK__ */
#endif /* _DROP_COLUMN_HACK__ */
id->name = palloc(NAMEDATALEN);
StrNCpy(id->name, NameStr(attr[i]->attname), NAMEDATALEN);
id->indirection = NIL;

6
src/backend/parser/parser.c
View File

@ -14,7 +14,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.50 2001/10/25 05:49:40 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.51 2001/11/05 17:46:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -30,7 +30,7 @@
#if defined(FLEX_SCANNER)
extern void DeleteBuffer(void);
#endif /* FLEX_SCANNER */
#endif /* FLEX_SCANNER */
char *parseString; /* the char* which holds the string to be
* parsed */
@ -64,7 +64,7 @@ parser(char *str, Oid *typev, int nargs)
#if defined(FLEX_SCANNER)
DeleteBuffer();
#endif /* FLEX_SCANNER */
#endif /* FLEX_SCANNER */
clearerr(stdin);

8
src/backend/port/dynloader/aix.c
View File

@ -32,7 +32,7 @@ typedef struct
{
char *name; /* the symbols's name */
void *addr; /* its relocated virtual address */
} Export, *ExportPtr;
} Export, *ExportPtr;
/*
* xlC uses the following structure to list its constructors and
@ -42,7 +42,7 @@ typedef struct
{
void (*init) (void); /* call static constructors */
void (*term) (void); /* call static destructors */
} Cdtor, *CdtorPtr;
} Cdtor, *CdtorPtr;
/*
* The void * handle returned from dlopen is actually a ModulePtr.
@ -57,7 +57,7 @@ typedef struct Module
CdtorPtr cdtors; /* optional C++ constructors */
int nExports; /* the number of exports found */
ExportPtr exports; /* the array of exports */
} Module, *ModulePtr;
} Module, *ModulePtr;
/*
* We keep a list of all loaded modules to be able to call the fini
@ -608,4 +608,4 @@ findMain(void)
return ret;
}
#endif /* HAVE_DLOPEN */
#endif /* HAVE_DLOPEN */

6
src/backend/port/dynloader/aix.h
View File

@ -1,5 +1,5 @@
/*
* $Id: aix.h,v 1.8 2001/10/28 06:25:47 momjian Exp $
* $Id: aix.h,v 1.9 2001/11/05 17:46:27 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
@ -53,7 +53,7 @@ extern "C"
#ifdef __cplusplus
}
#endif
#endif /* HAVE_DLOPEN */
#endif /* HAVE_DLOPEN */
#include "utils/dynamic_loader.h"
@ -62,4 +62,4 @@ extern "C"
#define pg_dlclose dlclose
#define pg_dlerror dlerror
#endif /* PORT_PROTOS_H */
#endif /* PORT_PROTOS_H */

4
src/backend/port/dynloader/beos.h
View File

@ -7,11 +7,11 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: beos.h,v 1.5 2001/10/25 05:49:40 momjian Exp $
* $Id: beos.h,v 1.6 2001/11/05 17:46:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef PORT_PROTOS_H
#define PORT_PROTOS_H
#endif /* PORT_PROTOS_H */
#endif /* PORT_PROTOS_H */

4
src/backend/port/dynloader/bsdi.c
View File

@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/port/dynloader/bsdi.c,v 1.17 2001/10/28 06:25:47 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/port/dynloader/bsdi.c,v 1.18 2001/11/05 17:46:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -95,4 +95,4 @@ pg_dlerror()
return dld_strerror(dld_errno);
}
#endif /* not HAVE_DLOPEN */
#endif /* not HAVE_DLOPEN */

4
src/backend/port/dynloader/bsdi.h
View File

@ -32,6 +32,6 @@ do { \
dld_unlink_by_file(handle, 1); \
free(handle); \
} while (0)
#endif /* not HAVE_DLOPEN */
#endif /* not HAVE_DLOPEN */
#endif /* PORT_PROTOS_H */
#endif /* PORT_PROTOS_H */

4
src/backend/port/dynloader/dgux.h
View File

@ -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.12 2001/10/28 06:25:47 momjian Exp $
* $Id: dgux.h,v 1.13 2001/11/05 17:46:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -28,4 +28,4 @@
#define pg_dlclose dlclose
#define pg_dlerror dlerror
#endif /* PORT_PROTOS_H */
#endif /* PORT_PROTOS_H */

3
src/backend/port/dynloader/freebsd.c
View File

@ -34,7 +34,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)dl.c 5.4 (Berkeley) 2/23/91";
#endif /* LIBC_SCCS and not lint */
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
#include <nlist.h>
@ -82,6 +82,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
return NULL;
#else
void *vp;
#ifndef __ELF__
char buf[BUFSIZ];

4
src/backend/port/dynloader/freebsd.h
View File

@ -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.12 2001/10/28 06:25:47 momjian Exp $
* $Id: freebsd.h,v 1.13 2001/11/05 17:46:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -44,4 +44,4 @@ 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 */
#endif /* PORT_PROTOS_H */

2
src/backend/port/dynloader/irix5.h
View File

@ -31,4 +31,4 @@
#define pg_dlclose dlclose
#define pg_dlerror dlerror
#endif /* PORT_PROTOS_H */
#endif /* PORT_PROTOS_H */

6
src/backend/port/dynloader/linux.h
View File

@ -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.15 2001/10/28 06:25:47 momjian Exp $
* $Id: linux.h,v 1.16 2001/11/05 17:46:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -39,6 +39,6 @@ do { \
#define pg_dlsym dlsym
#define pg_dlclose dlclose
#define pg_dlerror dlerror
#endif /* HAVE_DLOPEN */
#endif /* HAVE_DLOPEN */
#endif /* PORT_PROTOS_H */
#endif /* PORT_PROTOS_H */

2
src/backend/port/dynloader/netbsd.c
View File

@ -34,7 +34,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)dl.c 5.4 (Berkeley) 2/23/91";
#endif /* LIBC_SCCS and not lint */
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
#include <nlist.h>

4
src/backend/port/dynloader/netbsd.h
View File

@ -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.7 2001/10/28 06:25:47 momjian Exp $
* $Id: netbsd.h,v 1.8 2001/11/05 17:46:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -44,4 +44,4 @@ 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 */
#endif /* PORT_PROTOS_H */

2
src/backend/port/dynloader/nextstep.h
View File

@ -23,4 +23,4 @@ char *next_dlerror(void);
/* port.c */
#endif /* PORT_PROTOS_H */
#endif /* PORT_PROTOS_H */

2
src/backend/port/dynloader/openbsd.c
View File

@ -34,7 +34,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)dl.c 5.4 (Berkeley) 2/23/91";
#endif /* LIBC_SCCS and not lint */
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
#include <nlist.h>

4
src/backend/port/dynloader/openbsd.h
View File

@ -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.8 2001/10/28 06:25:47 momjian Exp $
* $Id: openbsd.h,v 1.9 2001/11/05 17:46:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -42,4 +42,4 @@ 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 */
#endif /* PORT_PROTOS_H */

4
src/backend/port/dynloader/osf.h
View File

@ -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.5 2001/10/28 06:25:47 momjian Exp $
* $Id: osf.h,v 1.6 2001/11/05 17:46:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -33,4 +33,4 @@
#define pg_dlclose(h) dlclose(h)
#define pg_dlerror() dlerror()
#endif /* PORT_PROTOS_H */
#endif /* PORT_PROTOS_H */

4
src/backend/port/dynloader/sco.h
View File

@ -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.10 2001/10/28 06:25:47 momjian Exp $
* $Id: sco.h,v 1.11 2001/11/05 17:46:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -33,4 +33,4 @@
/* port.c */
#endif /* PORT_PROTOS_H */
#endif /* PORT_PROTOS_H */

4
src/backend/port/dynloader/solaris.h
View File

@ -1,4 +1,4 @@
/* $Header: /cvsroot/pgsql/src/backend/port/dynloader/solaris.h,v 1.6 2001/10/28 06:25:47 momjian Exp $ */
/* $Header: /cvsroot/pgsql/src/backend/port/dynloader/solaris.h,v 1.7 2001/11/05 17:46:27 momjian Exp $ */
#ifndef DYNLOADER_SOLARIS_H
#define DYNLOADER_SOLARIS_H
@ -11,4 +11,4 @@
#define pg_dlclose dlclose
#define pg_dlerror dlerror
#endif /* DYNLOADER_SOLARIS_H */
#endif /* DYNLOADER_SOLARIS_H */

4
src/backend/port/dynloader/sunos4.h
View File

@ -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.10 2001/10/28 06:25:47 momjian Exp $
* $Id: sunos4.h,v 1.11 2001/11/05 17:46:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -31,4 +31,4 @@
#define pg_dlclose dlclose
#define pg_dlerror dlerror
#endif /* PORT_PROTOS_H */
#endif /* PORT_PROTOS_H */

4
src/backend/port/dynloader/svr4.h
View File

@ -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.10 2001/10/28 06:25:47 momjian Exp $
* $Id: svr4.h,v 1.11 2001/11/05 17:46:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -31,4 +31,4 @@
#define pg_dlclose dlclose
#define pg_dlerror dlerror
#endif /* DYNLOADER_H */
#endif /* DYNLOADER_H */

14
src/backend/port/dynloader/ultrix4.h
View File

@ -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.9 2001/10/28 06:25:47 momjian Exp $
* $Id: ultrix4.h,v 1.10 2001/11/05 17:46:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -51,20 +51,20 @@ typedef struct ScnInfo
CoreAddr addr; /* starting address of the section */
SCNHDR hdr; /* section header */
RELOC *relocEntries; /* relocation entries */
} ScnInfo;
} ScnInfo;
typedef enum
{
DL_NEEDRELOC, /* still need relocation */
DL_RELOCATED, /* no relocation necessary */
DL_INPROG /* relocation in progress */
} dlRStatus;
} dlRStatus;
typedef struct JmpTbl
{
char *block; /* the jump table memory block */
struct JmpTbl *next; /* next block */
} JmpTbl;
} JmpTbl;
typedef struct dlFile
{
@ -94,14 +94,14 @@ typedef struct dlFile
JmpTbl *jmptable; /* the jump table for R_JMPADDR */
struct dlFile *next; /* next member of the archive */
} dlFile;
} dlFile;
typedef struct dlSymbol
{
char *name; /* name of the symbol */
long addr; /* address of the symbol */
dlFile *objFile; /* from which file */
} dlSymbol;
} dlSymbol;
/*
* prototypes for the dl* interface
@ -121,4 +121,4 @@ extern char **dl_undefinedSymbols( /* int *count */ );
extern void dl_printAllSymbols( /* void *handle */ );
extern void dl_setLibraries( /* char *libs */ );
#endif /* _DL_HEADER_ */
#endif /* _DL_HEADER_ */

2
src/backend/port/dynloader/univel.h
View File

@ -31,4 +31,4 @@
#define pg_dlclose dlclose
#define pg_dlerror dlerror
#endif /* PORT_PROTOS_H */
#endif /* PORT_PROTOS_H */

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