diff options
| author | Bruce Momjian <bruce@momjian.us> | 2001-10-28 06:26:15 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2001-10-28 06:26:15 +0000 |
| commit | 6783b2372ef13c141649840a836ff0a954ea1d4d (patch) | |
| tree | 81c727b2b08930bcf3ab7107c84ef59f1f68a78d /src/backend | |
| parent | c29797deeb5dfca61b8959344b682b4c32fe53a1 (diff) | |
| download | postgresql-6783b2372ef13c141649840a836ff0a954ea1d4d.tar.gz | |
Another pgindent run. Fixes enum indenting, and improves #endif
spacing. Also adds space for one-line comments.
Diffstat (limited to 'src/backend')
121 files changed, 486 insertions, 439 deletions
diff --git a/src/backend/access/gist/giststrat.c b/src/backend/access/gist/giststrat.c index db38191d6a..008006a42a 100644 --- a/src/backend/access/gist/giststrat.c +++ b/src/backend/access/gist/giststrat.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/gist/Attic/giststrat.c,v 1.18 2001/10/25 05:49:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/gist/Attic/giststrat.c,v 1.19 2001/10/28 06:25:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -121,4 +121,5 @@ RelationInvokeGISTStrategy(Relation r, return (RelationInvokeStrategy(r, &GISTEvaluationData, attnum, s, left, right)); } + #endif diff --git a/src/backend/access/hash/hashstrat.c b/src/backend/access/hash/hashstrat.c index a765c2e2b1..76fb5d8f2f 100644 --- a/src/backend/access/hash/hashstrat.c +++ b/src/backend/access/hash/hashstrat.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.19 2001/10/25 05:49:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.20 2001/10/28 06:25:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -80,4 +80,5 @@ _hash_invokestrat(Relation rel, return (RelationInvokeStrategy(rel, &HTEvaluationData, attno, strat, left, right)); } + #endif diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c index b03690257c..5c3a6dc81c 100644 --- a/src/backend/access/index/genam.c +++ b/src/backend/access/index/genam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.29 2001/10/25 05:49:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.30 2001/10/28 06:25:41 momjian Exp $ * * NOTES * many of the old access method routines have been turned into @@ -240,4 +240,5 @@ IndexScanRestorePosition(IndexScanDesc scan) scan->flags = 0x0; /* XXX should have a symbolic name */ } + #endif diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c index 88d1757e4c..4fa9add7bd 100644 --- a/src/backend/access/index/istrat.c +++ b/src/backend/access/index/istrat.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.54 2001/10/25 05:49:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.55 2001/10/28 06:25:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -640,4 +640,5 @@ IndexStrategyDisplay(IndexStrategy indexStrategy, } } } + #endif /* defined(ISTRATDEBUG) */ diff --git a/src/backend/access/nbtree/nbtstrat.c b/src/backend/access/nbtree/nbtstrat.c index 533af33681..321749de12 100644 --- a/src/backend/access/nbtree/nbtstrat.c +++ b/src/backend/access/nbtree/nbtstrat.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.15 2001/10/25 05:49:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.16 2001/10/28 06:25:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -134,4 +134,5 @@ _bt_invokestrat(Relation rel, return (RelationInvokeStrategy(rel, &BTEvaluationData, attno, strat, left, right)); } + #endif diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c index 0e8305bdfb..9843e0cb93 100644 --- a/src/backend/access/rtree/rtree.c +++ b/src/backend/access/rtree/rtree.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.66 2001/10/25 05:49:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.67 2001/10/28 06:25:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -763,7 +763,7 @@ rtpicksplit(Relation r, right_avail_space; int total_num_tuples, num_tuples_without_seeds, - max_after_split; /* in Guttman's lingo, (M - m) */ + max_after_split; /* in Guttman's lingo, (M - m) */ float diff; /* diff between cost of putting tuple left * or right */ SPLITCOST *cost_vector; @@ -1063,7 +1063,7 @@ rtpicksplit(Relation r, else { elog(ERROR, "rtpicksplit: failed to find a workable page split"); - choose_left = false; /* keep compiler quiet */ + choose_left = false; /* keep compiler quiet */ } if (choose_left) diff --git a/src/backend/access/rtree/rtstrat.c b/src/backend/access/rtree/rtstrat.c index 41de4a4e3e..cfc0439aea 100644 --- a/src/backend/access/rtree/rtstrat.c +++ b/src/backend/access/rtree/rtstrat.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.18 2001/10/25 05:49:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.19 2001/10/28 06:25:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -119,9 +119,9 @@ static StrategyNumber RTNegateCommute[RTNStrategies] = { /* if you only have "contained-by", how do you determine equality? */ static uint16 RTContainedByTermData[] = { 2, /* make two comparisons */ - RTContainedByStrategyNumber,/* use "a contained-by b" */ + RTContainedByStrategyNumber, /* use "a contained-by b" */ 0x0, /* without any magic */ - RTContainedByStrategyNumber,/* then use contained-by, */ + RTContainedByStrategyNumber, /* then use contained-by, */ SK_COMMUTE /* swapping a and b */ }; diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c index c0149f0cdb..7f38b47d76 100644 --- a/src/backend/access/transam/clog.c +++ b/src/backend/access/transam/clog.c @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/access/transam/clog.c,v 1.6 2001/10/25 20:37:29 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/clog.c,v 1.7 2001/10/28 06:25:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -120,13 +120,11 @@ typedef enum { - CLOG_PAGE_EMPTY,/* CLOG buffer is not in use */ - CLOG_PAGE_READ_IN_PROGRESS, /* CLOG page is being read - * in */ - CLOG_PAGE_CLEAN,/* CLOG page is valid and not dirty */ - CLOG_PAGE_DIRTY,/* CLOG page is valid but needs write */ - CLOG_PAGE_WRITE_IN_PROGRESS /* CLOG page is being - * written out in */ + CLOG_PAGE_EMPTY, /* CLOG buffer is not in use */ + CLOG_PAGE_READ_IN_PROGRESS, /* CLOG page is being read in */ + CLOG_PAGE_CLEAN, /* CLOG page is valid and not dirty */ + CLOG_PAGE_DIRTY, /* CLOG page is valid but needs write */ + CLOG_PAGE_WRITE_IN_PROGRESS /* CLOG page is being written out in */ } ClogPageStatus; /* diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c index 5a56f47e06..cd58ed7ad8 100644 --- a/src/backend/access/transam/varsup.c +++ b/src/backend/access/transam/varsup.c @@ -6,7 +6,7 @@ * Copyright (c) 2000, PostgreSQL Global Development Group * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.47 2001/10/25 05:49:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.48 2001/10/28 06:25:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -124,9 +124,9 @@ GetNewObjectId(void) /* * Check for wraparound of the OID counter. We *must* not return 0 * (InvalidOid); and as long as we have to check that, it seems a good - * idea to skip over everything below BootstrapObjectIdData too. - * (This basically just reduces the odds of OID collision right after - * a wrap occurs.) Note we are relying on unsigned comparison here. + * idea to skip over everything below BootstrapObjectIdData too. (This + * basically just reduces the odds of OID collision right after a wrap + * occurs.) Note we are relying on unsigned comparison here. */ if (ShmemVariableCache->nextOid < ((Oid) BootstrapObjectIdData)) { diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index f4dc01adfd..857dc8777e 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.113 2001/10/25 05:49:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.114 2001/10/28 06:25:42 momjian Exp $ * * NOTES * Transaction aborts can now occur two ways: @@ -994,7 +994,7 @@ CommitTransaction(void) AtCommit_Memory(); AtEOXact_Files(); - SharedBufferChanged = false; /* safest place to do it */ + SharedBufferChanged = false; /* safest place to do it */ /* Count transaction commit in statistics collector */ pgstat_count_xact_commit(); @@ -1097,7 +1097,7 @@ AbortTransaction(void) AtEOXact_Files(); AtAbort_Locks(); - SharedBufferChanged = false; /* safest place to do it */ + SharedBufferChanged = false; /* safest place to do it */ /* Count transaction abort in statistics collector */ pgstat_count_xact_rollback(); diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 8c162ab3f6..c0bfe968d2 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.79 2001/10/25 05:49:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.80 2001/10/28 06:25:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -955,7 +955,7 @@ AdvanceXLInsertBuffer(void) /* And fill the new page's header */ NewPage->xlp_magic = XLOG_PAGE_MAGIC; - /* NewPage->xlp_info = 0; *//* done by memset */ + /* NewPage->xlp_info = 0; */ /* done by memset */ NewPage->xlp_sui = ThisStartUpID; NewPage->xlp_pageaddr.xlogid = NewPageEndPtr.xlogid; NewPage->xlp_pageaddr.xrecoff = NewPageEndPtr.xrecoff - BLCKSZ; @@ -1762,7 +1762,7 @@ ReadRecord(XLogRecPtr *RecPtr, int emode, char *buffer) readFile = XLogFileOpen(readId, readSeg, (emode == LOG)); if (readFile < 0) goto next_record_is_invalid; - readOff = (uint32) (-1); /* force read to occur below */ + readOff = (uint32) (-1); /* force read to occur below */ } targetPageOff = ((RecPtr->xrecoff % XLogSegSize) / BLCKSZ) * BLCKSZ; diff --git a/src/backend/commands/_deadcode/recipe.h b/src/backend/commands/_deadcode/recipe.h index 11dafaefa7..b09b9bbfff 100644 --- a/src/backend/commands/_deadcode/recipe.h +++ b/src/backend/commands/_deadcode/recipe.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: recipe.h,v 1.4 2001/10/25 05:49:27 momjian Exp $ + * $Id: recipe.h,v 1.5 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,4 +16,5 @@ #include "nodes/parsenodes.h" extern void beginRecipe(RecipeStmt *stmt); + #endif /* RECIPE_H */ diff --git a/src/backend/commands/_deadcode/version.c b/src/backend/commands/_deadcode/version.c index 3a5170e86a..81e7a8f91f 100644 --- a/src/backend/commands/_deadcode/version.c +++ b/src/backend/commands/_deadcode/version.c @@ -10,7 +10,7 @@ * doesn't work! - jolly 8/19/95 * * - * $Id: version.c,v 1.27 2001/10/25 05:49:27 momjian Exp $ + * $Id: version.c,v 1.28 2001/10/28 06:25:43 momjian Exp $ * * NOTES * At the point the version is defined, 2 physical relations are created @@ -342,4 +342,5 @@ VersionReplace(char *vname, char *bname, char *snapshot) /* printf("%s\n",rule_buf); */ } + #endif diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c index 4d1792a1d3..4100e77557 100644 --- a/src/backend/commands/command.c +++ b/src/backend/commands/command.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.146 2001/10/25 05:49:24 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.147 2001/10/28 06:25:42 momjian Exp $ * * NOTES * The PerformAddAttribute() code, like most of the relation @@ -2083,7 +2083,7 @@ LockTableCommand(LockStmt *lockstmt) LockRelation(rel, lockstmt->mode); - heap_close(rel, NoLock); /* close rel, keep lock */ + heap_close(rel, NoLock); /* close rel, keep lock */ } } diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c index 334094fd47..30a175c659 100644 --- a/src/backend/commands/define.c +++ b/src/backend/commands/define.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.63 2001/10/25 05:49:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.64 2001/10/28 06:25:42 momjian Exp $ * * DESCRIPTION * The "DefineFoo" routines take the parse tree and pick out the @@ -356,7 +356,7 @@ DefineOperator(char *oprName, List *parameters) { uint16 precedence = 0; /* operator precedence */ - bool canHash = false; /* operator hashes */ + bool canHash = false; /* operator hashes */ bool isLeftAssociative = true; /* operator is left * associative */ char *functionName = NULL; /* function for operator */ @@ -367,7 +367,7 @@ DefineOperator(char *oprName, char *negatorName = NULL; /* optional negator operator name */ char *restrictionName = NULL; /* optional restrict. sel. * procedure */ - char *joinName = NULL; /* optional join sel. procedure name */ + char *joinName = NULL; /* optional join sel. procedure name */ char *sortName1 = NULL; /* optional first sort operator */ char *sortName2 = NULL; /* optional second sort operator */ List *pl; @@ -446,7 +446,7 @@ DefineOperator(char *oprName, OperatorCreate(oprName, /* operator name */ typeName1, /* first type name */ typeName2, /* second type name */ - functionName,/* function for operator */ + functionName, /* function for operator */ precedence, /* operator precedence */ isLeftAssociative, /* operator is left associative */ commutatorName, /* optional commutator operator @@ -544,7 +544,7 @@ DefineType(char *typeName, List *parameters) char delimiter = DEFAULT_TYPDELIM; char *shadow_type; List *pl; - char alignment = 'i'; /* default alignment */ + char alignment = 'i'; /* default alignment */ char storage = 'p'; /* default TOAST storage method */ /* @@ -676,7 +676,7 @@ DefineType(char *typeName, List *parameters) -1, /* internal size */ -1, /* external size */ 'b', /* type-type (base type) */ - DEFAULT_TYPDELIM,/* array element delimiter */ + DEFAULT_TYPDELIM, /* array element delimiter */ "array_in", /* input procedure */ "array_out", /* output procedure */ "array_in", /* receive procedure */ diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index 10954912e7..c1f76152c5 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.65 2001/10/25 05:49:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.66 2001/10/28 06:25:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -766,7 +766,7 @@ init_params(CreateSeqStmt *seq, Form_pg_sequence new) if (new->increment_by > 0) new->max_value = SEQ_MAXVALUE; /* ascending seq */ else - new->max_value = -1; /* descending seq */ + new->max_value = -1; /* descending seq */ } else new->max_value = get_param(max_value); diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index a3103e7209..bca8063acd 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.85 2001/10/25 05:49:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.86 2001/10/28 06:25:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -201,13 +201,13 @@ CreateUser(CreateUserStmt *stmt) int max_id; List *item, *option; - char *password = NULL; /* PostgreSQL user password */ + char *password = NULL; /* PostgreSQL user password */ bool encrypt_password = Password_encryption; /* encrypt password? */ char encrypted_password[MD5_PASSWD_LEN + 1]; int sysid = 0; /* PgSQL system id (valid if havesysid) */ bool createdb = false; /* Can the user create databases? */ bool createuser = false; /* Can this user create users? */ - List *groupElts = NIL; /* The groups the user is a member of */ + List *groupElts = NIL; /* The groups the user is a member of */ char *validUntil = NULL; /* The time the login is valid * until */ DefElem *dpassword = NULL; @@ -447,11 +447,11 @@ AlterUser(AlterUserStmt *stmt) new_tuple; bool null; List *option; - char *password = NULL; /* PostgreSQL user password */ + char *password = NULL; /* PostgreSQL user password */ bool encrypt_password = Password_encryption; /* encrypt password? */ char encrypted_password[MD5_PASSWD_LEN + 1]; int createdb = -1; /* Can the user create databases? */ - int createuser = -1; /* Can this user create users? */ + int createuser = -1; /* Can this user create users? */ char *validUntil = NULL; /* The time the login is valid * until */ DefElem *dpassword = NULL; @@ -954,7 +954,7 @@ CreateGroup(CreateGroupStmt *stmt) userarray = palloc(ARR_OVERHEAD(1) + length(newlist) * sizeof(int32)); userarray->size = ARR_OVERHEAD(1) + length(newlist) * sizeof(int32); userarray->flags = 0; - ARR_NDIM(userarray) = 1; /* one dimensional array */ + ARR_NDIM(userarray) = 1; /* one dimensional array */ ARR_LBOUND(userarray)[0] = 1; /* axis starts at one */ ARR_DIMS(userarray)[0] = length(newlist); /* axis is this long */ /* fill the array */ @@ -1150,7 +1150,7 @@ AlterGroup(AlterGroupStmt *stmt, const char *tag) } } /* endif alter group add user */ - else if (stmt->action == -1)/* drop users from group */ + else if (stmt->action == -1) /* drop users from group */ { Datum datum; bool null; diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index fa5770b0e8..99e5fac702 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.210 2001/10/25 05:49:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.211 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,7 +68,7 @@ typedef VacPageData *VacPage; typedef struct VacPageListData { - BlockNumber empty_end_pages; /* Number of "empty" end-pages */ + BlockNumber empty_end_pages; /* Number of "empty" end-pages */ int num_pages; /* Number of pages in pagedesc */ int num_allocated_pages; /* Number of allocated pages in * pagedesc */ diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c index 8431dcdb0f..dd8ef4d18d 100644 --- a/src/backend/commands/vacuumlazy.c +++ b/src/backend/commands/vacuumlazy.c @@ -31,7 +31,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/vacuumlazy.c,v 1.9 2001/10/25 05:49:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/vacuumlazy.c,v 1.10 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -79,8 +79,8 @@ typedef struct LVRelStats BlockNumber nonempty_pages; /* actually, last nonempty page + 1 */ /* List of TIDs of tuples we intend to delete */ /* NB: this list is ordered by TID address */ - int num_dead_tuples; /* current # of entries */ - int max_dead_tuples; /* # slots allocated in array */ + int num_dead_tuples; /* current # of entries */ + int max_dead_tuples; /* # slots allocated in array */ ItemPointer dead_tuples; /* array of ItemPointerData */ /* Array or heap of per-page info about free space */ /* We use a simple array until it fills up, then convert to heap */ @@ -88,7 +88,7 @@ typedef struct LVRelStats int num_free_pages; /* current # of entries */ int max_free_pages; /* # slots allocated in arrays */ BlockNumber *free_pages; /* array or heap of block numbers */ - Size *free_spaceavail; /* array or heap of available space */ + Size *free_spaceavail; /* array or heap of available space */ } LVRelStats; diff --git a/src/backend/executor/execFlatten.c b/src/backend/executor/execFlatten.c index 8d1eaea402..ecbe7b5d18 100644 --- a/src/backend/executor/execFlatten.c +++ b/src/backend/executor/execFlatten.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.15 2001/10/25 05:49:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.16 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -239,4 +239,5 @@ FjoinBumpOuterNodes(TargetEntry *tlist, } return false; } + #endif diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c index 2c63acb8b6..6878907b9a 100644 --- a/src/backend/executor/execTuples.c +++ b/src/backend/executor/execTuples.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.49 2001/10/25 05:49:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.50 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -406,7 +406,7 @@ ExecClearTuple(TupleTableSlot *slot) /* slot in which to store tuple */ slot->val = (HeapTuple) NULL; - slot->ttc_shouldFree = true; /* probably useless code... */ + slot->ttc_shouldFree = true; /* probably useless code... */ /* * Drop the pin on the referenced buffer, if there is one. diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index fbe8e7f5bf..7f73cdd26a 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.46 2001/10/25 05:49:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.47 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,7 @@ */ typedef enum { - F_EXEC_START, F_EXEC_RUN, F_EXEC_DONE + F_EXEC_START, F_EXEC_RUN, F_EXEC_DONE } ExecStatus; typedef struct local_es diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index 3c5ebc4c8b..318ebc6f6c 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.63 2001/10/25 05:49:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.64 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -222,7 +222,7 @@ IndexNext(IndexScan *node) qual = lnext(qual); } if (!prev_matches) - return slot; /* OK to return tuple */ + return slot; /* OK to return tuple */ /* Duplicate tuple, so drop it and loop back for another */ ExecClearTuple(slot); } @@ -701,10 +701,10 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent) Expr *clause; /* one clause of index qual */ Oper *op; /* operator used in clause */ Node *leftop; /* expr on lhs of operator */ - Node *rightop; /* expr on rhs ... */ + Node *rightop; /* expr on rhs ... */ bits16 flags = 0; - int scanvar; /* which var identifies varattno */ + int scanvar; /* which var identifies varattno */ AttrNumber varattno = 0; /* att number used in scan */ Oid opid; /* operator id used in scan */ Datum scanvalue = 0; /* value used in scan (if const) */ diff --git a/src/backend/executor/nodeLimit.c b/src/backend/executor/nodeLimit.c index 1ce376418d..d94e89ea63 100644 --- a/src/backend/executor/nodeLimit.c +++ b/src/backend/executor/nodeLimit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeLimit.c,v 1.8 2001/10/25 05:49:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeLimit.c,v 1.9 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -76,8 +76,8 @@ ExecLimit(Limit *node) * * Similarly, when scanning backwards, we must re-fetch the last * tuple in the offset region before we can return NULL. Otherwise - * we won't be correctly aligned to start going forward again. - * So, although you might think we can quit when position equals + * we won't be correctly aligned to start going forward again. So, + * although you might think we can quit when position equals * offset + 1, we have to fetch a subplan tuple first, and then * exit when position = offset. */ diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index 8ac71b0cc9..b0c1eb90a7 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.46 2001/10/25 05:49:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.47 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -429,7 +429,7 @@ ExecMergeJoin(MergeJoin *node) default: elog(ERROR, "ExecMergeJoin: unsupported join type %d", (int) node->join.jointype); - doFillOuter = false; /* keep compiler quiet */ + doFillOuter = false; /* keep compiler quiet */ doFillInner = false; break; } diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c index 1767379d67..d7ebec4985 100644 --- a/src/backend/executor/nodeSeqscan.c +++ b/src/backend/executor/nodeSeqscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.32 2001/10/25 05:49:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.33 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -105,7 +105,7 @@ SeqNext(SeqScan *node) * tuple table slot is cleared. */ - slot = ExecStoreTuple(tuple,/* tuple to store */ + slot = ExecStoreTuple(tuple, /* tuple to store */ slot, /* slot to store in */ scandesc->rs_cbuf, /* buffer associated with * this tuple */ diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c index 380632a78b..fb2e3d53d3 100644 --- a/src/backend/executor/nodeTidscan.c +++ b/src/backend/executor/nodeTidscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.20 2001/10/25 05:49:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.21 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -162,7 +162,7 @@ TidNext(TidScan *node) * with palloc() and so should not be pfree()'d. */ ExecStoreTuple(tuple, /* tuple to store */ - slot,/* slot to store in */ + slot, /* slot to store in */ buffer, /* buffer associated with tuple */ false); /* don't pfree */ diff --git a/src/backend/lib/lispsort.c b/src/backend/lib/lispsort.c index f06448b578..b08ed5cf61 100644 --- a/src/backend/lib/lispsort.c +++ b/src/backend/lib/lispsort.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.15 2001/10/25 05:49:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.16 2001/10/28 06:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -55,4 +55,5 @@ lisp_qsort(List *the_list, /* the list to be sorted */ return output; } + #endif diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 44fb1f390c..1fd625b1ad 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.70 2001/10/25 05:49:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.71 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -672,7 +672,7 @@ pam_passwd_conv_proc(int num_msg, const struct pam_message ** msg, struct pam_re sendAuthRequest(pam_port_cludge, AUTH_REQ_PASSWORD); if (pq_eof() == EOF || pq_getint(&len, 4) == EOF) { - return PAM_CONV_ERR; /* client didn't want to send password */ + return PAM_CONV_ERR; /* client didn't want to send password */ } initStringInfo(&buf); diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 6aafdc0913..3c66f1f280 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.75 2001/10/25 05:49:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.76 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1261,4 +1261,5 @@ GetCharSetByHost(char *TableName, int host, const char *DataDir) pfree((struct CharsetItem *) ChArray[i]); } } + #endif /* CYR_RECODE */ diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c index 94b18d3752..5d43a8e15e 100644 --- a/src/backend/nodes/nodeFuncs.c +++ b/src/backend/nodes/nodeFuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.15 2001/10/25 05:49:31 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.16 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -114,4 +114,5 @@ non_null(Expr *c) else return false; } + #endif diff --git a/src/backend/optimizer/path/_deadcode/predmig.c b/src/backend/optimizer/path/_deadcode/predmig.c index 604de4b273..00c353633d 100644 --- a/src/backend/optimizer/path/_deadcode/predmig.c +++ b/src/backend/optimizer/path/_deadcode/predmig.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.11 2001/10/25 05:49:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.12 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -109,7 +109,7 @@ xfunc_do_predmig(Path root) ** Destructively modifies the join tree (via predicate pullup). */ static void -xfunc_predmig(JoinPath pathnode,/* root of the join tree */ +xfunc_predmig(JoinPath pathnode, /* root of the join tree */ Stream streamroot, Stream laststream,/* for recursive calls -- these are the * root of the stream under construction, @@ -469,7 +469,7 @@ xfunc_form_groups(Query *queryInfo, Stream root, Stream bottom) get_groupup((Stream) get_downstream(temp))) && get_grouprank(parent) < get_grouprank(temp)) { - progress = true; /* we formed a new group */ + progress = true; /* we formed a new group */ set_groupup(temp, true); set_groupcost(temp, get_groupcost(temp) + @@ -484,7 +484,7 @@ xfunc_form_groups(Query *queryInfo, Stream root, Stream bottom) } -/* ------------------- UTILITY FUNCTIONS ------------------------- */ +/* ------------------- UTILITY FUNCTIONS ------------------------- */ /* ** xfunc_free_stream diff --git a/src/backend/optimizer/path/_deadcode/xfunc.c b/src/backend/optimizer/path/_deadcode/xfunc.c index 07866a9e4d..94a1d6b8f2 100644 --- a/src/backend/optimizer/path/_deadcode/xfunc.c +++ b/src/backend/optimizer/path/_deadcode/xfunc.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.17 2001/10/25 05:49:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.18 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -265,7 +265,7 @@ RestrictInfo xfunc_pullup(Query *queryInfo, Path childpath, JoinPath parentpath, - RestrictInfo cinfo,/* clause to pull up */ + RestrictInfo cinfo, /* clause to pull up */ int whichchild, /* whether child is INNER or OUTER of join */ int clausetype) /* whether clause to pull is join or local */ { diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index 15f29847d3..dcea8907ed 100644 --- a/src/backend/optimizer/path/allpaths.c +++ b/src/backend/optimizer/path/allpaths.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.80 2001/10/25 05:49:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.81 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -668,4 +668,5 @@ debug_print_rel(Query *root, RelOptInfo *rel) printf("\n"); fflush(stdout); } + #endif /* OPTIMIZER_DEBUG */ diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c index b713dc8ad8..3f93c98267 100644 --- a/src/backend/optimizer/path/orindxpath.c +++ b/src/backend/optimizer/path/orindxpath.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.45 2001/10/25 05:49:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.46 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -175,7 +175,7 @@ best_or_subclause_indices(Query *root, pathnode->indexinfo = lappend(pathnode->indexinfo, best_indexinfo); pathnode->indexqual = lappend(pathnode->indexqual, best_indexqual); - if (slist == subclauses)/* first scan? */ + if (slist == subclauses) /* first scan? */ pathnode->path.startup_cost = best_startup_cost; pathnode->path.total_cost += best_total_cost; diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c index c7e13f2850..6d68858668 100644 --- a/src/backend/optimizer/path/pathkeys.c +++ b/src/backend/optimizer/path/pathkeys.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.34 2001/10/25 05:49:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.35 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -317,7 +317,7 @@ compare_pathkeys(List *keys1, List *keys2) if (key1 == NIL && key2 == NIL) return PATHKEYS_EQUAL; if (key1 != NIL) - return PATHKEYS_BETTER1; /* key1 is longer */ + return PATHKEYS_BETTER1; /* key1 is longer */ return PATHKEYS_BETTER2; /* key2 is longer */ } @@ -367,7 +367,7 @@ compare_noncanonical_pathkeys(List *keys1, List *keys2) if (key1 == NIL && key2 == NIL) return PATHKEYS_EQUAL; if (key1 != NIL) - return PATHKEYS_BETTER1; /* key1 is longer */ + return PATHKEYS_BETTER1; /* key1 is longer */ return PATHKEYS_BETTER2; /* key2 is longer */ } diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index 30ddd8437c..88c5499b30 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.110 2001/10/25 05:49:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.111 2001/10/28 06:25:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1085,7 +1085,7 @@ fix_indxqual_operand(Node *node, int baserelid, IndexOptInfo *index, * the returned varattno must be 1. */ Assert(index->indproc != InvalidOid); - Assert(is_funcclause(node)); /* not a very thorough check, but easy */ + Assert(is_funcclause(node)); /* not a very thorough check, but easy */ /* classlist[0] is the only class of a functional index */ *opclass = index->classlist[0]; @@ -1895,4 +1895,5 @@ generate_fjoin(List *tlist) return newTlist; return tlist; /* do nothing for now - ay 10/94 */ } + #endif diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index d870b2786f..d13035ca9c 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.110 2001/10/25 05:49:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.111 2001/10/28 06:25:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -374,9 +374,9 @@ pull_up_subqueries(Query *parse, Node *jtnode) * target list entries for upper Var references wouldn't do the * right thing (the entries wouldn't go to NULL when they're * supposed to). Suppressing the pullup is an ugly, - * performance-losing hack, but I see no alternative for now. - * Find a better way to handle this when we redesign query trees - * --- tgl 4/30/01. + * performance-losing hack, but I see no alternative for now. Find + * a better way to handle this when we redesign query trees --- + * tgl 4/30/01. */ switch (j->jointype) { diff --git a/src/backend/optimizer/prep/prepkeyset.c b/src/backend/optimizer/prep/prepkeyset.c index 6ff40fdb08..180637d099 100644 --- a/src/backend/optimizer/prep/prepkeyset.c +++ b/src/backend/optimizer/prep/prepkeyset.c @@ -216,4 +216,5 @@ inspectOpNode(Expr *expr) secondExpr = lsecond(expr->args); return (firstExpr && secondExpr && nodeTag(firstExpr) == T_Var && nodeTag(secondExpr) == T_Const); } + #endif /* ENABLE_KEY_SET_QUERY */ diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index 6949217dec..888edf578f 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.67 2001/10/25 05:49:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.68 2001/10/28 06:25:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -711,7 +711,7 @@ adjust_inherited_attrs_mutator(Node *node, adjust_inherited_attrs_mutator((Node *) oldinfo->clause, context); newinfo->subclauseindices = NIL; - newinfo->eval_cost = -1; /* reset these too */ + newinfo->eval_cost = -1; /* reset these too */ newinfo->this_selec = -1; newinfo->left_pathkey = NIL; /* and these */ newinfo->right_pathkey = NIL; diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 9f95300e35..5a4534644c 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.204 2001/10/25 05:49:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.205 2001/10/28 06:25:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -859,7 +859,7 @@ transformColumnDefinition(ParseState *pstate, CreateStmtContext *cxt, constraint = makeNode(Constraint); constraint->contype = CONSTR_UNIQUE; - constraint->name = NULL; /* assign later */ + constraint->name = NULL; /* assign later */ column->constraints = lappend(column->constraints, constraint); constraint = makeNode(Constraint); diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c index d03c6b6403..e2a79c4737 100644 --- a/src/backend/parser/parse_node.c +++ b/src/backend/parser/parse_node.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.56 2001/10/25 05:49:39 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.57 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -134,8 +134,8 @@ make_op(char *opname, Node *ltree, Node *rtree) right = make_operand(opname, rtree, rtypeId, opform->oprright); } - newop = makeOper(oprid(tup),/* opno */ - InvalidOid,/* opid */ + newop = makeOper(oprid(tup), /* opno */ + InvalidOid, /* opid */ opform->oprresult); /* operator result type */ result = makeNode(Expr); @@ -467,7 +467,7 @@ make_const(Value *value) case T_String: val = DirectFunctionCall1(textin, CStringGetDatum(strVal(value))); - typeid = UNKNOWNOID; /* will be coerced later */ + typeid = UNKNOWNOID; /* will be coerced later */ typelen = -1; /* variable len */ typebyval = false; break; diff --git a/src/backend/port/dynloader/aix.c b/src/backend/port/dynloader/aix.c index 46ef63a766..a8fd72ff4c 100644 --- a/src/backend/port/dynloader/aix.c +++ b/src/backend/port/dynloader/aix.c @@ -607,4 +607,5 @@ findMain(void) free(buf); return ret; } + #endif /* HAVE_DLOPEN */ diff --git a/src/backend/port/dynloader/aix.h b/src/backend/port/dynloader/aix.h index 203e56264a..88f9592aad 100644 --- a/src/backend/port/dynloader/aix.h +++ b/src/backend/port/dynloader/aix.h @@ -1,5 +1,5 @@ /* - * $Id: aix.h,v 1.7 2001/10/25 05:49:40 momjian Exp $ + * $Id: aix.h,v 1.8 2001/10/28 06:25:47 momjian Exp $ * * @(#)dlfcn.h 1.4 revision of 95/04/25 09:36:52 * This is an unpublished work copyright (c) 1992 HELIOS Software GmbH @@ -42,6 +42,7 @@ extern "C" void *dlsym(void *handle, const char *symbol); char *dlerror(void); int dlclose(void *handle); + #else void *dlopen(); void *dlsym(); @@ -60,4 +61,5 @@ extern "C" #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c index c16af323a1..adfe9bb06d 100644 --- a/src/backend/port/dynloader/bsdi.c +++ b/src/backend/port/dynloader/bsdi.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/dynloader/bsdi.c,v 1.16 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/dynloader/bsdi.c,v 1.17 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -94,4 +94,5 @@ pg_dlerror() { return dld_strerror(dld_errno); } + #endif /* not HAVE_DLOPEN */ diff --git a/src/backend/port/dynloader/bsdi.h b/src/backend/port/dynloader/bsdi.h index 7d38de8277..7d4c1ec7f9 100644 --- a/src/backend/port/dynloader/bsdi.h +++ b/src/backend/port/dynloader/bsdi.h @@ -33,4 +33,5 @@ do { \ free(handle); \ } while (0) #endif /* not HAVE_DLOPEN */ + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/dgux.h b/src/backend/port/dynloader/dgux.h index 8246906702..b7b5d576ee 100644 --- a/src/backend/port/dynloader/dgux.h +++ b/src/backend/port/dynloader/dgux.h @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dgux.h,v 1.11 2001/10/25 05:49:40 momjian Exp $ + * $Id: dgux.h,v 1.12 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,5 @@ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/freebsd.h b/src/backend/port/dynloader/freebsd.h index c7e36525ac..022be0f39b 100644 --- a/src/backend/port/dynloader/freebsd.h +++ b/src/backend/port/dynloader/freebsd.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: freebsd.h,v 1.11 2001/10/25 05:49:40 momjian Exp $ + * $Id: freebsd.h,v 1.12 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,4 +43,5 @@ char *BSD44_derived_dlerror(void); void *BSD44_derived_dlopen(const char *filename, int num); void *BSD44_derived_dlsym(void *handle, const char *name); void BSD44_derived_dlclose(void *handle); + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/irix5.h b/src/backend/port/dynloader/irix5.h index f5e53bfc1b..a4a5d134b6 100644 --- a/src/backend/port/dynloader/irix5.h +++ b/src/backend/port/dynloader/irix5.h @@ -30,4 +30,5 @@ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c index 796f22d3f2..565464c993 100644 --- a/src/backend/port/dynloader/linux.c +++ b/src/backend/port/dynloader/linux.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.19 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.20 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -107,4 +107,5 @@ pg_dlerror() return dld_strerror(dld_errno); #endif } + #endif diff --git a/src/backend/port/dynloader/linux.h b/src/backend/port/dynloader/linux.h index 2077a6a676..e0955deb5c 100644 --- a/src/backend/port/dynloader/linux.h +++ b/src/backend/port/dynloader/linux.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: linux.h,v 1.14 2001/10/25 05:49:40 momjian Exp $ + * $Id: linux.h,v 1.15 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,4 +40,5 @@ do { \ #define pg_dlclose dlclose #define pg_dlerror dlerror #endif /* HAVE_DLOPEN */ + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/netbsd.h b/src/backend/port/dynloader/netbsd.h index 85cdfa3a85..aa516053a5 100644 --- a/src/backend/port/dynloader/netbsd.h +++ b/src/backend/port/dynloader/netbsd.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: netbsd.h,v 1.6 2001/10/25 05:49:40 momjian Exp $ + * $Id: netbsd.h,v 1.7 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,4 +43,5 @@ char *BSD44_derived_dlerror(void); void *BSD44_derived_dlopen(const char *filename, int num); void *BSD44_derived_dlsym(void *handle, const char *name); void BSD44_derived_dlclose(void *handle); + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/nextstep.h b/src/backend/port/dynloader/nextstep.h index 510243a1ac..d86c2c5cea 100644 --- a/src/backend/port/dynloader/nextstep.h +++ b/src/backend/port/dynloader/nextstep.h @@ -22,4 +22,5 @@ char *next_dlerror(void); #define pg_dlerror next_dlerror /* port.c */ + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/openbsd.h b/src/backend/port/dynloader/openbsd.h index 899f213011..c08c8b3b91 100644 --- a/src/backend/port/dynloader/openbsd.h +++ b/src/backend/port/dynloader/openbsd.h @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: openbsd.h,v 1.7 2001/10/25 05:49:40 momjian Exp $ + * $Id: openbsd.h,v 1.8 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,4 +41,5 @@ char *BSD44_derived_dlerror(void); void *BSD44_derived_dlopen(const char *filename, int num); void *BSD44_derived_dlsym(void *handle, const char *name); void BSD44_derived_dlclose(void *handle); + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/osf.h b/src/backend/port/dynloader/osf.h index e24ae4f85d..d411a895b1 100644 --- a/src/backend/port/dynloader/osf.h +++ b/src/backend/port/dynloader/osf.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: osf.h,v 1.4 2001/10/25 05:49:40 momjian Exp $ + * $Id: osf.h,v 1.5 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,4 +32,5 @@ #define pg_dlsym(h, f) ((PGFunction) dlsym(h, f)) #define pg_dlclose(h) dlclose(h) #define pg_dlerror() dlerror() + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/sco.h b/src/backend/port/dynloader/sco.h index 577706d27e..c7db92d3e6 100644 --- a/src/backend/port/dynloader/sco.h +++ b/src/backend/port/dynloader/sco.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sco.h,v 1.9 2001/10/25 05:49:40 momjian Exp $ + * $Id: sco.h,v 1.10 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,4 +32,5 @@ #define pg_dlerror dlerror /* port.c */ + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/solaris.h b/src/backend/port/dynloader/solaris.h index ca920923c4..cc6b4dc776 100644 --- a/src/backend/port/dynloader/solaris.h +++ b/src/backend/port/dynloader/solaris.h @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/backend/port/dynloader/solaris.h,v 1.5 2001/10/25 05:49:40 momjian Exp $ */ +/* $Header: /cvsroot/pgsql/src/backend/port/dynloader/solaris.h,v 1.6 2001/10/28 06:25:47 momjian Exp $ */ #ifndef DYNLOADER_SOLARIS_H #define DYNLOADER_SOLARIS_H @@ -10,4 +10,5 @@ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* DYNLOADER_SOLARIS_H */ diff --git a/src/backend/port/dynloader/sunos4.h b/src/backend/port/dynloader/sunos4.h index fee5f00a3b..f1e74afd47 100644 --- a/src/backend/port/dynloader/sunos4.h +++ b/src/backend/port/dynloader/sunos4.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sunos4.h,v 1.9 2001/10/25 05:49:40 momjian Exp $ + * $Id: sunos4.h,v 1.10 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,4 +30,5 @@ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/svr4.h b/src/backend/port/dynloader/svr4.h index af3d6d54f9..abce7465a5 100644 --- a/src/backend/port/dynloader/svr4.h +++ b/src/backend/port/dynloader/svr4.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: svr4.h,v 1.9 2001/10/25 05:49:40 momjian Exp $ + * $Id: svr4.h,v 1.10 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,4 +30,5 @@ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* DYNLOADER_H */ diff --git a/src/backend/port/dynloader/ultrix4.h b/src/backend/port/dynloader/ultrix4.h index 68504d0ac2..18edf7e0ba 100644 --- a/src/backend/port/dynloader/ultrix4.h +++ b/src/backend/port/dynloader/ultrix4.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: ultrix4.h,v 1.8 2001/10/25 05:49:40 momjian Exp $ + * $Id: ultrix4.h,v 1.9 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -55,9 +55,9 @@ typedef struct ScnInfo typedef enum { - DL_NEEDRELOC, /* still need relocation */ - DL_RELOCATED, /* no relocation necessary */ - DL_INPROG /* relocation in progress */ + DL_NEEDRELOC, /* still need relocation */ + DL_RELOCATED, /* no relocation necessary */ + DL_INPROG /* relocation in progress */ } dlRStatus; typedef struct JmpTbl @@ -120,4 +120,5 @@ extern char *dl_error( /* void */ ); extern char **dl_undefinedSymbols( /* int *count */ ); extern void dl_printAllSymbols( /* void *handle */ ); extern void dl_setLibraries( /* char *libs */ ); + #endif /* _DL_HEADER_ */ diff --git a/src/backend/port/dynloader/univel.h b/src/backend/port/dynloader/univel.h index 694d87c3fa..83f0e2c82a 100644 --- a/src/backend/port/dynloader/univel.h +++ b/src/backend/port/dynloader/univel.h @@ -30,4 +30,5 @@ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/unixware.h b/src/backend/port/dynloader/unixware.h index 0d0b80721d..5c1b04cc69 100644 --- a/src/backend/port/dynloader/unixware.h +++ b/src/backend/port/dynloader/unixware.h @@ -30,4 +30,5 @@ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/win.h b/src/backend/port/dynloader/win.h index 0bc8cdb062..d0d33189b7 100644 --- a/src/backend/port/dynloader/win.h +++ b/src/backend/port/dynloader/win.h @@ -30,4 +30,5 @@ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror + #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/isinf.c b/src/backend/port/isinf.c index f660b8a443..96c42d20a9 100644 --- a/src/backend/port/isinf.c +++ b/src/backend/port/isinf.c @@ -1,4 +1,4 @@ -/* $Id: isinf.c,v 1.17 2001/10/25 05:49:40 momjian Exp $ */ +/* $Id: isinf.c,v 1.18 2001/10/28 06:25:47 momjian Exp $ */ #include "c.h" @@ -78,4 +78,5 @@ isinf(double x) return -1; return 0; } + #endif diff --git a/src/backend/port/nextstep/port.c b/src/backend/port/nextstep/port.c index 8f6deeb44f..6ef1b126f4 100644 --- a/src/backend/port/nextstep/port.c +++ b/src/backend/port/nextstep/port.c @@ -55,4 +55,5 @@ getcwd(char *buf, size_t size) { return getwd(buf); } + #endif diff --git a/src/backend/port/qnx4/ipc.h b/src/backend/port/qnx4/ipc.h index 291347de35..ebcfe7f19e 100644 --- a/src/backend/port/qnx4/ipc.h +++ b/src/backend/port/qnx4/ipc.h @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/ipc.h,v 1.4 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/ipc.h,v 1.5 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,5 @@ /* Control Commands. */ #define IPC_RMID 0 /* remove identifier */ #define IPC_STAT 1 /* get shm status */ + #endif /* _SYS_IPC_H */ diff --git a/src/backend/port/qnx4/sem.c b/src/backend/port/qnx4/sem.c index ed70d45229..58825d0f53 100644 --- a/src/backend/port/qnx4/sem.c +++ b/src/backend/port/qnx4/sem.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.c,v 1.8 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.c,v 1.9 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -176,7 +176,7 @@ semget(key_t key, int nsems, int semflg) nsets = PROC_SEM_MAP_ENTRIES(MaxBackends); sem_info_size = sizeof(struct sem_info) + (nsets - 1) * sizeof(struct sem_set_info); ltrunc(fd, sem_info_size, SEEK_SET); - if (fstat(fd, &statbuf))/* would be strange : the only doc'ed */ + if (fstat(fd, &statbuf)) /* would be strange : the only doc'ed */ { /* error is EBADF */ close(fd); return -1; diff --git a/src/backend/port/qnx4/sem.h b/src/backend/port/qnx4/sem.h index 3ac7f6ff17..c5af05ec6b 100644 --- a/src/backend/port/qnx4/sem.h +++ b/src/backend/port/qnx4/sem.h @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.h,v 1.4 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.h,v 1.5 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,4 +64,5 @@ extern "C" #ifdef __cplusplus } #endif + #endif /* _SYS_SEM_H */ diff --git a/src/backend/port/qnx4/shm.h b/src/backend/port/qnx4/shm.h index 47d8a37658..85537e25e5 100644 --- a/src/backend/port/qnx4/shm.h +++ b/src/backend/port/qnx4/shm.h @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/shm.h,v 1.4 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/shm.h,v 1.5 2001/10/28 06:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,4 +39,5 @@ extern "C" #ifdef __cplusplus } #endif + #endif /* _SYS_SHM_H */ diff --git a/src/backend/port/sunos4/float.h b/src/backend/port/sunos4/float.h index 438deaf6ad..2be9b70a77 100644 --- a/src/backend/port/sunos4/float.h +++ b/src/backend/port/sunos4/float.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: float.h,v 1.7 2001/10/25 05:49:40 momjian Exp $ + * $Id: float.h,v 1.8 2001/10/28 06:25:47 momjian Exp $ * * NOTES * These come straight out of ANSI X3.159-1989 (p.18) and @@ -27,4 +27,5 @@ #define DBL_DIG 15 #define DBL_MIN 2.2250738585072014e-308 #define DBL_MAX 1.7976931348623157e+308 + #endif /* FLOAT_H */ diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 1659f09752..1f232bfc30 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.252 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.253 2001/10/28 06:25:47 momjian Exp $ * * NOTES * @@ -1092,7 +1092,7 @@ ProcessStartupPacket(Port *port, bool SSLdone) { elog(DEBUG, "failed to send SSL negotiation response: %s", strerror(errno)); - return STATUS_ERROR; /* close the connection */ + return STATUS_ERROR; /* close the connection */ } #ifdef USE_SSL diff --git a/src/backend/regex/engine.c b/src/backend/regex/engine.c index 79b71415ed..7e77054eec 100644 --- a/src/backend/regex/engine.c +++ b/src/backend/regex/engine.c @@ -685,7 +685,7 @@ backref(struct match * m, pg_wchar *start, pg_wchar *stop, return dp; /* that one missed, try next one */ if (OP(m->g->strip[esub]) == O_CH) - return NULL; /* there is none */ + return NULL; /* there is none */ esub++; assert(OP(m->g->strip[esub]) == OOR2); ssub = esub + 1; diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c index 3b433b20f4..878b75af2c 100644 --- a/src/backend/regex/regcomp.c +++ b/src/backend/regex/regcomp.c @@ -1017,7 +1017,7 @@ bothcases(struct parse * p, int ch) pg_wchar *oldend = p->end; pg_wchar bracket[3]; - assert(othercase(ch) != ch); /* p_bracket() would recurse */ + assert(othercase(ch) != ch); /* p_bracket() would recurse */ p->next = bracket; p->end = bracket + 2; bracket[0] = ch; @@ -1107,7 +1107,7 @@ repeat(struct parse * p, case REP(0, N): /* as x{1,n}? */ case REP(0, INF): /* as x{1,}? */ /* KLUDGE: emit y? as (y|) until subtle bug gets fixed */ - INSERT(OCH_, start); /* offset is wrong... */ + INSERT(OCH_, start); /* offset is wrong... */ repeat(p, start + 1, 1, to); ASTERN(OOR1, start); AHEAD(start); /* ... fix it */ @@ -1577,7 +1577,7 @@ findmust(struct parse * p, struct re_guts * g) switch (OP(s)) { case OCHAR: /* sequence member */ - if (newlen == 0)/* new sequence */ + if (newlen == 0) /* new sequence */ newstart = scan - 1; newlen++; break; diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c index 5ed1f9f975..f7c0f3ac8f 100644 --- a/src/backend/regex/regerror.c +++ b/src/backend/regex/regerror.c @@ -55,7 +55,7 @@ static struct rerr int code; char *name; char *explain; -} rerrs[] = +} rerrs[] = { { diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c index 63e0ced180..1ca42ea8fa 100644 --- a/src/backend/rewrite/rewriteManip.c +++ b/src/backend/rewrite/rewriteManip.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.59 2001/10/25 05:49:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.60 2001/10/28 06:25:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -995,4 +995,5 @@ HandleRIRAttributeRule(Query *parsetree, query_tree_mutator(parsetree, HandleRIRAttributeRule_mutator, (void *) &context, true); } + #endif /* NOT_USED */ diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c index eb4ce0330c..ab6f4f7837 100644 --- a/src/backend/storage/buffer/buf_table.c +++ b/src/backend/storage/buffer/buf_table.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.25 2001/10/25 05:49:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.26 2001/10/28 06:25:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -152,4 +152,5 @@ DBG_LookupListCheck(int nlookup) hash_stats("Shared", SharedBufHash); } + #endif diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c index 073d3ae4fc..6e8e0f9b8b 100644 --- a/src/backend/storage/buffer/freelist.c +++ b/src/backend/storage/buffer/freelist.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.26 2001/10/25 05:49:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.27 2001/10/28 06:25:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -309,4 +309,5 @@ PrintBufferFreeList() buf = &(BufferDescriptors[buf->freeNext]); } } + #endif diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c index bb8b8f39a7..14379cd1ef 100644 --- a/src/backend/storage/file/buffile.c +++ b/src/backend/storage/file/buffile.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/file/buffile.c,v 1.11 2001/10/25 05:49:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/file/buffile.c,v 1.12 2001/10/28 06:25:49 momjian Exp $ * * NOTES: * @@ -572,4 +572,5 @@ BufFileTellBlock(BufFile *file) blknum += file->curFile * RELSEG_SIZE; return blknum; } + #endif diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 3c6722863e..8936685f94 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.85 2001/10/25 05:49:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.86 2001/10/28 06:25:49 momjian Exp $ * * NOTES: * @@ -118,11 +118,11 @@ typedef struct vfd unsigned short fdstate; /* bitflags for VFD's state */ /* these are the assigned bits in fdstate: */ -#define FD_DIRTY (1 << 0)/* written to, but not yet fsync'd */ -#define FD_TEMPORARY (1 << 1)/* should be unlinked when closed */ +#define FD_DIRTY (1 << 0) /* written to, but not yet fsync'd */ +#define FD_TEMPORARY (1 << 1) /* should be unlinked when closed */ File nextFree; /* link to next free VFD, if in freelist */ - File lruMoreRecently; /* doubly linked recency-of-use list */ + File lruMoreRecently; /* doubly linked recency-of-use list */ File lruLessRecently; long seekPos; /* current logical file position */ char *fileName; /* name of file, or NULL for unused VFD */ diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c index 1956b92d68..8ae9906101 100644 --- a/src/backend/storage/freespace/freespace.c +++ b/src/backend/storage/freespace/freespace.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/freespace/freespace.c,v 1.8 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/freespace/freespace.c,v 1.9 2001/10/28 06:25:49 momjian Exp $ * * * NOTES: @@ -1116,4 +1116,5 @@ DumpFreeSpace(void) fprintf(stderr, "DumpFreeSpace: %d chunks in list, but numFreeChunks = %d\n", nChunks, FreeSpaceMap->numFreeChunks); } + #endif /* FREESPACE_DEBUG */ diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index d083d071bd..558645e8b9 100644 --- a/src/backend/storage/ipc/ipc.c +++ b/src/backend/storage/ipc/ipc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.72 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.73 2001/10/28 06:25:49 momjian Exp $ * * NOTES * @@ -94,9 +94,9 @@ static struct ONEXIT { void (*function) (); Datum arg; -} on_proc_exit_list[MAX_ON_EXITS], +} on_proc_exit_list[MAX_ON_EXITS], - on_shmem_exit_list[MAX_ON_EXITS]; +on_shmem_exit_list[MAX_ON_EXITS]; static int on_proc_exit_index, on_shmem_exit_index; @@ -745,7 +745,7 @@ PrivateMemoryCreate(uint32 size) fprintf(stderr, "PrivateMemoryCreate: malloc(%u) failed\n", size); proc_exit(1); } - MemSet(memAddress, 0, size); /* keep Purify quiet */ + MemSet(memAddress, 0, size); /* keep Purify quiet */ /* Register on-exit routine to release storage */ on_shmem_exit(PrivateMemoryDelete, PointerGetDatum(memAddress)); diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c index 4f67788742..4fbb621160 100644 --- a/src/backend/storage/ipc/shmqueue.c +++ b/src/backend/storage/ipc/shmqueue.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.17 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.18 2001/10/28 06:25:50 momjian Exp $ * * NOTES * @@ -253,4 +253,5 @@ dumpQ(SHM_QUEUE *q, char *s) strcat(buf, elem); elog(SHMQUEUE_DEBUG_ELOG, "%s: %s", s, buf); } + #endif /* SHMQUEUE_DEBUG */ diff --git a/src/backend/storage/lmgr/deadlock.c b/src/backend/storage/lmgr/deadlock.c index e7a0c6e855..70867b6564 100644 --- a/src/backend/storage/lmgr/deadlock.c +++ b/src/backend/storage/lmgr/deadlock.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.7 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.8 2001/10/28 06:25:50 momjian Exp $ * * Interface: * @@ -756,4 +756,5 @@ PrintLockQueue(LOCK *lock, const char *info) printf("\n"); fflush(stdout); } + #endif diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index a33b633d2d..a7ddd92dda 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.101 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.102 2001/10/28 06:25:50 momjian Exp $ * * NOTES * Outside modules can create a lock table and acquire/release @@ -54,15 +54,15 @@ static void LockCountMyLocks(SHMEM_OFFSET lockOffset, PROC *proc, static char *lock_mode_names[] = { - "INVALID", - "AccessShareLock", - "RowShareLock", - "RowExclusiveLock", - "ShareUpdateExclusiveLock", - "ShareLock", - "ShareRowExclusiveLock", - "ExclusiveLock", - "AccessExclusiveLock" + "INVALID", + "AccessShareLock", + "RowShareLock", + "RowExclusiveLock", + "ShareUpdateExclusiveLock", + "ShareLock", + "ShareRowExclusiveLock", + "ExclusiveLock", + "AccessExclusiveLock" }; @@ -1463,4 +1463,5 @@ DumpAllLocks(void) elog(DEBUG, "DumpAllLocks: holder->tag.lock = NULL"); } } + #endif /* LOCK_DEBUG */ diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 503312b53d..1b0058eaef 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.113 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.114 2001/10/28 06:25:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -653,7 +653,7 @@ ProcSleep(LOCKMETHODTABLE *lockMethodTable, MyProc->waitHolder = holder; MyProc->waitLockMode = lockmode; - MyProc->errType = STATUS_OK; /* initialize result for success */ + MyProc->errType = STATUS_OK; /* initialize result for success */ /* * If we detected deadlock, give up without waiting. This must agree diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c index 84934b3b02..86c5bac6d9 100644 --- a/src/backend/storage/lmgr/s_lock.c +++ b/src/backend/storage/lmgr/s_lock.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/s_lock.c,v 1.3 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/s_lock.c,v 1.4 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -248,8 +248,6 @@ tas_dummy() /* really means: extern int tas(slock_t #if defined(NEED_I386_TAS_ASM) /* non gcc i386 based things */ #endif /* NEED_I386_TAS_ASM */ - - #endif /* not __GNUC__ */ @@ -292,4 +290,5 @@ main() exit(3); } + #endif /* S_LOCK_TEST */ diff --git a/src/backend/storage/lmgr/spin.c b/src/backend/storage/lmgr/spin.c index 59a7b4414c..0c13062dcb 100644 --- a/src/backend/storage/lmgr/spin.c +++ b/src/backend/storage/lmgr/spin.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/spin.c,v 1.5 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/spin.c,v 1.6 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -186,4 +186,5 @@ tas_sema(volatile slock_t *lock) /* Note that TAS macros return 0 if *success* */ return !IpcSemaphoreTryLock(lock->semId, lock->sem); } + #endif /* !HAS_TEST_AND_SET */ diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c index 3fc1958b53..ada46e6817 100644 --- a/src/backend/storage/page/bufpage.c +++ b/src/backend/storage/page/bufpage.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.39 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.40 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -389,7 +389,7 @@ PageGetFreeSpace(Page page) if (space < sizeof(ItemIdData)) return 0; - space -= sizeof(ItemIdData); /* XXX not always appropriate */ + space -= sizeof(ItemIdData); /* XXX not always appropriate */ return space; } diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index c8fd782988..c9139ef18e 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.88 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.89 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,7 +58,7 @@ typedef struct _MdfdVec int mdfd_nextFree; /* link to next freelist member, if free */ #ifndef LET_OS_MANAGE_FILESIZE - struct _MdfdVec *mdfd_chain; /* for large relations */ + struct _MdfdVec *mdfd_chain; /* for large relations */ #endif } MdfdVec; diff --git a/src/backend/storage/smgr/mm.c b/src/backend/storage/smgr/mm.c index 789083fba2..fab130cd37 100644 --- a/src/backend/storage/smgr/mm.c +++ b/src/backend/storage/smgr/mm.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.28 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.29 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -561,4 +561,5 @@ MMShmemSize() return size; } + #endif /* STABLE_MEMORY_STORAGE */ diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c index 61b1b55821..5ed8896938 100644 --- a/src/backend/tcop/dest.c +++ b/src/backend/tcop/dest.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.45 2001/10/25 05:49:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.46 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -278,7 +278,7 @@ NullCommand(CommandDest dest) /* * tell the fe that we saw an empty query string */ - pq_putbytes("I", 2); /* note we send I and \0 */ + pq_putbytes("I", 2); /* note we send I and \0 */ break; case Debug: diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c index c710d2c3d4..39ec8fa542 100644 --- a/src/backend/tcop/fastpath.c +++ b/src/backend/tcop/fastpath.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.50 2001/10/25 05:49:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.51 2001/10/28 06:25:51 momjian Exp $ * * NOTES * This cruft is the server side of PQfn. @@ -74,7 +74,7 @@ * ---------------- */ static void -SendFunctionResult(Datum retval,/* actual return value */ +SendFunctionResult(Datum retval, /* actual return value */ bool retbyval, int retlen) /* the length according to the catalogs */ { diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index e839e47f1c..3fb46d73e2 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.239 2001/10/25 05:49:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.240 2001/10/28 06:25:51 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -324,7 +324,7 @@ ReadCommand(StringInfo inBuf) */ List * pg_parse_and_rewrite(char *query_string, /* string to execute */ - Oid *typev,/* parameter types */ + Oid *typev, /* parameter types */ int nargs) /* number of parameters */ { List *raw_parsetree_list; @@ -1502,7 +1502,7 @@ PostgresMain(int argc, char *argv[], const char *username) pqsignal(SIGHUP, SigHupHandler); /* set flag to read config file */ pqsignal(SIGINT, QueryCancelHandler); /* cancel current query */ pqsignal(SIGTERM, die); /* cancel current query and exit */ - pqsignal(SIGQUIT, quickdie); /* hard crash time */ + pqsignal(SIGQUIT, quickdie); /* hard crash time */ pqsignal(SIGALRM, HandleDeadLock); /* check for deadlock after * timeout */ @@ -1642,7 +1642,7 @@ PostgresMain(int argc, char *argv[], const char *username) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.239 $ $Date: 2001/10/25 05:49:43 $\n"); + puts("$Revision: 1.240 $ $Date: 2001/10/28 06:25:51 $\n"); } /* @@ -2049,4 +2049,5 @@ assertTest(int val) return val; } #endif + #endif diff --git a/src/backend/tioga/Arr_TgRecipe.h b/src/backend/tioga/Arr_TgRecipe.h index 346f74c293..9404635715 100644 --- a/src/backend/tioga/Arr_TgRecipe.h +++ b/src/backend/tioga/Arr_TgRecipe.h @@ -126,4 +126,5 @@ typedef struct Arr_TgNodePtr AppendVarray((Varray *) (A), (void *) (V), (CopyingFunct) copyTgNodePtr) #define deleteArr_TgNodePtr(A) FreeVarray(A) + #endif /* _ARR_TgNodePtr_ */ diff --git a/src/backend/tioga/Varray.h b/src/backend/tioga/Varray.h index c81a7f28ef..aed53855a4 100644 --- a/src/backend/tioga/Varray.h +++ b/src/backend/tioga/Varray.h @@ -44,4 +44,5 @@ typedef void (*CopyingFunct) (void *from, void *to); extern Varray *NewVarray(size_t nobj, size_t size); extern int AppendVarray(Varray * array, void *value, CopyingFunct copy); + #endif /* _VARRAY_H_ */ diff --git a/src/backend/tioga/tgRecipe.h b/src/backend/tioga/tgRecipe.h index f22e4bc8b5..960daafd31 100644 --- a/src/backend/tioga/tgRecipe.h +++ b/src/backend/tioga/tgRecipe.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tgRecipe.h,v 1.18 2001/10/25 05:49:43 momjian Exp $ + * $Id: tgRecipe.h,v 1.19 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,44 +29,30 @@ typedef struct y; } Point; /* this should match whatever is in - * - * - * - * - * - * - * - * - * - * - * - * - * - * * geo-decls.h */ #endif /* TIOGA_FRONTEND */ typedef enum { - TG_INGRED, - TG_EYE, - TG_RECIPE + TG_INGRED, + TG_EYE, + TG_RECIPE } TgElemType; typedef enum { - TG_SQL, - TG_C, - TG_RECIPE_GRAPH, - TG_COMPILED + TG_SQL, + TG_C, + TG_RECIPE_GRAPH, + TG_COMPILED } TgSrcLangType; typedef enum { - TG_INGRED_NODE, - TG_EYE_NODE, - TG_RECIPE_NODE, - TG_TEE_NODE /* tee nodes are not stored in the db we + TG_INGRED_NODE, + TG_EYE_NODE, + TG_RECIPE_NODE, + TG_TEE_NODE /* tee nodes are not stored in the db we * create them when we read the recipe * back */ } TgNodeType; diff --git a/src/backend/utils/adt/ascii.c b/src/backend/utils/adt/ascii.c index c08960ca20..8617470de9 100644 --- a/src/backend/utils/adt/ascii.c +++ b/src/backend/utils/adt/ascii.c @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- * ascii.c * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.10 2001/10/25 05:49:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.11 2001/10/28 06:25:51 momjian Exp $ * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group * @@ -190,4 +190,5 @@ to_ascii_default(PG_FUNCTION_ARGS) ) ); } + #endif /* MULTIBYTE */ diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 06b249a8e1..fd6653c8fa 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.75 2001/10/25 05:49:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.76 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -251,7 +251,7 @@ static datetkn deltatktbl[] = { {DDAY, UNITS, DTK_DAY}, /* "day" relative */ {"days", UNITS, DTK_DAY}, /* "days" relative */ {"dec", UNITS, DTK_DECADE}, /* "decade" relative */ - {"decs", UNITS, DTK_DECADE},/* "decades" relative */ + {"decs", UNITS, DTK_DECADE}, /* "decades" relative */ {DDECADE, UNITS, DTK_DECADE}, /* "decade" relative */ {"decades", UNITS, DTK_DECADE}, /* "decades" relative */ {"h", UNITS, DTK_HOUR}, /* "hour" relative */ @@ -268,8 +268,8 @@ static datetkn deltatktbl[] = { {"millisecon", UNITS, DTK_MILLISEC}, /* relative */ {"mils", UNITS, DTK_MILLENNIUM}, /* "millennia" relative */ {"min", UNITS, DTK_MINUTE}, /* "minute" relative */ - {"mins", UNITS, DTK_MINUTE},/* "minutes" relative */ - {"mins", UNITS, DTK_MINUTE},/* "minutes" relative */ + {"mins", UNITS, DTK_MINUTE}, /* "minutes" relative */ + {"mins", UNITS, DTK_MINUTE}, /* "minutes" relative */ {DMINUTE, UNITS, DTK_MINUTE}, /* "minute" relative */ {"minutes", UNITS, DTK_MINUTE}, /* "minutes" relative */ {"mon", UNITS, DTK_MONTH}, /* "months" relative */ @@ -281,7 +281,7 @@ static datetkn deltatktbl[] = { {DMILLISEC, UNITS, DTK_MILLISEC}, {"mseconds", UNITS, DTK_MILLISEC}, {"msecs", UNITS, DTK_MILLISEC}, - {"qtr", UNITS, DTK_QUARTER},/* "quarter" relative */ + {"qtr", UNITS, DTK_QUARTER}, /* "quarter" relative */ {DQUARTER, UNITS, DTK_QUARTER}, /* "quarter" relative */ {"reltime", IGNORE, 0}, /* pre-v6.1 "Undefined Reltime" */ {"s", UNITS, DTK_SECOND}, @@ -290,11 +290,11 @@ static datetkn deltatktbl[] = { {"seconds", UNITS, DTK_SECOND}, {"secs", UNITS, DTK_SECOND}, {DTIMEZONE, UNITS, DTK_TZ}, /* "timezone" time offset */ - {"timezone", UNITS, DTK_TZ},/* "timezone" time offset */ + {"timezone", UNITS, DTK_TZ}, /* "timezone" time offset */ {"timezone_h", UNITS, DTK_TZ_HOUR}, /* timezone hour units */ {"timezone_m", UNITS, DTK_TZ_MINUTE}, /* timezone minutes units */ {"undefined", RESERV, DTK_INVALID}, /* pre-v6.1 invalid time */ - {"us", UNITS, DTK_MICROSEC},/* "microsecond" relative */ + {"us", UNITS, DTK_MICROSEC}, /* "microsecond" relative */ {"usec", UNITS, DTK_MICROSEC}, /* "microsecond" relative */ {DMICROSEC, UNITS, DTK_MICROSEC}, /* "microsecond" relative */ {"useconds", UNITS, DTK_MICROSEC}, /* "microseconds" relative */ diff --git a/src/backend/utils/adt/encode.c b/src/backend/utils/adt/encode.c index e5308aca27..2a59c25b35 100644 --- a/src/backend/utils/adt/encode.c +++ b/src/backend/utils/adt/encode.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/encode.c,v 1.4 2001/10/25 05:49:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/encode.c,v 1.5 2001/10/28 06:25:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -495,7 +495,7 @@ static struct { const char *name; struct pg_encoding enc; -} enclist[] = +} enclist[] = { { diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index c7dc220d07..fb575c8bb9 100644 --- a/src/backend/utils/adt/float.c +++ b/src/backend/utils/adt/float.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.75 2001/10/25 05:49:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.76 2001/10/28 06:25:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1897,7 +1897,7 @@ float84ge(PG_FUNCTION_ARGS) static const double one = 1.0, TWO52[2] = { 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ - -4.50359962737049600000e+15,/* 0xC3300000, 0x00000000 */ + -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */ }; static double @@ -1981,4 +1981,5 @@ cbrt(double x) return isneg ? -tmpres : tmpres; } + #endif /* !HAVE_CBRT */ diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 0957783a4a..270abc161e 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- * formatting.c * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.42 2001/10/25 05:49:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.43 2001/10/28 06:25:52 momjian Exp $ * * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group @@ -521,132 +521,132 @@ static KeySuffix DCH_suff[] = { typedef enum { - DCH_A_D, - DCH_A_M, - DCH_AD, - DCH_AM, - DCH_B_C, - DCH_BC, - DCH_CC, - DCH_DAY, - DCH_DDD, - DCH_DD, - DCH_DY, - DCH_Day, - DCH_Dy, - DCH_D, - DCH_FX, /* global suffix */ - DCH_HH24, - DCH_HH12, - DCH_HH, - DCH_IW, - DCH_J, - DCH_MI, - DCH_MM, - DCH_MONTH, - DCH_MON, - DCH_MS, - DCH_Month, - DCH_Mon, - DCH_P_M, - DCH_PM, - DCH_Q, - DCH_RM, - DCH_SSSS, - DCH_SS, - DCH_TZ, - DCH_US, - DCH_WW, - DCH_W, - DCH_Y_YYY, - DCH_YYYY, - DCH_YYY, - DCH_YY, - DCH_Y, - DCH_a_d, - DCH_a_m, - DCH_ad, - DCH_am, - DCH_b_c, - DCH_bc, - DCH_cc, - DCH_day, - DCH_ddd, - DCH_dd, - DCH_dy, - DCH_d, - DCH_fx, - DCH_hh24, - DCH_hh12, - DCH_hh, - DCH_iw, - DCH_j, - DCH_mi, - DCH_mm, - DCH_month, - DCH_mon, - DCH_ms, - DCH_p_m, - DCH_pm, - DCH_q, - DCH_rm, - DCH_ssss, - DCH_ss, - DCH_tz, - DCH_us, - DCH_ww, - DCH_w, - DCH_y_yyy, - DCH_yyyy, - DCH_yyy, - DCH_yy, - DCH_y, + DCH_A_D, + DCH_A_M, + DCH_AD, + DCH_AM, + DCH_B_C, + DCH_BC, + DCH_CC, + DCH_DAY, + DCH_DDD, + DCH_DD, + DCH_DY, + DCH_Day, + DCH_Dy, + DCH_D, + DCH_FX, /* global suffix */ + DCH_HH24, + DCH_HH12, + DCH_HH, + DCH_IW, + DCH_J, + DCH_MI, + DCH_MM, + DCH_MONTH, + DCH_MON, + DCH_MS, + DCH_Month, + DCH_Mon, + DCH_P_M, + DCH_PM, + DCH_Q, + DCH_RM, + DCH_SSSS, + DCH_SS, + DCH_TZ, + DCH_US, + DCH_WW, + DCH_W, + DCH_Y_YYY, + DCH_YYYY, + DCH_YYY, + DCH_YY, + DCH_Y, + DCH_a_d, + DCH_a_m, + DCH_ad, + DCH_am, + DCH_b_c, + DCH_bc, + DCH_cc, + DCH_day, + DCH_ddd, + DCH_dd, + DCH_dy, + DCH_d, + DCH_fx, + DCH_hh24, + DCH_hh12, + DCH_hh, + DCH_iw, + DCH_j, + DCH_mi, + DCH_mm, + DCH_month, + DCH_mon, + DCH_ms, + DCH_p_m, + DCH_pm, + DCH_q, + DCH_rm, + DCH_ssss, + DCH_ss, + DCH_tz, + DCH_us, + DCH_ww, + DCH_w, + DCH_y_yyy, + DCH_yyyy, + DCH_yyy, + DCH_yy, + DCH_y, /* last */ - _DCH_last_ + _DCH_last_ } DCH_poz; typedef enum { - NUM_COMMA, - NUM_DEC, - NUM_0, - NUM_9, - NUM_B, - NUM_C, - NUM_D, - NUM_E, - NUM_FM, - NUM_G, - NUM_L, - NUM_MI, - NUM_PL, - NUM_PR, - NUM_RN, - NUM_SG, - NUM_SP, - NUM_S, - NUM_TH, - NUM_V, - NUM_b, - NUM_c, - NUM_d, - NUM_e, - NUM_fm, - NUM_g, - NUM_l, - NUM_mi, - NUM_pl, - NUM_pr, - NUM_rn, - NUM_sg, - NUM_sp, - NUM_s, - NUM_th, - NUM_v, + NUM_COMMA, + NUM_DEC, + NUM_0, + NUM_9, + NUM_B, + NUM_C, + NUM_D, + NUM_E, + NUM_FM, + NUM_G, + NUM_L, + NUM_MI, + NUM_PL, + NUM_PR, + NUM_RN, + NUM_SG, + NUM_SP, + NUM_S, + NUM_TH, + NUM_V, + NUM_b, + NUM_c, + NUM_d, + NUM_e, + NUM_fm, + NUM_g, + NUM_l, + NUM_mi, + NUM_pl, + NUM_pr, + NUM_rn, + NUM_sg, + NUM_sp, + NUM_s, + NUM_th, + NUM_v, /* last */ - _NUM_last_ + _NUM_last_ } NUM_poz; /* ---------- @@ -861,7 +861,7 @@ typedef struct NUMProc *last_relevant, /* last relevant number after decimal * point */ - *L_negative_sign,/* Locale */ + *L_negative_sign, /* Locale */ *L_positive_sign, *decimal, *L_thousands_sep, diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c index cc3c8a791f..75da7170e3 100644 --- a/src/backend/utils/adt/name.c +++ b/src/backend/utils/adt/name.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.32 2001/10/25 05:49:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.33 2001/10/28 06:25:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -240,4 +240,5 @@ NameComputeLength(Name name) ; return (uint32) length; } + #endif diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index 4e7398448b..f447caa66c 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -5,7 +5,7 @@ * * 1998 Jan Wieck * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.46 2001/10/25 05:49:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.47 2001/10/28 06:25:52 momjian Exp $ * * ---------- */ @@ -517,7 +517,7 @@ numeric_round(PG_FUNCTION_ARGS) if (i < 0) { - Assert(i == -1); /* better not have added more than 1 digit */ + Assert(i == -1); /* better not have added more than 1 digit */ Assert(arg.digits > arg.buf); arg.digits--; arg.ndigits++; diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index bb7f894441..ebba29a01e 100644 --- a/src/backend/utils/adt/numutils.c +++ b/src/backend/utils/adt/numutils.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.46 2001/10/25 05:49:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.47 2001/10/28 06:25:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -475,4 +475,5 @@ atof1(char *str, double *val) *val = v; return 0; } + #endif diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index 17abbbd5a3..28d282e60d 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -4,7 +4,7 @@ * The PostgreSQL locale utils. * * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/pg_locale.c,v 1.11 2001/10/25 05:49:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/pg_locale.c,v 1.12 2001/10/28 06:25:52 momjian Exp $ * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group * @@ -196,4 +196,5 @@ PGLC_localeconv(void) CurrentLocaleConvValid = true; return &CurrentLocaleConv; } + #endif /* USE_LOCALE */ diff --git a/src/backend/utils/adt/quote.c b/src/backend/utils/adt/quote.c index 45e4c1133d..39a1ec4df1 100644 --- a/src/backend/utils/adt/quote.c +++ b/src/backend/utils/adt/quote.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/quote.c,v 1.5 2001/10/25 05:49:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/quote.c,v 1.6 2001/10/28 06:25:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -289,4 +289,5 @@ do_quote_literal(text *lptr) return result; } + #endif diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index e7d319e9b6..7175627111 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.100 2001/10/25 05:49:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.101 2001/10/28 06:25:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1102,7 +1102,7 @@ booltestsel(Query *root, BooleanTest *clause, int varRelid) default: elog(ERROR, "booltestsel: unexpected booltesttype %d", (int) clause->booltesttype); - selec = 0.0; /* Keep compiler quiet */ + selec = 0.0; /* Keep compiler quiet */ break; } @@ -1143,7 +1143,7 @@ booltestsel(Query *root, BooleanTest *clause, int varRelid) default: elog(ERROR, "booltestsel: unexpected booltesttype %d", (int) clause->booltesttype); - selec = 0.0; /* Keep compiler quiet */ + selec = 0.0; /* Keep compiler quiet */ break; } } @@ -2037,7 +2037,7 @@ convert_string_datum(Datum value, Oid typid) #ifdef USE_LOCALE /* Guess that transformed string is not much bigger than original */ - xfrmsize = strlen(val) + 32; /* arbitrary pad value here... */ + xfrmsize = strlen(val) + 32; /* arbitrary pad value here... */ xfrmstr = (char *) palloc(xfrmsize); xfrmlen = strxfrm(xfrmstr, val, xfrmsize); if (xfrmlen >= xfrmsize) @@ -2758,7 +2758,7 @@ regex_selectivity_sub(char *patt, int pattlen, bool case_insensitive) if (patt[pos] == '(') { if (paren_depth == 0) - paren_pos = pos; /* remember start of parenthesized item */ + paren_pos = pos; /* remember start of parenthesized item */ paren_depth++; } else if (patt[pos] == ')' && paren_depth > 0) diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fe347fe5fb..efac9a73a9 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.84 2001/10/25 05:49:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.85 2001/10/28 06:25:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,7 @@ #include "utils/syscache.h" - /* #define CACHEDEBUG *//* turns DEBUG elogs on */ + /* #define CACHEDEBUG */ /* turns DEBUG elogs on */ /* * Constants related to size of the catcache. diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 1073841f9d..9f1698df64 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.147 2001/10/25 05:49:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.148 2001/10/28 06:25:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -379,7 +379,7 @@ scan_pg_rel_ind(RelationBuildDescInfo buildinfo) default: elog(ERROR, "ScanPgRelation: bad buildinfo"); - return_tuple = NULL; /* keep compiler quiet */ + return_tuple = NULL; /* keep compiler quiet */ } heap_close(pg_class_desc, AccessShareLock); diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c index d12cbcbbf1..904b32ac29 100644 --- a/src/backend/utils/hash/dynahash.c +++ b/src/backend/utils/hash/dynahash.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.39 2001/10/25 05:49:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.40 2001/10/28 06:25:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -630,7 +630,7 @@ hash_search(HTAB *hashp, { /* no free elements. allocate another chunk of buckets */ if (!element_alloc(hashp)) - return NULL; /* out of memory */ + return NULL; /* out of memory */ currBucket = hctl->freeList; Assert(currBucket != NULL); } diff --git a/src/backend/utils/hash/pg_crc.c b/src/backend/utils/hash/pg_crc.c index 86a714aa40..4ed8c66528 100644 --- a/src/backend/utils/hash/pg_crc.c +++ b/src/backend/utils/hash/pg_crc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/hash/pg_crc.c,v 1.4 2001/10/25 05:49:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/hash/pg_crc.c,v 1.5 2001/10/28 06:25:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -413,4 +413,5 @@ const uint64 crc_table[256] = { INT64CONST(0x5DEDC41A34BBEEB2), INT64CONST(0x1F1D25F19D51D821), INT64CONST(0xD80C07CD676F8394), INT64CONST(0x9AFCE626CE85B507) }; + #endif /* INT64_IS_BUSTED */ diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index edec4a8329..3dc6deb0cb 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.95 2001/10/25 05:49:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.96 2001/10/28 06:25:54 momjian Exp $ * * *------------------------------------------------------------------------- @@ -409,7 +409,7 @@ ShutdownPostgres(void) * has to happen before bufmgr shutdown, so having smgr register a * callback for it wouldn't work. */ - smgrDoPendingDeletes(false); /* delete as though aborting xact */ + smgrDoPendingDeletes(false); /* delete as though aborting xact */ } diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c index a3ff9aaf8f..3a890a674c 100644 --- a/src/backend/utils/mb/conv.c +++ b/src/backend/utils/mb/conv.c @@ -6,7 +6,7 @@ * WIN1250 client encoding support contributed by Pavel Behal * SJIS UDC (NEC selection IBM kanji) support contributed by Eiji Tokuya * - * $Id: conv.c,v 1.33 2001/10/25 05:49:51 momjian Exp $ + * $Id: conv.c,v 1.34 2001/10/28 06:25:54 momjian Exp $ * * */ @@ -63,7 +63,6 @@ #include "Unicode/utf8_to_alt.map" #include "Unicode/utf8_to_koi8r.map" #include "Unicode/utf8_to_win1251.map" - #endif /* UNICODE_CONVERSION */ /* @@ -619,7 +618,7 @@ big52mic(unsigned char *big5, unsigned char *p, int len) { if (lc == LC_CNS11643_3 || lc == LC_CNS11643_4) { - *p++ = 0x9d; /* LCPRV2 */ + *p++ = 0x9d; /* LCPRV2 */ } *p++ = lc; /* Plane No. */ *p++ = (cnsBuf >> 8) & 0x00ff; @@ -1677,7 +1676,7 @@ pg_enconv pg_enconv_tbl[] = { { PG_SQL_ASCII, ascii2mic, mic2ascii, ascii2utf, utf2ascii - } , + }, { PG_EUC_JP, euc_jp2mic, mic2euc_jp, euc_jp_to_utf, utf_to_euc_jp }, @@ -1765,7 +1764,7 @@ pg_enconv pg_enconv_tbl[] = { { PG_SQL_ASCII, ascii2mic, mic2ascii, 0, 0 - } , + }, { PG_EUC_JP, euc_jp2mic, mic2euc_jp, 0, 0 }, @@ -1845,4 +1844,5 @@ pg_enconv pg_enconv_tbl[] = PG_WIN1250, win12502mic, mic2win1250, 0, 0 }, }; + #endif /* UNICODE_CONVERSION */ diff --git a/src/backend/utils/mb/encnames.c b/src/backend/utils/mb/encnames.c index 7667e478aa..84446a2640 100644 --- a/src/backend/utils/mb/encnames.c +++ b/src/backend/utils/mb/encnames.c @@ -2,7 +2,7 @@ * Encoding names and routines for work with it. All * in this file is shared bedween FE and BE. * - * $Id: encnames.c,v 1.5 2001/10/25 05:49:51 momjian Exp $ + * $Id: encnames.c,v 1.6 2001/10/28 06:25:56 momjian Exp $ */ #ifdef FRONTEND #include "postgres_fe.h" @@ -38,7 +38,7 @@ pg_encname pg_encname_tbl[] = { { "alt", PG_ALT - } , /* IBM866 */ + }, /* IBM866 */ { "big5", PG_BIG5 }, /* Big5; Chinese for Taiwan Multi-byte set */ @@ -191,7 +191,7 @@ pg_enc2name pg_enc2name_tbl[] = { { "SQL_ASCII", PG_SQL_ASCII - } , + }, { "EUC_JP", PG_EUC_JP }, @@ -418,4 +418,5 @@ PG_encoding_to_char(PG_FUNCTION_ARGS) return DirectFunctionCall1(namein, CStringGetDatum(encoding_name)); } + #endif diff --git a/src/backend/utils/mb/wchar.c b/src/backend/utils/mb/wchar.c index 9d778d0041..4f6a54c8ee 100644 --- a/src/backend/utils/mb/wchar.c +++ b/src/backend/utils/mb/wchar.c @@ -1,7 +1,7 @@ /* * conversion functions between pg_wchar and multi-byte streams. * Tatsuo Ishii - * $Id: wchar.c,v 1.25 2001/10/25 05:49:51 momjian Exp $ + * $Id: wchar.c,v 1.26 2001/10/28 06:25:56 momjian Exp $ * * WIN1250 client encoding updated by Pavel Behal * @@ -602,4 +602,5 @@ pg_database_encoding_max_length(void) { return pg_wchar_table[GetDatabaseEncoding()].maxmblen; } + #endif diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index ff57dc92bb..52aa0e0387 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -4,7 +4,7 @@ * Support for grand unified configuration scheme, including SET * command, configuration file, and command line options. * - * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.56 2001/10/25 05:49:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.57 2001/10/28 06:25:56 momjian Exp $ * * Copyright 2000 by PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. @@ -95,11 +95,11 @@ bool Password_encryption = false; */ enum config_type { - PGC_NONE = 0, - PGC_BOOL, - PGC_INT, - PGC_REAL, - PGC_STRING + PGC_NONE = 0, + PGC_BOOL, + PGC_INT, + PGC_REAL, + PGC_STRING }; @@ -194,7 +194,7 @@ static struct config_bool { { "enable_seqscan", PGC_USERSET, &enable_seqscan, true, NULL - } , + }, { "enable_indexscan", PGC_USERSET, &enable_indexscan, true, NULL }, @@ -353,34 +353,34 @@ static struct config_int { { "geqo_threshold", PGC_USERSET, &geqo_rels, - DEFAULT_GEQO_RELS, 2, INT_MAX, NULL, NULL - } , + DEFAULT_GEQO_RELS, 2, INT_MAX, NULL, NULL + }, { "geqo_pool_size", PGC_USERSET, &Geqo_pool_size, - DEFAULT_GEQO_POOL_SIZE, 0, MAX_GEQO_POOL_SIZE, NULL, NULL + DEFAULT_GEQO_POOL_SIZE, 0, MAX_GEQO_POOL_SIZE, NULL, NULL }, { "geqo_effort", PGC_USERSET, &Geqo_effort, - 1, 1, INT_MAX, NULL, NULL + 1, 1, INT_MAX, NULL, NULL }, { "geqo_generations", PGC_USERSET, &Geqo_generations, - 0, 0, INT_MAX, NULL, NULL + 0, 0, INT_MAX, NULL, NULL }, { "geqo_random_seed", PGC_USERSET, &Geqo_random_seed, - -1, INT_MIN, INT_MAX, NULL, NULL + -1, INT_MIN, INT_MAX, NULL, NULL }, { "deadlock_timeout", PGC_POSTMASTER, &DeadlockTimeout, - 1000, 0, INT_MAX, NULL, NULL + 1000, 0, INT_MAX, NULL, NULL }, #ifdef ENABLE_SYSLOG { "syslog", PGC_SIGHUP, &Use_syslog, - 0, 0, 2, NULL, NULL + 0, 0, 2, NULL, NULL }, #endif @@ -391,116 +391,116 @@ static struct config_int */ { "max_connections", PGC_POSTMASTER, &MaxBackends, - DEF_MAXBACKENDS, 1, INT_MAX, NULL, NULL + DEF_MAXBACKENDS, 1, INT_MAX, NULL, NULL }, { "shared_buffers", PGC_POSTMASTER, &NBuffers, - DEF_NBUFFERS, 16, INT_MAX, NULL, NULL + DEF_NBUFFERS, 16, INT_MAX, NULL, NULL }, { "port", PGC_POSTMASTER, &PostPortNumber, - DEF_PGPORT, 1, 65535, NULL, NULL + DEF_PGPORT, 1, 65535, NULL, NULL }, { "unix_socket_permissions", PGC_POSTMASTER, &Unix_socket_permissions, - 0777, 0000, 0777, NULL, NULL + 0777, 0000, 0777, NULL, NULL }, { "sort_mem", PGC_USERSET, &SortMem, - 512, 4 * BLCKSZ / 1024, INT_MAX, NULL, NULL + 512, 4 * BLCKSZ / 1024, INT_MAX, NULL, NULL }, { "vacuum_mem", PGC_USERSET, &VacuumMem, - 8192, 1024, INT_MAX, NULL, NULL + 8192, 1024, INT_MAX, NULL, NULL }, { "max_files_per_process", PGC_BACKEND, &max_files_per_process, - 1000, 25, INT_MAX, NULL, NULL + 1000, 25, INT_MAX, NULL, NULL }, { "debug_level", PGC_USERSET, &DebugLvl, - 0, 0, 16, NULL, NULL + 0, 0, 16, NULL, NULL }, #ifdef LOCK_DEBUG { "trace_lock_oidmin", PGC_SUSET, &Trace_lock_oidmin, - BootstrapObjectIdData, 1, INT_MAX, NULL, NULL + BootstrapObjectIdData, 1, INT_MAX, NULL, NULL }, { "trace_lock_table", PGC_SUSET, &Trace_lock_table, - 0, 0, INT_MAX, NULL, NULL + 0, 0, INT_MAX, NULL, NULL }, #endif { "max_expr_depth", PGC_USERSET, &max_expr_depth, - DEFAULT_MAX_EXPR_DEPTH, 10, INT_MAX, NULL, NULL + DEFAULT_MAX_EXPR_DEPTH, 10, INT_MAX, NULL, NULL }, { "max_fsm_relations", PGC_POSTMASTER, &MaxFSMRelations, - 100, 10, INT_MAX, NULL, NULL + 100, 10, INT_MAX, NULL, NULL }, { "max_fsm_pages", PGC_POSTMASTER, &MaxFSMPages, - 10000, 1000, INT_MAX, NULL, NULL + 10000, 1000, INT_MAX, NULL, NULL }, { "max_locks_per_transaction", PGC_POSTMASTER, &max_locks_per_xact, - 64, 10, INT_MAX, NULL, NULL + 64, 10, INT_MAX, NULL, NULL }, { "authentication_timeout", PGC_SIGHUP, &AuthenticationTimeout, - 60, 1, 600, NULL, NULL + 60, 1, 600, NULL, NULL }, { "pre_auth_delay", PGC_SIGHUP, &PreAuthDelay, - 0, 0, 60, NULL, NULL + 0, 0, 60, NULL, NULL }, { "checkpoint_segments", PGC_SIGHUP, &CheckPointSegments, - 3, 1, INT_MAX, NULL, NULL + 3, 1, INT_MAX, NULL, NULL }, { "checkpoint_timeout", PGC_SIGHUP, &CheckPointTimeout, - 300, 30, 3600, NULL, NULL + 300, 30, 3600, NULL, NULL }, { "wal_buffers", PGC_POSTMASTER, &XLOGbuffers, - 8, 4, INT_MAX, NULL, NULL + 8, 4, INT_MAX, NULL, NULL }, { "wal_files", PGC_SIGHUP, &XLOGfiles, - 0, 0, 64, NULL, NULL + 0, 0, 64, NULL, NULL }, { "wal_debug", PGC_SUSET, &XLOG_DEBUG, - 0, 0, 16, NULL, NULL + 0, 0, 16, NULL, NULL }, { "commit_delay", PGC_USERSET, &CommitDelay, - 0, 0, 100000, NULL, NULL + 0, 0, 100000, NULL, NULL }, { "commit_siblings", PGC_USERSET, &CommitSiblings, - 5, 1, 1000, NULL, NULL + 5, 1, 1000, NULL, NULL }, { @@ -514,29 +514,29 @@ static struct config_real { { "effective_cache_size", PGC_USERSET, &effective_cache_size, - DEFAULT_EFFECTIVE_CACHE_SIZE, 0, DBL_MAX, NULL, NULL - } , + DEFAULT_EFFECTIVE_CACHE_SIZE, 0, DBL_MAX, NULL, NULL + }, { "random_page_cost", PGC_USERSET, &random_page_cost, - DEFAULT_RANDOM_PAGE_COST, 0, DBL_MAX, NULL, NULL + DEFAULT_RANDOM_PAGE_COST, 0, DBL_MAX, NULL, NULL }, { "cpu_tuple_cost", PGC_USERSET, &cpu_tuple_cost, - DEFAULT_CPU_TUPLE_COST, 0, DBL_MAX, NULL, NULL + DEFAULT_CPU_TUPLE_COST, 0, DBL_MAX, NULL, NULL }, { "cpu_index_tuple_cost", PGC_USERSET, &cpu_index_tuple_cost, - DEFAULT_CPU_INDEX_TUPLE_COST, 0, DBL_MAX, NULL, NULL + DEFAULT_CPU_INDEX_TUPLE_COST, 0, DBL_MAX, NULL, NULL }, { "cpu_operator_cost", PGC_USERSET, &cpu_operator_cost, - DEFAULT_CPU_OPERATOR_COST, 0, DBL_MAX, NULL, NULL + DEFAULT_CPU_OPERATOR_COST, 0, DBL_MAX, NULL, NULL }, { "geqo_selection_bias", PGC_USERSET, &Geqo_selection_bias, - DEFAULT_GEQO_SELECTION_BIAS, MIN_GEQO_SELECTION_BIAS, - MAX_GEQO_SELECTION_BIAS, NULL, NULL + DEFAULT_GEQO_SELECTION_BIAS, MIN_GEQO_SELECTION_BIAS, + MAX_GEQO_SELECTION_BIAS, NULL, NULL }, { @@ -550,49 +550,49 @@ static struct config_string { { "default_transaction_isolation", PGC_USERSET, &default_iso_level_string, - "read committed", check_defaultxactisolevel, assign_defaultxactisolevel - } , + "read committed", check_defaultxactisolevel, assign_defaultxactisolevel + }, { "dynamic_library_path", PGC_SUSET, &Dynamic_library_path, - "$libdir", NULL, NULL + "$libdir", NULL, NULL }, { "krb_server_keyfile", PGC_POSTMASTER, &pg_krb_server_keyfile, - PG_KRB_SRVTAB, NULL, NULL + PG_KRB_SRVTAB, NULL, NULL }, #ifdef ENABLE_SYSLOG { "syslog_facility", PGC_POSTMASTER, &Syslog_facility, - "LOCAL0", check_facility, NULL + "LOCAL0", check_facility, NULL }, { "syslog_ident", PGC_POSTMASTER, &Syslog_ident, - "postgres", NULL, NULL + "postgres", NULL, NULL }, #endif { "unix_socket_group", PGC_POSTMASTER, &Unix_socket_group, - "", NULL, NULL + "", NULL, NULL }, { "unix_socket_directory", PGC_POSTMASTER, &UnixSocketDir, - "", NULL, NULL + "", NULL, NULL }, { "virtual_host", PGC_POSTMASTER, &VirtualHost, - "", NULL, NULL + "", NULL, NULL }, { "wal_sync_method", PGC_SIGHUP, &XLOG_sync_method, - XLOG_sync_method_default, check_xlog_sync_method, - assign_xlog_sync_method + XLOG_sync_method_default, check_xlog_sync_method, + assign_xlog_sync_method }, { diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c index 65d2e10cdb..f1bd25036b 100644 --- a/src/backend/utils/misc/ps_status.c +++ b/src/backend/utils/misc/ps_status.c @@ -5,7 +5,7 @@ * to contain some useful information. Mechanism differs wildly across * platforms. * - * $Header: /cvsroot/pgsql/src/backend/utils/misc/ps_status.c,v 1.8 2001/10/25 05:49:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/ps_status.c,v 1.9 2001/10/28 06:25:57 momjian Exp $ * * Copyright 2000 by PostgreSQL Global Development Group * various details abducted from various places @@ -126,7 +126,7 @@ save_ps_display_args(int argc, char *argv[]) end_of_area = argv[i] + strlen(argv[i]); } - if (end_of_area == NULL)/* probably can't happen? */ + if (end_of_area == NULL) /* probably can't happen? */ { ps_buffer = NULL; ps_buffer_size = 0; diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c index 24fd0d1793..f45fb63fd8 100644 --- a/src/backend/utils/mmgr/aset.c +++ b/src/backend/utils/mmgr/aset.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.42 2001/10/25 05:49:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.43 2001/10/28 06:25:57 momjian Exp $ * * NOTE: * This is a new (Feb. 05, 1999) implementation of the allocation set @@ -1082,4 +1082,5 @@ AllocSetCheck(MemoryContext context) name, block); } } + #endif /* MEMORY_CONTEXT_CHECKING */ diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index 5cf8e3ad1d..796be9d6c7 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -78,7 +78,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplesort.c,v 1.19 2001/10/25 05:49:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplesort.c,v 1.20 2001/10/28 06:25:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -104,13 +104,12 @@ */ typedef enum { - TSS_INITIAL, /* Loading tuples; still within memory + TSS_INITIAL, /* Loading tuples; still within memory * limit */ - TSS_BUILDRUNS, /* Loading tuples; writing to tape */ - TSS_SORTEDINMEM,/* Sort completed entirely in memory */ - TSS_SORTEDONTAPE, /* Sort completed, final run is on - * tape */ - TSS_FINALMERGE /* Performing final merge on-the-fly */ + TSS_BUILDRUNS, /* Loading tuples; writing to tape */ + TSS_SORTEDINMEM, /* Sort completed entirely in memory */ + TSS_SORTEDONTAPE, /* Sort completed, final run is on tape */ + TSS_FINALMERGE /* Performing final merge on-the-fly */ } TupSortStatus; /* diff --git a/src/backend/utils/sort/tuplestore.c b/src/backend/utils/sort/tuplestore.c index 6e241c480f..b7e35d5a18 100644 --- a/src/backend/utils/sort/tuplestore.c +++ b/src/backend/utils/sort/tuplestore.c @@ -26,7 +26,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplestore.c,v 1.4 2001/10/25 05:49:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplestore.c,v 1.5 2001/10/28 06:25:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,11 +43,11 @@ */ typedef enum { - TSS_INITIAL, /* Loading tuples; still within memory + TSS_INITIAL, /* Loading tuples; still within memory * limit */ - TSS_WRITEFILE, /* Loading tuples; writing to temp file */ - TSS_READMEM, /* Reading tuples; entirely in memory */ - TSS_READFILE /* Reading tuples from temp file */ + TSS_WRITEFILE, /* Loading tuples; writing to temp file */ + TSS_READMEM, /* Reading tuples; entirely in memory */ + TSS_READFILE /* Reading tuples from temp file */ } TupStoreStatus; /* diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c index 194959f6cc..5919494849 100644 --- a/src/backend/utils/time/tqual.c +++ b/src/backend/utils/time/tqual.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.43 2001/10/25 05:49:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.44 2001/10/28 06:25:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -324,7 +324,7 @@ HeapTupleSatisfiesUpdate(HeapTuple tuple) { if (th->t_infomask & HEAP_MARKED_FOR_UPDATE) return HeapTupleMayBeUpdated; - return HeapTupleUpdated; /* updated by other */ + return HeapTupleUpdated; /* updated by other */ } if (TransactionIdIsCurrentTransactionId(th->t_xmax)) |