diff options
Diffstat (limited to 'src/backend')
111 files changed, 381 insertions, 370 deletions
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index 0c4e698f016..38fe008e8ea 100644 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.85 2001/10/25 05:49:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.86 2001/11/05 17:46:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1934,7 +1934,7 @@ gist_dumptree(Relation r, int level, BlockNumber blk, OffsetNumber coff) ReleaseBuffer(buffer); pfree(pred); } -#endif /* defined GISTDEBUG */ +#endif /* defined GISTDEBUG */ void gist_redo(XLogRecPtr lsn, XLogRecord *record) diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index bf7798a07dc..5073a2e1900 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.127 2001/11/02 16:30:29 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.128 2001/11/05 17:46:23 momjian Exp $ * * * INTERFACE ROUTINES @@ -156,7 +156,7 @@ heapgettup(Relation relation, elog(DEBUG, "heapgettup: relation(%c)=`%s', %p", relation->rd_rel->relkind, RelationGetRelationName(relation), snapshot); -#endif /* !defined(HEAPDEBUGALL) */ +#endif /* !defined(HEAPDEBUGALL) */ if (!ItemPointerIsValid(tid)) { @@ -433,7 +433,7 @@ fastgetattr(HeapTuple tup, int attnum, TupleDesc tupleDesc, ) ); } -#endif /* defined(DISABLE_COMPLEX_MACRO) */ +#endif /* defined(DISABLE_COMPLEX_MACRO) */ /* ---------------------------------------------------------------- @@ -501,12 +501,12 @@ relation_openr(const char *relationName, LOCKMODE lockmode) /* * Check for shared-cache-inval messages before trying to open the - * relation. This is needed to cover the case where the name identifies - * a rel that has been dropped and recreated since the start of our - * transaction: if we don't flush the old relcache entry then we'll - * latch onto that entry and suffer an error when we do LockRelation. - * Note that relation_open does not need to do this, since a relation's - * OID never changes. + * relation. This is needed to cover the case where the name + * identifies a rel that has been dropped and recreated since the + * start of our transaction: if we don't flush the old relcache entry + * then we'll latch onto that entry and suffer an error when we do + * LockRelation. Note that relation_open does not need to do this, + * since a relation's OID never changes. * * We skip this if asked for NoLock, on the assumption that the caller * has already ensured some appropriate lock is held. @@ -757,7 +757,7 @@ elog(DEBUG, "heap_getnext([%s,nkeys=%d],backw=%d) called", \ #define HEAPDEBUG_1 #define HEAPDEBUG_2 #define HEAPDEBUG_3 -#endif /* !defined(HEAPDEBUGALL) */ +#endif /* !defined(HEAPDEBUGALL) */ HeapTuple diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c index 5ddefde8c71..f46c75fd6a5 100644 --- a/src/backend/access/heap/tuptoaster.c +++ b/src/backend/access/heap/tuptoaster.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/heap/tuptoaster.c,v 1.25 2001/10/25 05:49:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/heap/tuptoaster.c,v 1.26 2001/11/05 17:46:23 momjian Exp $ * * * INTERFACE ROUTINES @@ -1085,4 +1085,4 @@ toast_fetch_datum(varattrib *attr) return result; } -#endif /* TUPLE_TOASTER_ACTIVE */ +#endif /* TUPLE_TOASTER_ACTIVE */ diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c index 4fa9add7bde..9e0fb8fe133 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.55 2001/10/28 06:25:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.56 2001/11/05 17:46:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -641,4 +641,4 @@ IndexStrategyDisplay(IndexStrategy indexStrategy, } } -#endif /* defined(ISTRATDEBUG) */ +#endif /* defined(ISTRATDEBUG) */ diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index e49f06b1c38..bf3e39640d9 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -12,7 +12,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.83 2001/10/25 05:49:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.84 2001/11/05 17:46:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -119,7 +119,7 @@ btbuild(PG_FUNCTION_ARGS) #ifdef BTREE_BUILD_STATS if (Show_btree_build_stats) ResetUsage(); -#endif /* BTREE_BUILD_STATS */ +#endif /* BTREE_BUILD_STATS */ /* * We expect to be called exactly once for any index relation. If @@ -175,7 +175,7 @@ btbuild(PG_FUNCTION_ARGS) ShowUsage(); ResetUsage(); } -#endif /* BTREE_BUILD_STATS */ +#endif /* BTREE_BUILD_STATS */ /* all done */ BuildingBtree = false; diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index 4b327bff45f..6d584526f55 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -35,7 +35,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsort.c,v 1.61 2001/10/25 05:49:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsort.c,v 1.62 2001/11/05 17:46:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -164,7 +164,7 @@ _bt_leafbuild(BTSpool *btspool, BTSpool *btspool2) ShowUsage(); ResetUsage(); } -#endif /* BTREE_BUILD_STATS */ +#endif /* BTREE_BUILD_STATS */ tuplesort_performsort(btspool->sortstate); if (btspool2) diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c index 9843e0cb935..1e74678831f 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.67 2001/10/28 06:25:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.68 2001/11/05 17:46:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1340,7 +1340,7 @@ _rtdump(Relation r) ReleaseBuffer(buf); } } -#endif /* defined RTDEBUG */ +#endif /* defined RTDEBUG */ void rtree_redo(XLogRecPtr lsn, XLogRecord *record) diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c index bb94fc27a13..5c26227748c 100644 --- a/src/backend/access/transam/transam.c +++ b/src/backend/access/transam/transam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.49 2001/10/25 05:49:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.50 2001/11/05 17:46:24 momjian Exp $ * * NOTES * This file contains the high level access-method interface to the @@ -197,7 +197,7 @@ TransactionIdIsInProgress(TransactionId transactionId) return TransactionLogTest(transactionId, TRANSACTION_STATUS_IN_PROGRESS); } -#endif /* NOT_USED */ +#endif /* NOT_USED */ /* -------------------------------- * TransactionId Commit diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index e5c2f7d7582..11bc02e1a99 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.81 2001/11/04 19:55:31 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.82 2001/11/05 17:46:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -2052,7 +2052,7 @@ WriteControlFile(void) #else /* not USE_LOCALE */ strcpy(ControlFile->lc_collate, "C"); strcpy(ControlFile->lc_ctype, "C"); -#endif /* not USE_LOCALE */ +#endif /* not USE_LOCALE */ /* Contents are protected with a CRC */ INIT_CRC64(ControlFile->crc); @@ -2187,7 +2187,7 @@ ReadControlFile(void) "\tLC_CTYPE '%s', but the server was compiled without locale support.\n" "\tIt looks like you need to initdb or recompile.", ControlFile->lc_collate, ControlFile->lc_ctype); -#endif /* not USE_LOCALE */ +#endif /* not USE_LOCALE */ } void diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index 123dbdd2473..932eeeedbff 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.52 2001/10/25 05:49:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.53 2001/11/05 17:46:24 momjian Exp $ * * NOTES * See acl.h. @@ -61,7 +61,7 @@ dumpacl(Acl *acl) DatumGetCString(DirectFunctionCall1(aclitemout, PointerGetDatum(aip + i)))); } -#endif /* ACLDEBUG */ +#endif /* ACLDEBUG */ /* diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index b5c25516cd1..ca05a836189 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.168 2001/11/02 16:30:29 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.169 2001/11/05 17:46:24 momjian Exp $ * * * INTERFACE ROUTINES @@ -2027,7 +2027,7 @@ reindex_relation(Oid relid, bool force) else elog(ERROR, "the target relation %u is nailed", relid); } -#endif /* ENABLE_REINDEX_NAILED_RELATIONS */ +#endif /* ENABLE_REINDEX_NAILED_RELATIONS */ /* * Shared system indexes must be overwritten because it's impossible diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index 016b9c1d983..32d9293f566 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.62 2001/10/25 05:49:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.63 2001/11/05 17:46:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -157,7 +157,7 @@ ProcedureCreate(char *procedureName, return retval; #else elog(ERROR, "lookup for procedure by source needs fix (Jan)"); -#endif /* SETS_FIXED */ +#endif /* SETS_FIXED */ } } diff --git a/src/backend/commands/_deadcode/recipe.c b/src/backend/commands/_deadcode/recipe.c index 3cc26fa51c6..94c80ca0860 100644 --- a/src/backend/commands/_deadcode/recipe.c +++ b/src/backend/commands/_deadcode/recipe.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.14 2001/10/25 05:49:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.15 2001/11/05 17:46:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -54,13 +54,13 @@ typedef struct _teePlanInfo char *tpi_relName; Query *tpi_parsetree; Plan *tpi_plan; -} TeePlanInfo; +} TeePlanInfo; typedef struct _teeInfo { int num; TeePlanInfo *val; -} TeeInfo; +} TeeInfo; QueryTreeList *appendQlist(QueryTreeList * q1, QueryTreeList * q2); void OffsetVarAttno(Node *node, int varno, int offset); @@ -186,7 +186,7 @@ beginRecipe(RecipeStmt *stmt) #ifdef DEBUG_RECIPE elog(NOTICE, "beginRecipe: eyes[%d] = %s\n", i, e->nodeName); -#endif /* DEBUG_RECIPE */ +#endif /* DEBUG_RECIPE */ qList = tg_parseSubQuery(r, e->inNodes->val[0], teeInfo); @@ -835,7 +835,7 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo) #ifdef DEBUG_RECIPE elog(NOTICE, "calling parser with %s", elem->src); -#endif /* DEBUG_RECIPE */ +#endif /* DEBUG_RECIPE */ parameterCount = getParamTypes(elem, typev); @@ -878,7 +878,7 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo) #ifdef DEBUG_RECIPE elog(NOTICE, "calling parser with %s", newquery); -#endif /* DEBUG_RECIPE */ +#endif /* DEBUG_RECIPE */ qList = parser(newquery, typev, parameterCount); if (qList->len > 1) @@ -1315,4 +1315,4 @@ replaceTeeScans(Plan *plan, Query *parsetree, TeeInfo * teeInfo) } -#endif /* TIOGA */ +#endif /* TIOGA */ diff --git a/src/backend/commands/_deadcode/recipe.h b/src/backend/commands/_deadcode/recipe.h index b09b9bbfffc..eb707283a2b 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.5 2001/10/28 06:25:43 momjian Exp $ + * $Id: recipe.h,v 1.6 2001/11/05 17:46:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,4 @@ extern void beginRecipe(RecipeStmt *stmt); -#endif /* RECIPE_H */ +#endif /* RECIPE_H */ diff --git a/src/backend/commands/_deadcode/version.c b/src/backend/commands/_deadcode/version.c index 81e7a8f91f8..c939e544a65 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.28 2001/10/28 06:25:43 momjian Exp $ + * $Id: version.c,v 1.29 2001/11/05 17:46:25 momjian Exp $ * * NOTES * At the point the version is defined, 2 physical relations are created @@ -287,7 +287,7 @@ VersionDelete(char *vname, char *bname, char *snapshot) vname, vname, vname, bname, bname, snapshot, bname); eval_as_new_xact(rule_buf); -#endif /* OLD_REWRITE */ +#endif /* OLD_REWRITE */ } #endif @@ -338,7 +338,7 @@ VersionReplace(char *vname, char *bname, char *snapshot) vname, vname, vname, attr_list, bname, bname, snapshot, vname, bname); eval_as_new_xact(rule_buf); -#endif /* OLD_REWRITE */ +#endif /* OLD_REWRITE */ /* printf("%s\n",rule_buf); */ } diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c index 93c52e1b334..d5afd8b44f5 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.149 2001/11/02 16:30:29 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.150 2001/11/05 17:46:24 momjian Exp $ * * NOTES * The PerformAddAttribute() code, like most of the relation @@ -819,7 +819,7 @@ typedef struct SysScanDescData IndexScanDesc iscan; HeapTupleData tuple; Buffer buffer; -} SysScanDescData, *SysScanDesc; +} SysScanDescData, *SysScanDesc; static void * systable_beginscan(Relation rel, const char *indexRelname, int nkeys, ScanKey entry) @@ -1017,7 +1017,7 @@ RemoveColumnReferences(Oid reloid, int attnum, bool checkonly, HeapTuple reltup) return checkok; } -#endif /* _DROP_COLUMN_HACK__ */ +#endif /* _DROP_COLUMN_HACK__ */ /* * ALTER TABLE DROP COLUMN @@ -1174,7 +1174,7 @@ AlterTableDropColumn(const char *relationName, heap_close(rel, NoLock); #else elog(ERROR, "ALTER TABLE / DROP COLUMN is not implemented"); -#endif /* _DROP_COLUMN_HACK__ */ +#endif /* _DROP_COLUMN_HACK__ */ } diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c index 37a338ff961..b8a1c92e145 100644 --- a/src/backend/commands/remove.c +++ b/src/backend/commands/remove.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.64 2001/10/25 05:49:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.65 2001/11/05 17:46:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -227,7 +227,7 @@ AttributeAndRelationRemove(Oid typeOid) } heap_close(rel, RowExclusiveLock); } -#endif /* NOTYET */ +#endif /* NOTYET */ /* * TypeRemove diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c index 42abe24f138..d319161b9ae 100644 --- a/src/backend/commands/rename.c +++ b/src/backend/commands/rename.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.60 2001/11/02 16:30:29 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.61 2001/11/05 17:46:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -258,8 +258,8 @@ renamerel(const char *oldrelname, const char *newrelname) return; /* all done... */ /* - * Grab an exclusive lock on the target table or index, which we will NOT - * release until end of transaction. + * Grab an exclusive lock on the target table or index, which we will + * NOT release until end of transaction. */ targetrelation = relation_openr(oldrelname, AccessExclusiveLock); diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index c1f76152c5c..3ca1243a7e4 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.66 2001/10/28 06:25:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.67 2001/11/05 17:46:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,7 +38,7 @@ #endif #else /* INT64_IS_BUSTED */ #define SEQ_MAXVALUE ((int64) 0x7FFFFFFF) -#endif /* INT64_IS_BUSTED */ +#endif /* INT64_IS_BUSTED */ #define SEQ_MINVALUE (-SEQ_MAXVALUE) diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 9b95ecad274..a7ccd3768ff 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.89 2001/11/04 19:55:31 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.90 2001/11/05 17:46:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -101,12 +101,13 @@ write_password_file(Relation rel) str_n = DatumGetCString(DirectFunctionCall1(nameout, datum_n)); datum_p = heap_getattr(tuple, Anum_pg_shadow_passwd, dsc, &null_p); + /* * It can be argued that people having a null password shouldn't * be allowed to connect under password authentication, because - * they need to have a password set up first. If you think assuming an - * empty password in that case is better, change this logic to look - * something like the code for valuntil. + * they need to have a password set up first. If you think + * assuming an empty password in that case is better, change this + * logic to look something like the code for valuntil. */ if (null_p) { @@ -132,9 +133,9 @@ write_password_file(Relation rel) elog(ERROR, "Invalid user password '%s'", str_p); /* - * The extra columns we emit here are not really necessary. To remove - * them, the parser in backend/libpq/crypt.c would need to be - * adjusted. + * The extra columns we emit here are not really necessary. To + * remove them, the parser in backend/libpq/crypt.c would need to + * be adjusted. */ fprintf(fp, "%s" @@ -168,8 +169,8 @@ write_password_file(Relation rel) FreeFile(fp); /* - * Rename the temp file to its final name, deleting the old pg_pwd. - * We expect that rename(2) is an atomic action. + * Rename the temp file to its final name, deleting the old pg_pwd. We + * expect that rename(2) is an atomic action. */ if (rename(tempname, filename)) elog(ERROR, "rename %s to %s: %m", tempname, filename); diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 99e5fac7027..9b4dc959232 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.211 2001/10/28 06:25:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.212 2001/11/05 17:46:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -860,7 +860,7 @@ full_vacuum_rel(Relation onerel, VacuumStmt *vacstmt) Irel = (Relation *) NULL; activate_indexes_of_a_table(RelationGetRelid(onerel), false); } -#endif /* NOT_USED */ +#endif /* NOT_USED */ /* Clean/scan index relation(s) */ if (Irel != (Relation *) NULL) @@ -912,7 +912,7 @@ full_vacuum_rel(Relation onerel, VacuumStmt *vacstmt) #ifdef NOT_USED if (reindex) activate_indexes_of_a_table(RelationGetRelid(onerel), true); -#endif /* NOT_USED */ +#endif /* NOT_USED */ /* update shared free space map with final free space info */ vac_update_fsm(onerel, &fraged_pages, vacrelstats->rel_pages); diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 1fd625b1ad4..df9091e9b46 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.71 2001/10/28 06:25:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.72 2001/11/05 17:46:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -60,7 +60,7 @@ static struct pam_conv pam_passw_conv = { static char *pam_passwd = NULL; /* Workaround for Solaris 2.6 brokenness */ static Port *pam_port_cludge; /* Workaround for passing "Port *port" * into pam_passwd_conv_proc */ -#endif /* USE_PAM */ +#endif /* USE_PAM */ #ifdef KRB4 /*---------------------------------------------------------------- @@ -144,7 +144,7 @@ pg_krb4_recvauth(Port *port) return STATUS_ERROR; } -#endif /* KRB4 */ +#endif /* KRB4 */ #ifdef KRB5 @@ -325,7 +325,7 @@ pg_krb5_recvauth(Port *port) return STATUS_ERROR; } -#endif /* KRB5 */ +#endif /* KRB5 */ /* @@ -467,7 +467,7 @@ auth_failed(Port *port, int status) case uaPAM: authmethod = "PAM"; break; -#endif /* USE_PAM */ +#endif /* USE_PAM */ } elog(FATAL, "%s authentication failed for user \"%s\"", @@ -586,7 +586,7 @@ ClientAuthentication(Port *port) pam_port_cludge = port; status = CheckPAMAuth(port, port->user, ""); break; -#endif /* USE_PAM */ +#endif /* USE_PAM */ case uaTrust: status = STATUS_OK; @@ -819,7 +819,7 @@ CheckPAMAuth(Port *port, char *user, char *password) else return STATUS_ERROR; } -#endif /* USE_PAM */ +#endif /* USE_PAM */ /* @@ -920,7 +920,7 @@ map_old_to_new(Port *port, UserAuth old, int status) case uaReject: #ifdef USE_PAM case uaPAM: -#endif /* USE_PAM */ +#endif /* USE_PAM */ status = STATUS_ERROR; break; diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c index 83921ee014f..04fdad7f075 100644 --- a/src/backend/libpq/crypt.c +++ b/src/backend/libpq/crypt.c @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/libpq/crypt.c,v 1.41 2001/11/02 18:39:57 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/crypt.c,v 1.42 2001/11/05 17:46:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,8 +31,8 @@ #define CRYPT_PWD_FILE "pg_pwd" -static char **pwd_cache = NULL; -static int pwd_cache_count = 0; +static char **pwd_cache = NULL; +static int pwd_cache_count = 0; /* * crypt_getpwdfilename --- get full pathname of password file @@ -91,8 +91,8 @@ compar_user(const void *user_a, const void *user_b) login_b = *((char **) user_b); /* - * We only really want to compare the user logins which are first - * and are terminated by CRYPT_PWD_FILE_SEPSTR. (NB: this code + * We only really want to compare the user logins which are first and + * are terminated by CRYPT_PWD_FILE_SEPSTR. (NB: this code * effectively assumes that CRYPT_PWD_FILE_SEPSTR is just one char.) */ len_a = strcspn(login_a, CRYPT_PWD_FILE_SEPSTR); @@ -134,10 +134,10 @@ load_password_cache(void) } /* - * Read the file and store its lines in current memory context, - * which we expect will be PostmasterContext. That context will - * live as long as we need the cache to live, ie, until just after - * each postmaster child has completed client authentication. + * Read the file and store its lines in current memory context, which + * we expect will be PostmasterContext. That context will live as + * long as we need the cache to live, ie, until just after each + * postmaster child has completed client authentication. */ while (fgets(buffer, sizeof(buffer), pwd_file) != NULL) { diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 3c66f1f280f..7812f40097a 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.76 2001/10/28 06:25:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.77 2001/11/05 17:46:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1262,4 +1262,4 @@ GetCharSetByHost(char *TableName, int host, const char *DataDir) } } -#endif /* CYR_RECODE */ +#endif /* CYR_RECODE */ diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index 8ea425a7018..f3964997bea 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -29,7 +29,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqcomm.c,v 1.122 2001/10/25 05:49:30 momjian Exp $ + * $Id: pqcomm.c,v 1.123 2001/11/05 17:46:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -232,7 +232,7 @@ StreamServerPort(int family, char *hostName, unsigned short portNumber, */ unlink(sock_path); } -#endif /* HAVE_UNIX_SOCKETS */ +#endif /* HAVE_UNIX_SOCKETS */ if (family == AF_INET) { @@ -344,7 +344,7 @@ StreamServerPort(int family, char *hostName, unsigned short portNumber, return STATUS_ERROR; } } -#endif /* HAVE_UNIX_SOCKETS */ +#endif /* HAVE_UNIX_SOCKETS */ /* * Select appropriate accept-queue length limit. PG_SOMAXCONN is only diff --git a/src/backend/libpq/pqpacket.c b/src/backend/libpq/pqpacket.c index 5f9d3cdb48f..4fb707f0cf3 100644 --- a/src/backend/libpq/pqpacket.c +++ b/src/backend/libpq/pqpacket.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.29 2001/03/22 03:59:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.30 2001/11/05 17:46:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -65,7 +65,7 @@ PacketReceiveFragment(Port *port) got = read(port->sock, pkt->ptr, pkt->nrtodo); #else got = recv(port->sock, pkt->ptr, pkt->nrtodo, 0); -#endif /* __BEOS__ */ +#endif /* __BEOS__ */ if (got > 0) { pkt->nrtodo -= got; diff --git a/src/backend/libpq/pqsignal.c b/src/backend/libpq/pqsignal.c index d8c7a1d852c..fb07e680e3c 100644 --- a/src/backend/libpq/pqsignal.c +++ b/src/backend/libpq/pqsignal.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.24 2001/09/21 17:06:12 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.25 2001/11/05 17:46:25 momjian Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -147,5 +147,5 @@ pqsignal(int signo, pqsigfunc func) if (sigaction(signo, &act, &oact) < 0) return SIG_ERR; return oact.sa_handler; -#endif /* !HAVE_POSIX_SIGNALS */ +#endif /* !HAVE_POSIX_SIGNALS */ } diff --git a/src/backend/main/main.c b/src/backend/main/main.c index be5896e375f..b1be0781412 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.48 2001/10/25 05:49:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.49 2001/11/05 17:46:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,11 +67,11 @@ main(int argc, char *argv[]) #if defined(__alpha) #ifdef NOFIXADE int buffer[] = {SSIN_UACPROC, UAC_SIGBUS}; -#endif /* NOFIXADE */ +#endif /* NOFIXADE */ #ifdef NOPRINTADE int buffer[] = {SSIN_UACPROC, UAC_NOPRINT}; -#endif /* NOPRINTADE */ -#endif /* __alpha */ +#endif /* NOPRINTADE */ +#endif /* __alpha */ #if defined(NOFIXADE) || defined(NOPRINTADE) @@ -84,7 +84,7 @@ main(int argc, char *argv[]) (unsigned long) NULL) < 0) fprintf(stderr, gettext("%s: setsysinfo failed: %s\n"), argv[0], strerror(errno)); #endif -#endif /* NOFIXADE || NOPRINTADE */ +#endif /* NOFIXADE || NOPRINTADE */ #ifdef __BEOS__ /* BeOS-specific actions on startup */ @@ -159,7 +159,7 @@ main(int argc, char *argv[]) )); exit(1); } -#endif /* __BEOS__ */ +#endif /* __BEOS__ */ /* * Also make sure that real and effective uids are the same. diff --git a/src/backend/optimizer/path/_deadcode/predmig.c b/src/backend/optimizer/path/_deadcode/predmig.c index 667ac835f21..2138d44558a 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.13 2001/10/30 05:38:55 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.14 2001/11/05 17:46:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -72,7 +72,7 @@ static int xfunc_stream_compare(void *arg1, void *arg2); static bool xfunc_check_stream(Stream node); static bool xfunc_in_stream(Stream node, Stream stream); -/* ----------------- MAIN FUNCTIONS ------------------------ */ +/* ----------------- MAIN FUNCTIONS ------------------------ */ /* ** xfunc_do_predmig ** wrapper for Predicate Migration. It calls xfunc_predmig until no diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index dcea8907ed4..782990d0d2a 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.81 2001/10/28 06:25:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.82 2001/11/05 17:46:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -669,4 +669,4 @@ debug_print_rel(Query *root, RelOptInfo *rel) fflush(stdout); } -#endif /* OPTIMIZER_DEBUG */ +#endif /* OPTIMIZER_DEBUG */ diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c index fc509c4d944..d41df4b2b5f 100644 --- a/src/backend/optimizer/path/clausesel.c +++ b/src/backend/optimizer/path/clausesel.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.47 2001/10/25 05:49:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.48 2001/11/05 17:46:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -520,7 +520,7 @@ clause_selectivity(Query *root, #ifdef SELECTIVITY_DEBUG elog(NOTICE, "clause_selectivity: s1 %f", s1); -#endif /* SELECTIVITY_DEBUG */ +#endif /* SELECTIVITY_DEBUG */ return s1; } diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index faca5728e6b..1b71ecbef50 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.112 2001/10/30 19:58:58 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.113 2001/11/05 17:46:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -176,7 +176,7 @@ subquery_planner(Query *parse, double tuple_fraction) /* * Check for ungrouped variables passed to subplans in targetlist and * HAVING clause (but not in WHERE or JOIN/ON clauses, since those are - * evaluated before grouping). We can't do this any earlier because + * evaluated before grouping). We can't do this any earlier because * we must use the preprocessed targetlist for comparisons of grouped * expressions. */ diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index 652e7c294a0..167901acdf0 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.72 2001/10/30 19:58:58 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.73 2001/11/05 17:46:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -309,7 +309,7 @@ set_uppernode_references(Plan *plan, Index subvarno) { TargetEntry *tle = (TargetEntry *) lfirst(l); - if (tle->expr && ! IsA(tle->expr, Var)) + if (tle->expr && !IsA(tle->expr, Var)) { tlist_has_non_vars = true; break; @@ -327,7 +327,7 @@ set_uppernode_references(Plan *plan, Index subvarno) subplan_targetlist, tlist_has_non_vars); output_targetlist = lappend(output_targetlist, - makeTargetEntry(tle->resdom, newexpr)); + makeTargetEntry(tle->resdom, newexpr)); } plan->targetlist = output_targetlist; @@ -493,7 +493,7 @@ replace_vars_with_subplan_refs_mutator(Node *node, resdom->restype, resdom->restypmod, 0); - newvar->varnoold = 0; /* wasn't ever a plain Var */ + newvar->varnoold = 0; /* wasn't ever a plain Var */ newvar->varoattno = 0; return (Node *) newvar; } diff --git a/src/backend/optimizer/prep/prepkeyset.c b/src/backend/optimizer/prep/prepkeyset.c index 180637d099e..76921d8e9ad 100644 --- a/src/backend/optimizer/prep/prepkeyset.c +++ b/src/backend/optimizer/prep/prepkeyset.c @@ -217,4 +217,4 @@ inspectOpNode(Expr *expr) return (firstExpr && secondExpr && nodeTag(firstExpr) == T_Var && nodeTag(secondExpr) == T_Const); } -#endif /* ENABLE_KEY_SET_QUERY */ +#endif /* ENABLE_KEY_SET_QUERY */ diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c index 7e23481627c..4f637f48d1a 100644 --- a/src/backend/optimizer/prep/preptlist.c +++ b/src/backend/optimizer/prep/preptlist.c @@ -15,7 +15,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.45 2001/11/02 20:23:02 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.46 2001/11/05 17:46:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -202,7 +202,7 @@ expand_targetlist(List *tlist, int command_type, if (COLUMN_IS_DROPPED(att_tup)) new_expr = (Node *) makeNullConst(atttype); else -#endif /* _DROP_COLUMN_HACK__ */ +#endif /* _DROP_COLUMN_HACK__ */ new_expr = (Node *) makeVar(result_relation, attrno, atttype, @@ -211,7 +211,7 @@ expand_targetlist(List *tlist, int command_type, break; default: elog(ERROR, "expand_targetlist: unexpected command_type"); - new_expr = NULL; /* keep compiler quiet */ + new_expr = NULL; /* keep compiler quiet */ break; } @@ -373,7 +373,7 @@ build_column_default(Relation rel, int attrno) { if (attrno == defval[ndef].adnum) { - Oid type_id; + Oid type_id; /* * Found it, convert string representation to node tree. @@ -381,10 +381,11 @@ build_column_default(Relation rel, int attrno) expr = stringToNode(defval[ndef].adbin); /* - * Make sure the value is coerced to the target column type - * (might not be right type yet if it's not a constant!) - * This should match the parser's processing of non-defaulted - * expressions --- see updateTargetListEntry(). + * Make sure the value is coerced to the target column + * type (might not be right type yet if it's not a + * constant!) This should match the parser's processing of + * non-defaulted expressions --- see + * updateTargetListEntry(). */ type_id = exprType(expr); @@ -392,6 +393,7 @@ build_column_default(Relation rel, int attrno) { expr = CoerceTargetExpr(NULL, expr, type_id, atttype, atttypmod); + /* * This really shouldn't fail; should have checked the * default's type when it was created ... @@ -418,13 +420,15 @@ build_column_default(Relation rel, int attrno) /* * No per-column default, so look for a default for the type itself. - * If there isn't one, we generate a NULL constant of the correct type. + * If there isn't one, we generate a NULL constant of the correct + * type. */ if (att_tup->attisset) { /* * Set attributes are represented as OIDs no matter what the set - * element type is, and the element type's default is irrelevant too. + * element type is, and the element type's default is irrelevant + * too. */ hasdefault = false; typedefault = (Datum) 0; @@ -440,7 +444,7 @@ build_column_default(Relation rel, int attrno) typedefault = (Datum) 0; } else -#endif /* _DROP_COLUMN_HACK__ */ +#endif /* _DROP_COLUMN_HACK__ */ hasdefault = get_typdefault(atttype, &typedefault); get_typlenbyval(atttype, &typlen, &typbyval); @@ -451,12 +455,12 @@ build_column_default(Relation rel, int attrno) typedefault, !hasdefault, typbyval, - false, /* not a set */ + false, /* not a set */ false); /* * If the column is a fixed-length type, it may need a length coercion - * as well as a type coercion. But NULLs don't need that. + * as well as a type coercion. But NULLs don't need that. */ if (hasdefault) expr = coerce_type_typmod(NULL, expr, diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index 859c409709c..d00867d6480 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.90 2001/10/30 19:58:58 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.91 2001/11/05 17:46:26 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -43,14 +43,14 @@ typedef struct { Query *query; List *groupClauses; -} check_subplans_for_ungrouped_vars_context; +} check_subplans_for_ungrouped_vars_context; static bool contain_agg_clause_walker(Node *node, void *context); static bool pull_agg_clause_walker(Node *node, List **listptr); static bool contain_subplans_walker(Node *node, void *context); static bool pull_subplans_walker(Node *node, List **listptr); static bool check_subplans_for_ungrouped_vars_walker(Node *node, - check_subplans_for_ungrouped_vars_context *context); + check_subplans_for_ungrouped_vars_context * context); static bool contain_noncachable_functions_walker(Node *node, void *context); static Node *eval_const_expressions_mutator(Node *node, void *context); static Expr *simplify_op_or_func(Expr *expr, List *args); @@ -525,7 +525,7 @@ pull_subplans_walker(Node *node, List **listptr) * * A deficiency in this scheme is that any outer reference var must be * grouped by itself; we don't recognize groupable expressions within - * subselects. For example, consider + * subselects. For example, consider * SELECT * (SELECT x FROM bar where y = (foo.a + foo.b)) * FROM foo @@ -536,12 +536,13 @@ void check_subplans_for_ungrouped_vars(Query *query) { check_subplans_for_ungrouped_vars_context context; - List *gl; + List *gl; context.query = query; + /* - * Build a list of the acceptable GROUP BY expressions for use in - * the walker (to avoid repeated scans of the targetlist within the + * Build a list of the acceptable GROUP BY expressions for use in the + * walker (to avoid repeated scans of the targetlist within the * recursive routine). */ context.groupClauses = NIL; @@ -555,9 +556,9 @@ check_subplans_for_ungrouped_vars(Query *query) } /* - * Recursively scan the targetlist and the HAVING clause. - * WHERE and JOIN/ON conditions are not examined, since they are - * evaluated before grouping. + * Recursively scan the targetlist and the HAVING clause. WHERE and + * JOIN/ON conditions are not examined, since they are evaluated + * before grouping. */ check_subplans_for_ungrouped_vars_walker((Node *) query->targetList, &context); @@ -569,13 +570,13 @@ check_subplans_for_ungrouped_vars(Query *query) static bool check_subplans_for_ungrouped_vars_walker(Node *node, - check_subplans_for_ungrouped_vars_context *context) + check_subplans_for_ungrouped_vars_context * context) { List *gl; if (node == NULL) return false; - if (IsA(node, Const) || IsA(node, Param)) + if (IsA(node, Const) ||IsA(node, Param)) return false; /* constants are always acceptable */ /* @@ -648,7 +649,7 @@ check_subplans_for_ungrouped_vars_walker(Node *node, char *attname; Assert(var->varno > 0 && - (int) var->varno <= length(context->query->rtable)); + (int) var->varno <= length(context->query->rtable)); rte = rt_fetch(var->varno, context->query->rtable); attname = get_rte_attribute_name(rte, var->varattno); elog(ERROR, "Sub-SELECT uses un-GROUPed attribute %s.%s from outer query", diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 40e9700f024..104e1ab3ba2 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.210 2001/11/05 05:00:14 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.211 2001/11/05 17:46:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -504,8 +504,8 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt) } /* - * XXX It is possible that the targetlist has fewer entries than were in - * the columns list. We do not consider this an error. Perhaps we + * XXX It is possible that the targetlist has fewer entries than were + * in the columns list. We do not consider this an error. Perhaps we * should, if the columns list was explicitly given? */ @@ -1241,7 +1241,7 @@ transformIndexConstraints(ParseState *pstate, CreateStmtContext *cxt) elog(NOTICE, "%s / %s%s will create implicit index '%s' for table '%s'", cxt->stmtType, - (strcmp(cxt->stmtType,"ALTER TABLE") == 0) ? "ADD " : "", + (strcmp(cxt->stmtType, "ALTER TABLE") == 0) ? "ADD " : "", (index->primary ? "PRIMARY KEY" : "UNIQUE"), index->idxname, cxt->relname); } @@ -2393,12 +2393,12 @@ static void applyColumnNames(List *dst, List *src) { if (length(src) > length(dst)) - elog(ERROR,"CREATE TABLE AS specifies too many column names"); + elog(ERROR, "CREATE TABLE AS specifies too many column names"); while (src != NIL && dst != NIL) { TargetEntry *d = (TargetEntry *) lfirst(dst); - ColumnDef *s = (ColumnDef *) lfirst(src); + ColumnDef *s = (ColumnDef *) lfirst(src); Assert(d->resdom && !d->resdom->resjunk); diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c index 388ddf1d1f5..140f43bd821 100644 --- a/src/backend/parser/parse_relation.c +++ b/src/backend/parser/parse_relation.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.59 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.60 2001/11/05 17:46:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -737,7 +737,7 @@ expandRTE(ParseState *pstate, RangeTblEntry *rte, #ifdef _DROP_COLUMN_HACK__ if (COLUMN_IS_DROPPED(attr)) continue; -#endif /* _DROP_COLUMN_HACK__ */ +#endif /* _DROP_COLUMN_HACK__ */ if (colnames) { diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index b4375d67d87..bb398a7068f 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.75 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.76 2001/11/05 17:46:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -356,7 +356,7 @@ checkInsertTargets(ParseState *pstate, List *cols, List **attrnos) #ifdef _DROP_COLUMN_HACK__ if (COLUMN_IS_DROPPED(attr[i])) continue; -#endif /* _DROP_COLUMN_HACK__ */ +#endif /* _DROP_COLUMN_HACK__ */ id->name = palloc(NAMEDATALEN); StrNCpy(id->name, NameStr(attr[i]->attname), NAMEDATALEN); id->indirection = NIL; diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c index 7808705b378..f83d04e69cc 100644 --- a/src/backend/parser/parser.c +++ b/src/backend/parser/parser.c @@ -14,7 +14,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.50 2001/10/25 05:49:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.51 2001/11/05 17:46:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,7 @@ #if defined(FLEX_SCANNER) extern void DeleteBuffer(void); -#endif /* FLEX_SCANNER */ +#endif /* FLEX_SCANNER */ char *parseString; /* the char* which holds the string to be * parsed */ @@ -64,7 +64,7 @@ parser(char *str, Oid *typev, int nargs) #if defined(FLEX_SCANNER) DeleteBuffer(); -#endif /* FLEX_SCANNER */ +#endif /* FLEX_SCANNER */ clearerr(stdin); diff --git a/src/backend/port/dynloader/aix.c b/src/backend/port/dynloader/aix.c index a8fd72ff4cc..a447509c228 100644 --- a/src/backend/port/dynloader/aix.c +++ b/src/backend/port/dynloader/aix.c @@ -32,7 +32,7 @@ typedef struct { char *name; /* the symbols's name */ void *addr; /* its relocated virtual address */ -} Export, *ExportPtr; +} Export, *ExportPtr; /* * xlC uses the following structure to list its constructors and @@ -42,7 +42,7 @@ typedef struct { void (*init) (void); /* call static constructors */ void (*term) (void); /* call static destructors */ -} Cdtor, *CdtorPtr; +} Cdtor, *CdtorPtr; /* * The void * handle returned from dlopen is actually a ModulePtr. @@ -57,7 +57,7 @@ typedef struct Module CdtorPtr cdtors; /* optional C++ constructors */ int nExports; /* the number of exports found */ ExportPtr exports; /* the array of exports */ -} Module, *ModulePtr; +} Module, *ModulePtr; /* * We keep a list of all loaded modules to be able to call the fini @@ -608,4 +608,4 @@ findMain(void) return ret; } -#endif /* HAVE_DLOPEN */ +#endif /* HAVE_DLOPEN */ diff --git a/src/backend/port/dynloader/aix.h b/src/backend/port/dynloader/aix.h index 88f9592aad5..28b5ce53cfc 100644 --- a/src/backend/port/dynloader/aix.h +++ b/src/backend/port/dynloader/aix.h @@ -1,5 +1,5 @@ /* - * $Id: aix.h,v 1.8 2001/10/28 06:25:47 momjian Exp $ + * $Id: aix.h,v 1.9 2001/11/05 17:46:27 momjian Exp $ * * @(#)dlfcn.h 1.4 revision of 95/04/25 09:36:52 * This is an unpublished work copyright (c) 1992 HELIOS Software GmbH @@ -53,7 +53,7 @@ extern "C" #ifdef __cplusplus } #endif -#endif /* HAVE_DLOPEN */ +#endif /* HAVE_DLOPEN */ #include "utils/dynamic_loader.h" @@ -62,4 +62,4 @@ extern "C" #define pg_dlclose dlclose #define pg_dlerror dlerror -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/beos.h b/src/backend/port/dynloader/beos.h index dadf5f71b12..66911414026 100644 --- a/src/backend/port/dynloader/beos.h +++ b/src/backend/port/dynloader/beos.h @@ -7,11 +7,11 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: beos.h,v 1.5 2001/10/25 05:49:40 momjian Exp $ + * $Id: beos.h,v 1.6 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PORT_PROTOS_H #define PORT_PROTOS_H -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c index adfe9bb06dc..b647cf09f18 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.17 2001/10/28 06:25:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/dynloader/bsdi.c,v 1.18 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -95,4 +95,4 @@ pg_dlerror() return dld_strerror(dld_errno); } -#endif /* not HAVE_DLOPEN */ +#endif /* not HAVE_DLOPEN */ diff --git a/src/backend/port/dynloader/bsdi.h b/src/backend/port/dynloader/bsdi.h index 7d4c1ec7f9d..1af6d3d3f5a 100644 --- a/src/backend/port/dynloader/bsdi.h +++ b/src/backend/port/dynloader/bsdi.h @@ -32,6 +32,6 @@ do { \ dld_unlink_by_file(handle, 1); \ free(handle); \ } while (0) -#endif /* not HAVE_DLOPEN */ +#endif /* not HAVE_DLOPEN */ -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/dgux.h b/src/backend/port/dynloader/dgux.h index b7b5d576eee..2cdde7574f7 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.12 2001/10/28 06:25:47 momjian Exp $ + * $Id: dgux.h,v 1.13 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,4 @@ #define pg_dlclose dlclose #define pg_dlerror dlerror -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/freebsd.c b/src/backend/port/dynloader/freebsd.c index 829904303bf..b0477a255b3 100644 --- a/src/backend/port/dynloader/freebsd.c +++ b/src/backend/port/dynloader/freebsd.c @@ -34,7 +34,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)dl.c 5.4 (Berkeley) 2/23/91"; -#endif /* LIBC_SCCS and not lint */ +#endif /* LIBC_SCCS and not lint */ #include <sys/types.h> #include <nlist.h> @@ -82,6 +82,7 @@ BSD44_derived_dlsym(void *handle, const char *name) return NULL; #else void *vp; + #ifndef __ELF__ char buf[BUFSIZ]; diff --git a/src/backend/port/dynloader/freebsd.h b/src/backend/port/dynloader/freebsd.h index 022be0f39b9..6f9b3a3f310 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.12 2001/10/28 06:25:47 momjian Exp $ + * $Id: freebsd.h,v 1.13 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,4 +44,4 @@ void *BSD44_derived_dlopen(const char *filename, int num); void *BSD44_derived_dlsym(void *handle, const char *name); void BSD44_derived_dlclose(void *handle); -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/irix5.h b/src/backend/port/dynloader/irix5.h index a4a5d134b6c..87efa317f77 100644 --- a/src/backend/port/dynloader/irix5.h +++ b/src/backend/port/dynloader/irix5.h @@ -31,4 +31,4 @@ #define pg_dlclose dlclose #define pg_dlerror dlerror -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/linux.h b/src/backend/port/dynloader/linux.h index e0955deb5c2..3db2436597b 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.15 2001/10/28 06:25:47 momjian Exp $ + * $Id: linux.h,v 1.16 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,6 +39,6 @@ do { \ #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror -#endif /* HAVE_DLOPEN */ +#endif /* HAVE_DLOPEN */ -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/netbsd.c b/src/backend/port/dynloader/netbsd.c index dc28e3e9c4c..4ed308321a1 100644 --- a/src/backend/port/dynloader/netbsd.c +++ b/src/backend/port/dynloader/netbsd.c @@ -34,7 +34,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)dl.c 5.4 (Berkeley) 2/23/91"; -#endif /* LIBC_SCCS and not lint */ +#endif /* LIBC_SCCS and not lint */ #include <sys/types.h> #include <nlist.h> diff --git a/src/backend/port/dynloader/netbsd.h b/src/backend/port/dynloader/netbsd.h index aa516053a53..8310de4db2a 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.7 2001/10/28 06:25:47 momjian Exp $ + * $Id: netbsd.h,v 1.8 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,4 +44,4 @@ void *BSD44_derived_dlopen(const char *filename, int num); void *BSD44_derived_dlsym(void *handle, const char *name); void BSD44_derived_dlclose(void *handle); -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/nextstep.h b/src/backend/port/dynloader/nextstep.h index d86c2c5cea1..f1345d07883 100644 --- a/src/backend/port/dynloader/nextstep.h +++ b/src/backend/port/dynloader/nextstep.h @@ -23,4 +23,4 @@ char *next_dlerror(void); /* port.c */ -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/openbsd.c b/src/backend/port/dynloader/openbsd.c index dc28e3e9c4c..4ed308321a1 100644 --- a/src/backend/port/dynloader/openbsd.c +++ b/src/backend/port/dynloader/openbsd.c @@ -34,7 +34,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)dl.c 5.4 (Berkeley) 2/23/91"; -#endif /* LIBC_SCCS and not lint */ +#endif /* LIBC_SCCS and not lint */ #include <sys/types.h> #include <nlist.h> diff --git a/src/backend/port/dynloader/openbsd.h b/src/backend/port/dynloader/openbsd.h index c08c8b3b917..644b149b804 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.8 2001/10/28 06:25:47 momjian Exp $ + * $Id: openbsd.h,v 1.9 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,4 +42,4 @@ void *BSD44_derived_dlopen(const char *filename, int num); void *BSD44_derived_dlsym(void *handle, const char *name); void BSD44_derived_dlclose(void *handle); -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/osf.h b/src/backend/port/dynloader/osf.h index d411a895b15..88421319fda 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.5 2001/10/28 06:25:47 momjian Exp $ + * $Id: osf.h,v 1.6 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,4 +33,4 @@ #define pg_dlclose(h) dlclose(h) #define pg_dlerror() dlerror() -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/sco.h b/src/backend/port/dynloader/sco.h index c7db92d3e67..171c9e4c4d2 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.10 2001/10/28 06:25:47 momjian Exp $ + * $Id: sco.h,v 1.11 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,4 +33,4 @@ /* port.c */ -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/solaris.h b/src/backend/port/dynloader/solaris.h index cc6b4dc776f..ddb6b965b95 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.6 2001/10/28 06:25:47 momjian Exp $ */ +/* $Header: /cvsroot/pgsql/src/backend/port/dynloader/solaris.h,v 1.7 2001/11/05 17:46:27 momjian Exp $ */ #ifndef DYNLOADER_SOLARIS_H #define DYNLOADER_SOLARIS_H @@ -11,4 +11,4 @@ #define pg_dlclose dlclose #define pg_dlerror dlerror -#endif /* DYNLOADER_SOLARIS_H */ +#endif /* DYNLOADER_SOLARIS_H */ diff --git a/src/backend/port/dynloader/sunos4.h b/src/backend/port/dynloader/sunos4.h index f1e74afd47b..6990892f3bb 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.10 2001/10/28 06:25:47 momjian Exp $ + * $Id: sunos4.h,v 1.11 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,4 +31,4 @@ #define pg_dlclose dlclose #define pg_dlerror dlerror -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/svr4.h b/src/backend/port/dynloader/svr4.h index abce7465a53..191f81b42e9 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.10 2001/10/28 06:25:47 momjian Exp $ + * $Id: svr4.h,v 1.11 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,4 +31,4 @@ #define pg_dlclose dlclose #define pg_dlerror dlerror -#endif /* DYNLOADER_H */ +#endif /* DYNLOADER_H */ diff --git a/src/backend/port/dynloader/ultrix4.h b/src/backend/port/dynloader/ultrix4.h index 18edf7e0ba6..2b350755a95 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.9 2001/10/28 06:25:47 momjian Exp $ + * $Id: ultrix4.h,v 1.10 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,20 +51,20 @@ typedef struct ScnInfo CoreAddr addr; /* starting address of the section */ SCNHDR hdr; /* section header */ RELOC *relocEntries; /* relocation entries */ -} ScnInfo; +} ScnInfo; typedef enum { DL_NEEDRELOC, /* still need relocation */ DL_RELOCATED, /* no relocation necessary */ DL_INPROG /* relocation in progress */ -} dlRStatus; +} dlRStatus; typedef struct JmpTbl { char *block; /* the jump table memory block */ struct JmpTbl *next; /* next block */ -} JmpTbl; +} JmpTbl; typedef struct dlFile { @@ -94,14 +94,14 @@ typedef struct dlFile JmpTbl *jmptable; /* the jump table for R_JMPADDR */ struct dlFile *next; /* next member of the archive */ -} dlFile; +} dlFile; typedef struct dlSymbol { char *name; /* name of the symbol */ long addr; /* address of the symbol */ dlFile *objFile; /* from which file */ -} dlSymbol; +} dlSymbol; /* * prototypes for the dl* interface @@ -121,4 +121,4 @@ extern char **dl_undefinedSymbols( /* int *count */ ); extern void dl_printAllSymbols( /* void *handle */ ); extern void dl_setLibraries( /* char *libs */ ); -#endif /* _DL_HEADER_ */ +#endif /* _DL_HEADER_ */ diff --git a/src/backend/port/dynloader/univel.h b/src/backend/port/dynloader/univel.h index 83f0e2c82a5..c8a652f733a 100644 --- a/src/backend/port/dynloader/univel.h +++ b/src/backend/port/dynloader/univel.h @@ -31,4 +31,4 @@ #define pg_dlclose dlclose #define pg_dlerror dlerror -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/unixware.h b/src/backend/port/dynloader/unixware.h index 5c1b04cc694..691273fdbdc 100644 --- a/src/backend/port/dynloader/unixware.h +++ b/src/backend/port/dynloader/unixware.h @@ -31,4 +31,4 @@ #define pg_dlclose dlclose #define pg_dlerror dlerror -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/win.h b/src/backend/port/dynloader/win.h index d0d33189b79..01ee8761c7f 100644 --- a/src/backend/port/dynloader/win.h +++ b/src/backend/port/dynloader/win.h @@ -31,4 +31,4 @@ #define pg_dlclose dlclose #define pg_dlerror dlerror -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/qnx4/ipc.h b/src/backend/port/qnx4/ipc.h index ebcfe7f19e9..90222084603 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.5 2001/10/28 06:25:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/ipc.h,v 1.6 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,4 @@ #define IPC_RMID 0 /* remove identifier */ #define IPC_STAT 1 /* get shm status */ -#endif /* _SYS_IPC_H */ +#endif /* _SYS_IPC_H */ diff --git a/src/backend/port/qnx4/sem.h b/src/backend/port/qnx4/sem.h index c5af05ec6be..f28a02230e8 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.5 2001/10/28 06:25:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.h,v 1.6 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -65,4 +65,4 @@ extern "C" } #endif -#endif /* _SYS_SEM_H */ +#endif /* _SYS_SEM_H */ diff --git a/src/backend/port/qnx4/shm.h b/src/backend/port/qnx4/shm.h index 85537e25e5a..76c30a43602 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.5 2001/10/28 06:25:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/shm.h,v 1.6 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,4 +40,4 @@ extern "C" } #endif -#endif /* _SYS_SHM_H */ +#endif /* _SYS_SHM_H */ diff --git a/src/backend/port/strcasecmp.c b/src/backend/port/strcasecmp.c index 5bb34f85492..52253cb0841 100644 --- a/src/backend/port/strcasecmp.c +++ b/src/backend/port/strcasecmp.c @@ -1,4 +1,4 @@ -/* $Id: strcasecmp.c,v 1.8 2001/10/25 05:49:40 momjian Exp $ */ +/* $Id: strcasecmp.c,v 1.9 2001/11/05 17:46:26 momjian Exp $ */ /* * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group @@ -15,7 +15,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcasecmp.c 5.5 (Berkeley) 11/24/87"; -#endif /* LIBC_SCCS and not lint */ +#endif /* LIBC_SCCS and not lint */ #include <sys/types.h> #include <string.h> diff --git a/src/backend/port/strtol.c b/src/backend/port/strtol.c index e6a7fb6d7b4..a3153ee16a9 100644 --- a/src/backend/port/strtol.c +++ b/src/backend/port/strtol.c @@ -34,7 +34,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strtol.c 5.4 (Berkeley) 2/23/91"; -#endif /* LIBC_SCCS and not lint */ +#endif /* LIBC_SCCS and not lint */ #include <limits.h> #include <ctype.h> diff --git a/src/backend/port/strtoul.c b/src/backend/port/strtoul.c index 9481ccc4a06..5cb7f7855a6 100644 --- a/src/backend/port/strtoul.c +++ b/src/backend/port/strtoul.c @@ -33,7 +33,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strtoul.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ +#endif /* LIBC_SCCS and not lint */ #include <limits.h> #include <ctype.h> diff --git a/src/backend/port/sunos4/float.h b/src/backend/port/sunos4/float.h index 2be9b70a772..cf52e40cbb1 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.8 2001/10/28 06:25:47 momjian Exp $ + * $Id: float.h,v 1.9 2001/11/05 17:46:27 momjian Exp $ * * NOTES * These come straight out of ANSI X3.159-1989 (p.18) and @@ -28,4 +28,4 @@ #define DBL_MIN 2.2250738585072014e-308 #define DBL_MAX 1.7976931348623157e+308 -#endif /* FLOAT_H */ +#endif /* FLOAT_H */ diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 58e5001110e..de4a5fa348d 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.256 2001/11/04 20:12:57 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.257 2001/11/05 17:46:27 momjian Exp $ * * NOTES * @@ -721,7 +721,7 @@ PostmasterMain(int argc, char *argv[]) pqsignal(SIGTERM, pmdie); /* wait for children and ShutdownDataBase */ pqsignal(SIGALRM, SIG_IGN); /* ignored */ pqsignal(SIGPIPE, SIG_IGN); /* ignored */ - pqsignal(SIGUSR1, sigusr1_handler); /* message from child process */ + pqsignal(SIGUSR1, sigusr1_handler); /* message from child process */ pqsignal(SIGUSR2, dummy_handler); /* unused, reserve for children */ pqsignal(SIGCHLD, reaper); /* handle child termination */ pqsignal(SIGTTIN, SIG_IGN); /* ignored */ @@ -869,12 +869,13 @@ ServerLoop(void) /* * The timeout for the select() below is normally set on the basis - * of the time to the next checkpoint. However, if for some reason - * we don't have a next-checkpoint time, time out after 60 seconds. - * This keeps checkpoint scheduling from locking up when we get new - * connection requests infrequently (since we are likely to detect - * checkpoint completion just after enabling signals below, after - * we've already made the decision about how long to wait this time). + * of the time to the next checkpoint. However, if for some + * reason we don't have a next-checkpoint time, time out after 60 + * seconds. This keeps checkpoint scheduling from locking up when + * we get new connection requests infrequently (since we are + * likely to detect checkpoint completion just after enabling + * signals below, after we've already made the decision about how + * long to wait this time). */ timeout.tv_sec = 60; timeout.tv_usec = 0; @@ -926,8 +927,8 @@ ServerLoop(void) } /* - * Block all signals until we wait again. (This makes it safe - * for our signal handlers to do nontrivial work.) + * Block all signals until we wait again. (This makes it safe for + * our signal handlers to do nontrivial work.) */ PG_SETMASK(&BlockSig); @@ -1512,8 +1513,10 @@ static void reaper(SIGNAL_ARGS) { int save_errno = errno; + #ifdef HAVE_WAITPID int status; /* backend exit status */ + #else union wait status; /* backend exit status */ #endif @@ -2234,8 +2237,8 @@ sigusr1_handler(SIGNAL_ARGS) /* * Request to schedule a checkpoint * - * Ignore request if checkpoint is already running or - * checkpointing is currently disabled + * Ignore request if checkpoint is already running or checkpointing + * is currently disabled */ if (CheckPointPID == 0 && checkpointed && Shutdown == NoShutdown && !FatalError && random_seed != 0) @@ -2256,8 +2259,8 @@ sigusr1_handler(SIGNAL_ARGS) if (CheckPostmasterSignal(PMSIGNAL_WAKEN_CHILDREN)) { /* - * Send SIGUSR2 to all children (triggers AsyncNotifyHandler). - * See storage/ipc/sinvaladt.c for the use of this. + * Send SIGUSR2 to all children (triggers AsyncNotifyHandler). See + * storage/ipc/sinvaladt.c for the use of this. */ if (Shutdown == NoShutdown) SignalChildren(SIGUSR2); diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c index f7c0f3ac8f4..3fa00946aa4 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 1ca42ea8fa6..49f67c91c7b 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.60 2001/10/28 06:25:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.61 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -884,7 +884,7 @@ typedef struct int *modified; int *badsql; int sublevels_up; -} HandleRIRAttributeRule_context; +} HandleRIRAttributeRule_context; static Node * HandleRIRAttributeRule_mutator(Node *node, @@ -996,4 +996,4 @@ HandleRIRAttributeRule(Query *parsetree, (void *) &context, true); } -#endif /* NOT_USED */ +#endif /* NOT_USED */ diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c index cd0453c5730..37570e6b118 100644 --- a/src/backend/storage/buffer/buf_init.c +++ b/src/backend/storage/buffer/buf_init.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.46 2001/10/25 05:49:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.47 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,7 +47,7 @@ bmtrace *TraceBuf; long *CurTraceBuf; #define BMT_LIMIT 200 -#endif /* BMTRACE */ +#endif /* BMTRACE */ int ShowPinTrace = 0; int Data_Descriptors; diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 0a74896e95a..49ee9990be3 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.118 2001/10/25 05:49:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.119 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -350,7 +350,7 @@ BufferAlloc(Relation reln, } #ifdef BMTRACE _bm_trace((reln->rd_rel->relisshared ? 0 : MyDatabaseId), RelationGetRelid(reln), blockNum, BufferDescriptorGetBuffer(buf), BMT_ALLOCFND); -#endif /* BMTRACE */ +#endif /* BMTRACE */ if (!(*foundPtr)) StartBufferIO(buf, true); @@ -558,7 +558,7 @@ BufferAlloc(Relation reln, #ifdef BMTRACE _bm_trace((reln->rd_rel->relisshared ? 0 : MyDatabaseId), RelationGetRelid(reln), blockNum, BufferDescriptorGetBuffer(buf), BMT_ALLOCNOTFND); -#endif /* BMTRACE */ +#endif /* BMTRACE */ LWLockRelease(BufMgrLock); @@ -1881,7 +1881,7 @@ _bm_die(Oid dbId, Oid relId, int blkNo, int bufNo, kill(getpid(), SIGILL); } -#endif /* BMTRACE */ +#endif /* BMTRACE */ /* * SetBufferCommitInfoNeedsSave diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c index 6e8e0f9b8bb..c9478467456 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.27 2001/10/28 06:25:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.28 2001/11/05 17:46:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,7 +68,7 @@ AddBufferToFreelist(BufferDesc *bf) #ifdef BMTRACE _bm_trace(bf->tag.relId.dbId, bf->tag.relId.relId, bf->tag.blockNum, BufferDescriptorGetBuffer(bf), BMT_DEALLOC); -#endif /* BMTRACE */ +#endif /* BMTRACE */ IsNotInQueue(bf); /* change bf so it points to inFrontOfNew and its successor */ diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 8936685f941..d0a08d20a59 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.86 2001/10/28 06:25:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.87 2001/11/05 17:46:27 momjian Exp $ * * NOTES: * @@ -313,7 +313,7 @@ pg_nofile(void) #else no_files = (long) max_files_per_process; #endif -#endif /* HAVE_SYSCONF */ +#endif /* HAVE_SYSCONF */ /* * Some platforms return hopelessly optimistic values. Apply a @@ -355,7 +355,7 @@ _dump_lru(void) sprintf(buf + strlen(buf), "LEAST"); elog(DEBUG, buf); } -#endif /* FDDEBUG */ +#endif /* FDDEBUG */ static void Delete(File file) diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c index 8ae99061015..8d06cbbffcb 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.9 2001/10/28 06:25:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/freespace/freespace.c,v 1.10 2001/11/05 17:46:27 momjian Exp $ * * * NOTES: @@ -1117,4 +1117,4 @@ DumpFreeSpace(void) nChunks, FreeSpaceMap->numFreeChunks); } -#endif /* FREESPACE_DEBUG */ +#endif /* FREESPACE_DEBUG */ diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index 1ecda0c7615..bfe2620d698 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.74 2001/10/30 05:38:55 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.75 2001/11/05 17:46:28 momjian Exp $ * * NOTES * @@ -94,7 +94,7 @@ static struct ONEXIT { void (*function) (); Datum arg; -} on_proc_exit_list[MAX_ON_EXITS], on_shmem_exit_list[MAX_ON_EXITS]; +} on_proc_exit_list[MAX_ON_EXITS], on_shmem_exit_list[MAX_ON_EXITS]; static int on_proc_exit_index, on_shmem_exit_index; diff --git a/src/backend/storage/ipc/pmsignal.c b/src/backend/storage/ipc/pmsignal.c index a172cef74f3..4dbc3a5c734 100644 --- a/src/backend/storage/ipc/pmsignal.c +++ b/src/backend/storage/ipc/pmsignal.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/pmsignal.c,v 1.2 2001/11/05 01:34:37 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/pmsignal.c,v 1.3 2001/11/05 17:46:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,9 +24,9 @@ /* * The postmaster is signaled by its children by sending SIGUSR1. The - * specific reason is communicated via flags in shared memory. We keep + * specific reason is communicated via flags in shared memory. We keep * a boolean flag for each possible "reason", so that different reasons - * can be signaled by different backends at the same time. (However, + * can be signaled by different backends at the same time. (However, * if the same reason is signaled more than once simultaneously, the * postmaster will observe it only once.) * @@ -35,7 +35,7 @@ * values are atomic, allowing us to dispense with any explicit locking. */ -static volatile sig_atomic_t * PMSignalFlags; +static volatile sig_atomic_t *PMSignalFlags; /* diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c index 4fbb6211608..d6f959f5ac3 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.18 2001/10/28 06:25:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.19 2001/11/05 17:46:28 momjian Exp $ * * NOTES * @@ -150,7 +150,7 @@ SHMQueueInsertAfter(SHM_QUEUE *queue, SHM_QUEUE *elem) dumpQ(queue, "in SHMQueueInsertAfter: end"); #endif } -#endif /* NOT_USED */ +#endif /* NOT_USED */ /*-------------------- * SHMQueueNext -- Get the next element from a queue @@ -254,4 +254,4 @@ dumpQ(SHM_QUEUE *q, char *s) elog(SHMQUEUE_DEBUG_ELOG, "%s: %s", s, buf); } -#endif /* SHMQUEUE_DEBUG */ +#endif /* SHMQUEUE_DEBUG */ diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c index 35931f00a14..56a1d87b840 100644 --- a/src/backend/storage/ipc/sinvaladt.c +++ b/src/backend/storage/ipc/sinvaladt.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.42 2001/11/04 19:55:31 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.43 2001/11/05 17:46:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -120,7 +120,7 @@ SIBackendInit(SISeg *segP) #ifdef INVALIDDEBUG elog(DEBUG, "SIBackendInit: backend id %d", MyBackendId); -#endif /* INVALIDDEBUG */ +#endif /* INVALIDDEBUG */ /* mark myself active, with all extant messages already read */ stateP->nextMsgNum = segP->maxMsgNum; @@ -205,9 +205,9 @@ SIInsertDataEntry(SISeg *segP, SharedInvalidationMessage *data) * Try to prevent table overflow. When the table is 70% full send a * WAKEN_CHILDREN request to the postmaster. The postmaster will send * a SIGUSR2 signal (ordinarily a NOTIFY signal) to all the backends. - * This will force idle backends to execute a transaction to look through - * pg_listener for NOTIFY messages, and as a byproduct of the transaction - * start they will read SI entries. + * This will force idle backends to execute a transaction to look + * through pg_listener for NOTIFY messages, and as a byproduct of the + * transaction start they will read SI entries. * * This should never happen if all the backends are actively executing * queries, but if a backend is sitting idle then it won't be starting diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 778b543e57c..5030033f094 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.103 2001/10/30 05:38:55 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.104 2001/11/05 17:46:28 momjian Exp $ * * NOTES * Outside modules can create a lock table and acquire/release @@ -147,7 +147,7 @@ HOLDER_PRINT(const char *where, const HOLDER *holderP) #define LOCK_PRINT(where, lock, type) #define HOLDER_PRINT(where, holderP) -#endif /* not LOCK_DEBUG */ +#endif /* not LOCK_DEBUG */ /* @@ -589,7 +589,7 @@ LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag, break; } } -#endif /* CHECK_DEADLOCK_RISK */ +#endif /* CHECK_DEADLOCK_RISK */ } /* @@ -1464,4 +1464,4 @@ DumpAllLocks(void) } } -#endif /* LOCK_DEBUG */ +#endif /* LOCK_DEBUG */ diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c index 7c268937c32..3c90f108695 100644 --- a/src/backend/storage/lmgr/lwlock.c +++ b/src/backend/storage/lmgr/lwlock.c @@ -15,7 +15,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lwlock.c,v 1.2 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lwlock.c,v 1.3 2001/11/05 17:46:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -74,7 +74,7 @@ PRINT_LWDEBUG(const char *where, LWLockId lockid, const LWLock *lock) #else /* not LOCK_DEBUG */ #define PRINT_LWDEBUG(a,b,c) -#endif /* LOCK_DEBUG */ +#endif /* LOCK_DEBUG */ /* diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c index 86c5bac6d97..ea7b40581e4 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.4 2001/10/28 06:25:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/s_lock.c,v 1.5 2001/11/05 17:46:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -109,7 +109,7 @@ _success: \n\ rts \n\ "); } -#endif /* __m68k__ */ +#endif /* __m68k__ */ #if defined(__APPLE__) && defined(__ppc__) /* used in darwin. */ @@ -138,7 +138,7 @@ success: \n\ blr \n\ "); } -#endif /* __APPLE__ && __ppc__ */ +#endif /* __APPLE__ && __ppc__ */ #if defined(__powerpc__) /* Note: need a nice gcc constrained asm version so it can be inlined */ @@ -162,7 +162,7 @@ success: \n\ blr \n\ "); } -#endif /* __powerpc__ */ +#endif /* __powerpc__ */ #if defined(__mips__) && !defined(__sgi) static void @@ -186,7 +186,7 @@ fail: \n\ j $31 \n\ "); } -#endif /* __mips__ && !__sgi */ +#endif /* __mips__ && !__sgi */ #else /* not __GNUC__ */ /*************************************************************************** @@ -217,7 +217,7 @@ tas_dummy() /* really means: extern int tas(slock_t asm(" rts"); asm(" .data"); } -#endif /* sun3 */ +#endif /* sun3 */ @@ -240,15 +240,15 @@ tas_dummy() /* really means: extern int tas(slock_t asm("retl"); asm("nop"); } -#endif /* NEED_SPARC_TAS_ASM */ +#endif /* NEED_SPARC_TAS_ASM */ #if defined(NEED_I386_TAS_ASM) /* non gcc i386 based things */ -#endif /* NEED_I386_TAS_ASM */ -#endif /* not __GNUC__ */ +#endif /* NEED_I386_TAS_ASM */ +#endif /* not __GNUC__ */ @@ -291,4 +291,4 @@ main() } -#endif /* S_LOCK_TEST */ +#endif /* S_LOCK_TEST */ diff --git a/src/backend/storage/lmgr/spin.c b/src/backend/storage/lmgr/spin.c index 0c13062dcbc..f5bb8e34889 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.6 2001/10/28 06:25:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/spin.c,v 1.7 2001/11/05 17:46:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -187,4 +187,4 @@ tas_sema(volatile slock_t *lock) return !IpcSemaphoreTryLock(lock->semId, lock->sem); } -#endif /* !HAS_TEST_AND_SET */ +#endif /* !HAS_TEST_AND_SET */ diff --git a/src/backend/storage/smgr/mm.c b/src/backend/storage/smgr/mm.c index fab130cd373..7d664da3dc9 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.29 2001/10/28 06:25:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.30 2001/11/05 17:46:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,7 +35,7 @@ typedef struct MMCacheTag Oid mmct_dbid; Oid mmct_relid; BlockNumber mmct_blkno; -} MMCacheTag; +} MMCacheTag; /* * Shared-memory hash table for main memory relations contains @@ -46,7 +46,7 @@ typedef struct MMHashEntry { MMCacheTag mmhe_tag; int mmhe_bufno; -} MMHashEntry; +} MMHashEntry; /* * MMRelTag -- Unique identifier for each relation that is stored in the @@ -57,7 +57,7 @@ typedef struct MMRelTag { Oid mmrt_dbid; Oid mmrt_relid; -} MMRelTag; +} MMRelTag; /* * Shared-memory hash table for # blocks in main memory relations contains @@ -68,7 +68,7 @@ typedef struct MMRelHashEntry { MMRelTag mmrhe_tag; int mmrhe_nblocks; -} MMRelHashEntry; +} MMRelHashEntry; #define MMNBUFFERS 10 #define MMNRELATIONS 2 @@ -562,4 +562,4 @@ MMShmemSize() return size; } -#endif /* STABLE_MEMORY_STORAGE */ +#endif /* STABLE_MEMORY_STORAGE */ diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c index 39ec8fa5424..6386b7697c5 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.51 2001/10/28 06:25:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.52 2001/11/05 17:46:28 momjian Exp $ * * NOTES * This cruft is the server side of PQfn. @@ -340,7 +340,7 @@ HandleFunctionRequest(void) fcinfo.isnull = true; #else retval = FunctionCallInvoke(&fcinfo); -#endif /* NO_FASTPATH */ +#endif /* NO_FASTPATH */ if (fcinfo.isnull) SendFunctionResult(retval, fip->retbyval, 0); diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 3fb46d73e28..29222d7285c 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.240 2001/10/28 06:25:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.241 2001/11/05 17:46:28 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -99,7 +99,7 @@ int UseNewLine = 1; /* Use newlines query delimiters (the #else int UseNewLine = 0; /* Use EOF as query delimiters */ -#endif /* TCOP_DONTUSENEWLINE */ +#endif /* TCOP_DONTUSENEWLINE */ /* ** Flags for expensive function optimization -- JMH 3/9/92 @@ -1642,7 +1642,7 @@ PostgresMain(int argc, char *argv[], const char *username) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.240 $ $Date: 2001/10/28 06:25:51 $\n"); + puts("$Revision: 1.241 $ $Date: 2001/11/05 17:46:28 $\n"); } /* @@ -1916,7 +1916,7 @@ PostgresMain(int argc, char *argv[], const char *username) #include "rusagestub.h" #else #include <sys/resource.h> -#endif /* HAVE_GETRUSAGE */ +#endif /* HAVE_GETRUSAGE */ struct rusage Save_r; struct timeval Save_t; @@ -2018,7 +2018,7 @@ ShowUsage(void) r.ru_nvcsw - Save_r.ru_nvcsw, r.ru_nivcsw - Save_r.ru_nivcsw, r.ru_nvcsw, r.ru_nivcsw); -#endif /* HAVE_GETRUSAGE */ +#endif /* HAVE_GETRUSAGE */ fprintf(StatFp, "! postgres usage stats:\n"); PrintBufferUsage(StatFp); /* DisplayTupleCount(StatFp); */ diff --git a/src/backend/tioga/Arr_TgRecipe.h b/src/backend/tioga/Arr_TgRecipe.h index 9404635715b..71e1203ad4f 100644 --- a/src/backend/tioga/Arr_TgRecipe.h +++ b/src/backend/tioga/Arr_TgRecipe.h @@ -29,7 +29,7 @@ #ifndef ARR_TgString_INITIAL_SIZE #define ARR_TgString_INITIAL_SIZE 32 /* change this size to suit your * need */ -#endif /* ARR_TgString_INITIAL_SIZE */ +#endif /* ARR_TgString_INITIAL_SIZE */ typedef struct Arr_TgString { @@ -37,7 +37,7 @@ typedef struct Arr_TgString size_t size; size_t valSize; TgString *val; -} Arr_TgString; +} Arr_TgString; #define newArr_TgString() \ (Arr_TgString *) NewVarray(ARR_TgString_INITIAL_SIZE, sizeof(TgString)) @@ -52,7 +52,7 @@ typedef struct Arr_TgString AppendVarray((Varray *) (A), (void *) (V), (CopyingFunct) copyTgString) #define deleteArr_TgString(A) FreeVarray(A) -#endif /* _ARR_TgString_ */ +#endif /* _ARR_TgString_ */ /* -- Defining types and function for Arr_TgElementPtr type -- */ /* -- the following must be supplied by the user: @@ -66,7 +66,7 @@ typedef struct Arr_TgString #ifndef ARR_TgElementPtr_INITIAL_SIZE #define ARR_TgElementPtr_INITIAL_SIZE 32 /* change this size to * suit your need */ -#endif /* ARR_TgElementPtr_INITIAL_SIZE */ +#endif /* ARR_TgElementPtr_INITIAL_SIZE */ typedef struct Arr_TgElementPtr { @@ -74,7 +74,7 @@ typedef struct Arr_TgElementPtr size_t size; size_t valSize; TgElementPtr *val; -} Arr_TgElementPtr; +} Arr_TgElementPtr; #define newArr_TgElementPtr() \ (Arr_TgElementPtr *) NewVarray(ARR_TgElementPtr_INITIAL_SIZE, sizeof(TgElementPtr)) @@ -89,7 +89,7 @@ typedef struct Arr_TgElementPtr AppendVarray((Varray *) (A), (void *) (V), (CopyingFunct) copyTgElementPtr) #define deleteArr_TgElementPtr(A) FreeVarray(A) -#endif /* _ARR_TgElementPtr_ */ +#endif /* _ARR_TgElementPtr_ */ /* -- Defining types and function for Arr_TgNodePtr type -- */ /* -- the following must be supplied by the user: @@ -103,7 +103,7 @@ typedef struct Arr_TgElementPtr #ifndef ARR_TgNodePtr_INITIAL_SIZE #define ARR_TgNodePtr_INITIAL_SIZE 32 /* change this size to suit your * need */ -#endif /* ARR_TgNodePtr_INITIAL_SIZE */ +#endif /* ARR_TgNodePtr_INITIAL_SIZE */ typedef struct Arr_TgNodePtr { @@ -111,7 +111,7 @@ typedef struct Arr_TgNodePtr size_t size; size_t valSize; TgNodePtr *val; -} Arr_TgNodePtr; +} Arr_TgNodePtr; #define newArr_TgNodePtr() \ (Arr_TgNodePtr *) NewVarray(ARR_TgNodePtr_INITIAL_SIZE, sizeof(TgNodePtr)) @@ -127,4 +127,4 @@ typedef struct Arr_TgNodePtr #define deleteArr_TgNodePtr(A) FreeVarray(A) -#endif /* _ARR_TgNodePtr_ */ +#endif /* _ARR_TgNodePtr_ */ diff --git a/src/backend/tioga/Varray.h b/src/backend/tioga/Varray.h index aed53855a41..cf7173159c0 100644 --- a/src/backend/tioga/Varray.h +++ b/src/backend/tioga/Varray.h @@ -15,7 +15,7 @@ typedef struct _varray size_t maxObj; /* max. number of objects in this array */ size_t size; /* size of each element in the array */ void *val; /* array of elements */ -} Varray; +} Varray; /* type for custom copying function */ typedef void (*CopyingFunct) (void *from, void *to); @@ -45,4 +45,4 @@ 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_ */ +#endif /* _VARRAY_H_ */ diff --git a/src/backend/tioga/tgRecipe.h b/src/backend/tioga/tgRecipe.h index 19d9d529c9e..f61b285dabc 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.20 2001/10/30 05:38:55 momjian Exp $ + * $Id: tgRecipe.h,v 1.21 2001/11/05 17:46:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,15 +30,16 @@ typedef struct } Point; /* this should match whatever is in * + * * geo-decls.h */ -#endif /* TIOGA_FRONTEND */ +#endif /* TIOGA_FRONTEND */ typedef enum { TG_INGRED, TG_EYE, TG_RECIPE -} TgElemType; +} TgElemType; typedef enum { @@ -46,7 +47,7 @@ typedef enum TG_C, TG_RECIPE_GRAPH, TG_COMPILED -} TgSrcLangType; +} TgSrcLangType; typedef enum { @@ -56,7 +57,7 @@ typedef enum TG_TEE_NODE /* tee nodes are not stored in the db we * create them when we read the recipe * back */ -} TgNodeType; +} TgNodeType; /* -- type definition for setting up in memory Tioga recipe structure -- */ /* -- see 'recipe-schema.sql' for their corresponding database types -- */ @@ -87,7 +88,7 @@ typedef struct _tgelement char *src; /* source code for this element */ TgSrcLangType srcLang; /* source language */ char *owner; /* owner recipe name */ -} TgElement; +} TgElement; /* C structure representation of a Tioga Node */ @@ -101,7 +102,7 @@ typedef struct _tgnode * NULL TgNodePtr indicates a run-time * parameter */ Arr_TgNodePtr *outNodes; /* variable array of out node pointers. */ -} TgNode; +} TgNode; /* C structure representation of a Tioga Recipe */ typedef struct _tgrecipe @@ -120,7 +121,7 @@ typedef struct _tgrecipe * recipe, elements may be shared by * multiple nodes */ -} TgRecipe; +} TgRecipe; /* functions defined in tgRecipe.c */ extern TgRecipe *retrieveRecipe(char *name); diff --git a/src/backend/utils/adt/ascii.c b/src/backend/utils/adt/ascii.c index 8617470de99..a62672a5e53 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.11 2001/10/28 06:25:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.12 2001/11/05 17:46:28 momjian Exp $ * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group * @@ -191,4 +191,4 @@ to_ascii_default(PG_FUNCTION_ARGS) ); } -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index fd6653c8fa7..04ef7027d1e 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.76 2001/10/28 06:25:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.77 2001/11/05 17:46:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1051,7 +1051,7 @@ DetermineLocalTimeZone(struct tm * tm) tz = 0; /* assume GMT if mktime failed */ #elif defined(HAVE_INT_TIMEZONE) tz = ((tmp->tm_isdst > 0) ? (TIMEZONE_GLOBAL - 3600) : TIMEZONE_GLOBAL); -#endif /* HAVE_INT_TIMEZONE */ +#endif /* HAVE_INT_TIMEZONE */ #else /* not (HAVE_TM_ZONE || HAVE_INT_TIMEZONE) */ tm->tm_isdst = 0; diff --git a/src/backend/utils/adt/encode.c b/src/backend/utils/adt/encode.c index 2a59c25b35a..21139b89f4f 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.5 2001/10/28 06:25:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/encode.c,v 1.6 2001/11/05 17:46:29 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 fb575c8bb94..7d2018d7470 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.76 2001/10/28 06:25:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.77 2001/11/05 17:46:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -81,7 +81,7 @@ static double cbrt(double x); #if !defined(nextstep) extern double cbrt(double x); #endif -#endif /* HAVE_CBRT */ +#endif /* HAVE_CBRT */ #ifndef HAVE_RINT #define rint my_rint @@ -89,8 +89,8 @@ static double rint(double x); #else extern double rint(double x); -#endif /* HAVE_RINT */ -#endif /* NeXT check */ +#endif /* HAVE_RINT */ +#endif /* NeXT check */ static void CheckFloat4Val(double val); @@ -148,7 +148,7 @@ CheckFloat4Val(double val) if (val != 0.0 && fabs(val) < FLOAT4_MIN) elog(ERROR, "Bad float4 input format -- underflow"); return; -#endif /* UNSAFE_FLOATS */ +#endif /* UNSAFE_FLOATS */ } /* @@ -172,7 +172,7 @@ CheckFloat8Val(double val) if (val != 0.0 && fabs(val) < FLOAT8_MIN) elog(ERROR, "Bad float8 input format -- underflow"); return; -#endif /* UNSAFE_FLOATS */ +#endif /* UNSAFE_FLOATS */ } /* @@ -1969,7 +1969,7 @@ rint(double x) w = TWO52[sx] + x; return w - TWO52[sx]; } -#endif /* !HAVE_RINT */ +#endif /* !HAVE_RINT */ #ifndef HAVE_CBRT @@ -1982,4 +1982,4 @@ cbrt(double x) return isneg ? -tmpres : tmpres; } -#endif /* !HAVE_CBRT */ +#endif /* !HAVE_CBRT */ diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 270abc161e4..d7c92bb91b5 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.43 2001/10/28 06:25:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.44 2001/11/05 17:46:29 momjian Exp $ * * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group @@ -1360,7 +1360,7 @@ dump_node(FormatNode *node, int max) } } -#endif /* DEBUG */ +#endif /* DEBUG */ /***************************************************************************** * Private utils @@ -1566,7 +1566,7 @@ dump_index(KeyWord *k, int *index) elog(DEBUG_elog_output, "\n\t\tUsed positions: %d,\n\t\tFree positions: %d", count, free_i); } -#endif /* DEBUG */ +#endif /* DEBUG */ /* ---------- * Skip TM / th in FROM_CHAR diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index f447caa66c1..1b955d5e6c6 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.47 2001/10/28 06:25:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.48 2001/11/05 17:46:29 momjian Exp $ * * ---------- */ @@ -2268,7 +2268,7 @@ dump_var(char *str, NumericVar *var) printf("\n"); } -#endif /* NUMERIC_DEBUG */ +#endif /* NUMERIC_DEBUG */ /* ---------- diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index ebba29a01ec..59b9714453f 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.47 2001/10/28 06:25:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.48 2001/11/05 17:46:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -89,7 +89,7 @@ pg_atoi(char *s, int size, int c) errno = ERANGE; elog(ERROR, "pg_atoi: error reading \"%s\": %m", s); } -#endif /* HAVE_LONG_INT_64 */ +#endif /* HAVE_LONG_INT_64 */ break; case sizeof(int16): if (l < SHRT_MIN) diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index 28d282e60d7..fd4b9c37197 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.12 2001/10/28 06:25:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/pg_locale.c,v 1.13 2001/11/05 17:46:29 momjian Exp $ * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group * @@ -197,4 +197,4 @@ PGLC_localeconv(void) return &CurrentLocaleConv; } -#endif /* USE_LOCALE */ +#endif /* USE_LOCALE */ diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index 926d7875bad..a61717a8602 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.37 2001/10/25 05:49:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.38 2001/11/05 17:46:29 momjian Exp $ * * Alistair Crooks added the code for the regex caching * agc - cached the regular expressions used - there's a good chance @@ -34,7 +34,7 @@ #if defined(DISABLE_XOPEN_NLS) #undef _XOPEN_SOURCE -#endif /* DISABLE_XOPEN_NLS */ +#endif /* DISABLE_XOPEN_NLS */ /* this is the number of cached regular expressions held. */ #ifndef MAX_CACHED_RES diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 71756271119..85b871078b1 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.101 2001/10/28 06:25:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.102 2001/11/05 17:46:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -2926,7 +2926,7 @@ locale_is_like_safe(void) return (bool) result; #else /* not USE_LOCALE */ return true; /* We must be in C locale, which is OK */ -#endif /* USE_LOCALE */ +#endif /* USE_LOCALE */ } /* diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index efac9a73a95..cab6291acd0 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.85 2001/10/28 06:25:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.86 2001/11/05 17:46:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -917,7 +917,7 @@ SearchCatCache(CatCache *cache, #ifdef CACHEDEBUG CACHE3_elog(DEBUG, "SearchCatCache(%s): found in bucket %d", cache->cc_relname, hash); -#endif /* CACHEDEBUG */ +#endif /* CACHEDEBUG */ return &ct->tuple; } diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 9f1698df64d..7eab8d73332 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.148 2001/10/28 06:25:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.149 2001/11/05 17:46:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -226,7 +226,7 @@ static void RelationClearRelation(Relation relation, bool rebuildIt); #ifdef ENABLE_REINDEX_NAILED_RELATIONS static void RelationReloadClassinfo(Relation relation); -#endif /* ENABLE_REINDEX_NAILED_RELATIONS */ +#endif /* ENABLE_REINDEX_NAILED_RELATIONS */ static void RelationFlushRelation(Relation relation); static Relation RelationNameCacheGetRelation(const char *relationName); static void init_irels(void); @@ -645,7 +645,7 @@ build_tupdesc_ind(RelationBuildDescInfo buildinfo, { #ifdef _DROP_COLUMN_HACK__ bool columnDropped = false; -#endif /* _DROP_COLUMN_HACK__ */ +#endif /* _DROP_COLUMN_HACK__ */ atttup = AttributeRelidNumIndexScan(attrel, ObjectIdGetDatum(RelationGetRelid(relation)), @@ -658,12 +658,12 @@ build_tupdesc_ind(RelationBuildDescInfo buildinfo, ObjectIdGetDatum(RelationGetRelid(relation)), Int32GetDatum(DROPPED_COLUMN_INDEX(i))); if (!HeapTupleIsValid(atttup)) -#endif /* _DROP_COLUMN_HACK__ */ +#endif /* _DROP_COLUMN_HACK__ */ elog(ERROR, "cannot find attribute %d of relation %s", i, RelationGetRelationName(relation)); #ifdef _DROP_COLUMN_HACK__ columnDropped = true; -#endif /* _DROP_COLUMN_HACK__ */ +#endif /* _DROP_COLUMN_HACK__ */ } relation->rd_att->attrs[i - 1] = attp = @@ -680,7 +680,7 @@ build_tupdesc_ind(RelationBuildDescInfo buildinfo, #ifdef _DROP_COLUMN_HACK__ if (columnDropped) continue; -#endif /* _DROP_COLUMN_HACK__ */ +#endif /* _DROP_COLUMN_HACK__ */ /* Update if this attribute have a constraint */ if (attp->attnotnull) @@ -1556,7 +1556,7 @@ RelationReloadClassinfo(Relation relation) return; } -#endif /* ENABLE_REINDEX_NAILED_RELATIONS */ +#endif /* ENABLE_REINDEX_NAILED_RELATIONS */ /* * RelationClearRelation @@ -1593,7 +1593,7 @@ RelationClearRelation(Relation relation, bool rebuildIt) { #ifdef ENABLE_REINDEX_NAILED_RELATIONS RelationReloadClassinfo(relation); -#endif /* ENABLE_REINDEX_NAILED_RELATIONS */ +#endif /* ENABLE_REINDEX_NAILED_RELATIONS */ return; } diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index d9554b95755..8af7072334d 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.90 2001/10/25 05:49:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.91 2001/11/05 17:46:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -329,7 +329,7 @@ elog(int lev, const char *fmt,...) write_syslog(syslog_level, msg_buf + timestamp_size); } -#endif /* ENABLE_SYSLOG */ +#endif /* ENABLE_SYSLOG */ /* syslog doesn't want a trailing newline, but other destinations do */ strcat(msg_buf, "\n"); @@ -665,7 +665,7 @@ write_syslog(int level, const char *line) syslog(level, "[%lu] %s", seq, line); } } -#endif /* ENABLE_SYSLOG */ +#endif /* ENABLE_SYSLOG */ static void diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index 18d2000d21d..6fffd7bab8b 100644 --- a/src/backend/utils/fmgr/fmgr.c +++ b/src/backend/utils/fmgr/fmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.56 2001/10/25 05:49:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.57 2001/11/05 17:46:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1470,7 +1470,7 @@ Int64GetDatum(int64 X) MemSet(retval, 0, Max(sizeof(int64), 8)); *retval = X; return PointerGetDatum(retval); -#endif /* INT64_IS_BUSTED */ +#endif /* INT64_IS_BUSTED */ } Datum diff --git a/src/backend/utils/hash/pg_crc.c b/src/backend/utils/hash/pg_crc.c index 4ed8c665286..62b1b106b80 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.5 2001/10/28 06:25:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/hash/pg_crc.c,v 1.6 2001/11/05 17:46:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -414,4 +414,4 @@ const uint64 crc_table[256] = { INT64CONST(0xD80C07CD676F8394), INT64CONST(0x9AFCE626CE85B507) }; -#endif /* INT64_IS_BUSTED */ +#endif /* INT64_IS_BUSTED */ diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c index 3a890a674cb..ee72286a5f7 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.34 2001/10/28 06:25:54 momjian Exp $ + * $Id: conv.c,v 1.35 2001/11/05 17:46:30 momjian Exp $ * * */ @@ -63,7 +63,7 @@ #include "Unicode/utf8_to_alt.map" #include "Unicode/utf8_to_koi8r.map" #include "Unicode/utf8_to_win1251.map" -#endif /* UNICODE_CONVERSION */ +#endif /* UNICODE_CONVERSION */ /* * SJIS alternative code. @@ -1348,7 +1348,7 @@ utf_to_latin5(unsigned char *utf, unsigned char *iso, int len) { utf_to_local(utf, iso, ULmapISO8859_5, sizeof(ULmapISO8859_5) / sizeof(pg_utf_to_local), len); } -#endif /* NOT_USED */ +#endif /* NOT_USED */ /* * Cyrillic charsets @@ -1485,7 +1485,7 @@ latin5_to_utf(unsigned char *iso, unsigned char *utf, int len) { local_to_utf(iso, utf, LUmapISO8859_5, sizeof(LUmapISO8859_5) / sizeof(pg_local_to_utf), PG_LATIN5, len); } -#endif /* NOT_USED */ +#endif /* NOT_USED */ #define UTF_ISO8859(_id_) \ static void \ @@ -1845,4 +1845,4 @@ pg_enconv pg_enconv_tbl[] = }, }; -#endif /* UNICODE_CONVERSION */ +#endif /* UNICODE_CONVERSION */ diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c index f1bd25036b3..354436b0d62 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.9 2001/10/28 06:25:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/ps_status.c,v 1.10 2001/11/05 17:46:30 momjian Exp $ * * Copyright 2000 by PostgreSQL Global Development Group * various details abducted from various places @@ -83,7 +83,7 @@ static const size_t ps_buffer_size = PS_BUFFER_SIZE; #else /* PS_USE_CLOBBER_ARGV */ static char *ps_buffer; /* will point to argv area */ static size_t ps_buffer_size; /* space determined at run time */ -#endif /* PS_USE_CLOBBER_ARGV */ +#endif /* PS_USE_CLOBBER_ARGV */ static size_t ps_buffer_fixed_size; /* size of the constant prefix */ @@ -154,7 +154,7 @@ save_ps_display_args(int argc, char *argv[]) new_environ[i] = NULL; environ = new_environ; } -#endif /* PS_USE_CLOBBER_ARGV */ +#endif /* PS_USE_CLOBBER_ARGV */ } /* @@ -190,11 +190,11 @@ init_ps_display(const char *username, const char *dbname, #ifdef PS_USE_CHANGE_ARGV save_argv[0] = ps_buffer; save_argv[1] = NULL; -#endif /* PS_USE_CHANGE_ARGV */ +#endif /* PS_USE_CHANGE_ARGV */ #ifdef PS_USE_CLOBBER_ARGV save_argv[1] = NULL; -#endif /* PS_USE_CLOBBER_ARGV */ +#endif /* PS_USE_CLOBBER_ARGV */ /* * Make fixed prefix of ps display. @@ -216,7 +216,7 @@ init_ps_display(const char *username, const char *dbname, #endif ps_buffer_fixed_size = strlen(ps_buffer); -#endif /* not PS_USE_NONE */ +#endif /* not PS_USE_NONE */ } @@ -256,12 +256,12 @@ set_ps_display(const char *activity) pst.pst_command = ps_buffer; pstat(PSTAT_SETCMD, pst, strlen(ps_buffer), 0, 0); } -#endif /* PS_USE_PSTAT */ +#endif /* PS_USE_PSTAT */ #ifdef PS_USE_PS_STRINGS PS_STRINGS->ps_nargvstr = 1; PS_STRINGS->ps_argvstr = ps_buffer; -#endif /* PS_USE_PS_STRINGS */ +#endif /* PS_USE_PS_STRINGS */ #ifdef PS_USE_CLOBBER_ARGV { @@ -273,8 +273,8 @@ set_ps_display(const char *activity) cp++) *cp = PS_PADDING; } -#endif /* PS_USE_CLOBBER_ARGV */ -#endif /* not PS_USE_NONE */ +#endif /* PS_USE_CLOBBER_ARGV */ +#endif /* not PS_USE_NONE */ } diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c index f45fb63fd82..317555f0ac4 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.43 2001/10/28 06:25:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.44 2001/11/05 17:46:30 momjian Exp $ * * NOTE: * This is a new (Feb. 05, 1999) implementation of the allocation set @@ -1083,4 +1083,4 @@ AllocSetCheck(MemoryContext context) } } -#endif /* MEMORY_CONTEXT_CHECKING */ +#endif /* MEMORY_CONTEXT_CHECKING */ |