From ea08e6cd5542cb269ecd3e735f1dfa3bb61fbc4f Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 5 Nov 2001 17:46:40 +0000 Subject: New pgindent run with fixes suggested by Tom. Patch manually reviewed, initdb/regression tests pass. --- contrib/btree_gist/btree_gist.c | 6 +- contrib/chkpass/chkpass.c | 4 +- contrib/cube/cubedata.h | 2 +- contrib/dbase/dbf.h | 12 +- contrib/dblink/dblink.h | 4 +- contrib/fulltextindex/fti.c | 6 +- contrib/fuzzystrmatch/fuzzystrmatch.h | 2 +- contrib/isbn_issn/isbn_issn.c | 6 +- contrib/pg_dumplo/pg_dumplo.h | 10 +- contrib/pg_logger/pg_logger.c | 2 +- contrib/pg_resetxlog/pg_resetxlog.c | 14 +- contrib/pgbench/pgbench.c | 10 +- contrib/pgcrypto/blf.c | 2 +- contrib/pgcrypto/blf.h | 2 +- contrib/pgcrypto/crypt-blowfish.c | 2 +- contrib/pgcrypto/crypt-des.c | 2 +- contrib/pgcrypto/internal.c | 6 +- contrib/pgcrypto/md5.h | 6 +- contrib/pgcrypto/openssl.c | 14 +- contrib/pgcrypto/px-crypt.c | 4 +- contrib/pgcrypto/px-crypt.h | 6 +- contrib/pgcrypto/px.h | 4 +- contrib/pgcrypto/random.c | 8 +- contrib/pgcrypto/rijndael.c | 4 +- contrib/pgcrypto/rijndael.h | 4 +- contrib/pgcrypto/sha1.c | 4 +- contrib/pgcrypto/sha1.h | 4 +- contrib/seg/segdata.h | 2 +- contrib/spi/refint.c | 2 +- contrib/spi/timetravel.c | 2 +- contrib/tsearch/gistidx.h | 2 +- contrib/tsearch/morph.c | 2 +- contrib/tsearch/query.c | 8 +- contrib/tsearch/query.h | 4 +- contrib/tsearch/rewrite.c | 4 +- contrib/tsearch/txtidx.c | 2 +- contrib/tsearch/txtidx.h | 6 +- contrib/xml/pgxml.h | 4 +- src/backend/access/gist/gist.c | 4 +- src/backend/access/heap/heapam.c | 20 +- src/backend/access/heap/tuptoaster.c | 4 +- src/backend/access/index/istrat.c | 4 +- src/backend/access/nbtree/nbtree.c | 6 +- src/backend/access/nbtree/nbtsort.c | 4 +- src/backend/access/rtree/rtree.c | 4 +- src/backend/access/transam/transam.c | 4 +- src/backend/access/transam/xlog.c | 6 +- src/backend/catalog/aclchk.c | 4 +- src/backend/catalog/index.c | 4 +- src/backend/catalog/pg_proc.c | 4 +- src/backend/commands/_deadcode/recipe.c | 14 +- src/backend/commands/_deadcode/recipe.h | 4 +- src/backend/commands/_deadcode/version.c | 6 +- src/backend/commands/command.c | 8 +- src/backend/commands/remove.c | 4 +- src/backend/commands/rename.c | 6 +- src/backend/commands/sequence.c | 4 +- src/backend/commands/user.c | 19 +- src/backend/commands/vacuum.c | 6 +- src/backend/libpq/auth.c | 16 +- src/backend/libpq/crypt.c | 18 +- src/backend/libpq/hba.c | 4 +- src/backend/libpq/pqcomm.c | 6 +- src/backend/libpq/pqpacket.c | 4 +- src/backend/libpq/pqsignal.c | 4 +- src/backend/main/main.c | 12 +- src/backend/optimizer/path/_deadcode/predmig.c | 4 +- src/backend/optimizer/path/allpaths.c | 4 +- src/backend/optimizer/path/clausesel.c | 4 +- src/backend/optimizer/plan/planner.c | 4 +- src/backend/optimizer/plan/setrefs.c | 8 +- src/backend/optimizer/prep/prepkeyset.c | 2 +- src/backend/optimizer/prep/preptlist.c | 30 +- src/backend/optimizer/util/clauses.c | 27 +- src/backend/parser/analyze.c | 12 +- src/backend/parser/parse_relation.c | 4 +- src/backend/parser/parse_target.c | 4 +- src/backend/parser/parser.c | 6 +- src/backend/port/dynloader/aix.c | 8 +- src/backend/port/dynloader/aix.h | 6 +- src/backend/port/dynloader/beos.h | 4 +- src/backend/port/dynloader/bsdi.c | 4 +- src/backend/port/dynloader/bsdi.h | 4 +- src/backend/port/dynloader/dgux.h | 4 +- src/backend/port/dynloader/freebsd.c | 3 +- src/backend/port/dynloader/freebsd.h | 4 +- src/backend/port/dynloader/irix5.h | 2 +- src/backend/port/dynloader/linux.h | 6 +- src/backend/port/dynloader/netbsd.c | 2 +- src/backend/port/dynloader/netbsd.h | 4 +- src/backend/port/dynloader/nextstep.h | 2 +- src/backend/port/dynloader/openbsd.c | 2 +- src/backend/port/dynloader/openbsd.h | 4 +- src/backend/port/dynloader/osf.h | 4 +- src/backend/port/dynloader/sco.h | 4 +- src/backend/port/dynloader/solaris.h | 4 +- src/backend/port/dynloader/sunos4.h | 4 +- src/backend/port/dynloader/svr4.h | 4 +- src/backend/port/dynloader/ultrix4.h | 14 +- src/backend/port/dynloader/univel.h | 2 +- src/backend/port/dynloader/unixware.h | 2 +- src/backend/port/dynloader/win.h | 2 +- src/backend/port/qnx4/ipc.h | 4 +- src/backend/port/qnx4/sem.h | 4 +- src/backend/port/qnx4/shm.h | 4 +- src/backend/port/strcasecmp.c | 4 +- src/backend/port/strtol.c | 2 +- src/backend/port/strtoul.c | 2 +- src/backend/port/sunos4/float.h | 4 +- src/backend/postmaster/postmaster.c | 31 +- src/backend/regex/regerror.c | 2 +- src/backend/rewrite/rewriteManip.c | 6 +- src/backend/storage/buffer/buf_init.c | 4 +- src/backend/storage/buffer/bufmgr.c | 8 +- src/backend/storage/buffer/freelist.c | 4 +- src/backend/storage/file/fd.c | 6 +- src/backend/storage/freespace/freespace.c | 4 +- src/backend/storage/ipc/ipc.c | 4 +- src/backend/storage/ipc/pmsignal.c | 8 +- src/backend/storage/ipc/shmqueue.c | 6 +- src/backend/storage/ipc/sinvaladt.c | 10 +- src/backend/storage/lmgr/lock.c | 8 +- src/backend/storage/lmgr/lwlock.c | 4 +- src/backend/storage/lmgr/s_lock.c | 20 +- src/backend/storage/lmgr/spin.c | 4 +- src/backend/storage/smgr/mm.c | 12 +- src/backend/tcop/fastpath.c | 4 +- src/backend/tcop/postgres.c | 10 +- src/backend/tioga/Arr_TgRecipe.h | 18 +- src/backend/tioga/Varray.h | 4 +- src/backend/tioga/tgRecipe.h | 17 +- src/backend/utils/adt/ascii.c | 4 +- src/backend/utils/adt/datetime.c | 4 +- src/backend/utils/adt/encode.c | 4 +- src/backend/utils/adt/float.c | 16 +- src/backend/utils/adt/formatting.c | 6 +- src/backend/utils/adt/numeric.c | 4 +- src/backend/utils/adt/numutils.c | 4 +- src/backend/utils/adt/pg_locale.c | 4 +- src/backend/utils/adt/regexp.c | 4 +- src/backend/utils/adt/selfuncs.c | 4 +- src/backend/utils/cache/catcache.c | 4 +- src/backend/utils/cache/relcache.c | 16 +- src/backend/utils/error/elog.c | 6 +- src/backend/utils/fmgr/fmgr.c | 4 +- src/backend/utils/hash/pg_crc.c | 4 +- src/backend/utils/mb/conv.c | 10 +- src/backend/utils/misc/ps_status.c | 20 +- src/backend/utils/mmgr/aset.c | 4 +- src/bin/pg_dump/pg_backup_archiver.c | 37 ++- src/bin/pg_dump/pg_backup_archiver.h | 4 +- src/bin/pg_dump/pg_dump.h | 4 +- src/bin/pg_dump/pg_restore.c | 4 +- src/bin/psql/command.c | 4 +- src/bin/psql/command.h | 4 +- src/bin/psql/common.c | 4 +- src/bin/psql/common.h | 6 +- src/bin/psql/describe.h | 4 +- src/bin/psql/input.h | 4 +- src/bin/psql/large_obj.h | 4 +- src/bin/psql/mainloop.c | 4 +- src/bin/psql/mainloop.h | 4 +- src/bin/psql/mbprint.h | 6 +- src/bin/psql/print.h | 4 +- src/bin/psql/prompt.h | 4 +- src/bin/psql/startup.c | 8 +- src/bin/psql/stringutils.h | 4 +- src/bin/psql/tab-complete.c | 6 +- src/bin/psql/variables.h | 4 +- src/include/access/attnum.h | 4 +- src/include/access/clog.h | 4 +- src/include/access/genam.h | 4 +- src/include/access/gist.h | 4 +- src/include/access/gistscan.h | 4 +- src/include/access/hash.h | 4 +- src/include/access/heapam.h | 7 +- src/include/access/hio.h | 4 +- src/include/access/htup.h | 4 +- src/include/access/ibit.h | 4 +- src/include/access/iqual.h | 4 +- src/include/access/istrat.h | 4 +- src/include/access/itup.h | 4 +- src/include/access/nbtree.h | 4 +- src/include/access/printtup.h | 4 +- src/include/access/relscan.h | 4 +- src/include/access/rmgr.h | 4 +- src/include/access/rtree.h | 4 +- src/include/access/rtscan.h | 4 +- src/include/access/sdir.h | 4 +- src/include/access/skey.h | 4 +- src/include/access/strat.h | 4 +- src/include/access/transam.h | 4 +- src/include/access/tupdesc.h | 6 +- src/include/access/tupmacs.h | 6 +- src/include/access/tuptoaster.h | 4 +- src/include/access/valid.h | 4 +- src/include/access/xact.h | 4 +- src/include/access/xlog.h | 4 +- src/include/access/xlogdefs.h | 4 +- src/include/bootstrap/bootstrap.h | 4 +- src/include/c.h | 18 +- src/include/catalog/catalog.h | 4 +- src/include/catalog/catname.h | 4 +- src/include/catalog/heap.h | 4 +- src/include/catalog/index.h | 4 +- src/include/catalog/indexing.h | 4 +- src/include/catalog/pg_aggregate.h | 4 +- src/include/catalog/pg_am.h | 4 +- src/include/catalog/pg_amop.h | 4 +- src/include/catalog/pg_amproc.h | 4 +- src/include/catalog/pg_attrdef.h | 2 +- src/include/catalog/pg_attribute.h | 6 +- src/include/catalog/pg_class.h | 4 +- src/include/catalog/pg_control.h | 4 +- src/include/catalog/pg_database.h | 4 +- src/include/catalog/pg_description.h | 4 +- src/include/catalog/pg_group.h | 4 +- src/include/catalog/pg_index.h | 4 +- src/include/catalog/pg_inherits.h | 4 +- src/include/catalog/pg_language.h | 4 +- src/include/catalog/pg_largeobject.h | 4 +- src/include/catalog/pg_listener.h | 4 +- src/include/catalog/pg_opclass.h | 4 +- src/include/catalog/pg_operator.h | 4 +- src/include/catalog/pg_proc.h | 4 +- src/include/catalog/pg_relcheck.h | 2 +- src/include/catalog/pg_rewrite.h | 4 +- src/include/catalog/pg_shadow.h | 4 +- src/include/catalog/pg_statistic.h | 4 +- src/include/catalog/pg_trigger.h | 2 +- src/include/catalog/pg_type.h | 4 +- src/include/catalog/pg_version.h | 4 +- src/include/commands/async.h | 4 +- src/include/commands/cluster.h | 4 +- src/include/commands/command.h | 4 +- src/include/commands/comment.h | 2 +- src/include/commands/copy.h | 4 +- src/include/commands/creatinh.h | 4 +- src/include/commands/dbcommands.h | 4 +- src/include/commands/defrem.h | 4 +- src/include/commands/explain.h | 4 +- src/include/commands/proclang.h | 2 +- src/include/commands/rename.h | 4 +- src/include/commands/sequence.h | 4 +- src/include/commands/trigger.h | 4 +- src/include/commands/user.h | 4 +- src/include/commands/vacuum.h | 4 +- src/include/commands/variable.h | 4 +- src/include/commands/version.h | 4 +- src/include/commands/view.h | 4 +- src/include/executor/execFlatten.h | 4 +- src/include/executor/execdebug.h | 22 +- src/include/executor/execdefs.h | 4 +- src/include/executor/execdesc.h | 4 +- src/include/executor/executor.h | 4 +- src/include/executor/functions.h | 4 +- src/include/executor/hashjoin.h | 4 +- src/include/executor/instrument.h | 4 +- src/include/executor/nodeAgg.h | 4 +- src/include/executor/nodeAppend.h | 4 +- src/include/executor/nodeGroup.h | 4 +- src/include/executor/nodeHash.h | 4 +- src/include/executor/nodeHashjoin.h | 4 +- src/include/executor/nodeIndexscan.h | 4 +- src/include/executor/nodeLimit.h | 4 +- src/include/executor/nodeMaterial.h | 4 +- src/include/executor/nodeMergejoin.h | 4 +- src/include/executor/nodeNestloop.h | 4 +- src/include/executor/nodeResult.h | 4 +- src/include/executor/nodeSeqscan.h | 4 +- src/include/executor/nodeSetOp.h | 4 +- src/include/executor/nodeSort.h | 4 +- src/include/executor/nodeSubplan.h | 2 +- src/include/executor/nodeSubqueryscan.h | 4 +- src/include/executor/nodeTidscan.h | 4 +- src/include/executor/nodeUnique.h | 4 +- src/include/executor/spi.h | 4 +- src/include/executor/spi_priv.h | 4 +- src/include/executor/tuptable.h | 4 +- src/include/fmgr.h | 4 +- src/include/lib/dllist.h | 4 +- src/include/lib/lispsort.h | 4 +- src/include/lib/stringinfo.h | 4 +- src/include/libpq/auth.h | 4 +- src/include/libpq/be-fsstubs.h | 4 +- src/include/libpq/crypt.h | 8 +- src/include/libpq/hba.h | 4 +- src/include/libpq/libpq-be.h | 4 +- src/include/libpq/libpq-fs.h | 4 +- src/include/libpq/libpq.h | 4 +- src/include/libpq/pqcomm.h | 6 +- src/include/libpq/pqformat.h | 4 +- src/include/libpq/pqsignal.h | 4 +- src/include/mb/pg_wchar.h | 8 +- src/include/miscadmin.h | 4 +- src/include/nodes/execnodes.h | 6 +- src/include/nodes/makefuncs.h | 4 +- src/include/nodes/memnodes.h | 4 +- src/include/nodes/nodeFuncs.h | 4 +- src/include/nodes/nodes.h | 4 +- src/include/nodes/params.h | 4 +- src/include/nodes/parsenodes.h | 4 +- src/include/nodes/pg_list.h | 4 +- src/include/nodes/plannodes.h | 6 +- src/include/nodes/primnodes.h | 4 +- src/include/nodes/print.h | 4 +- src/include/nodes/readfuncs.h | 4 +- src/include/nodes/relation.h | 4 +- src/include/optimizer/_deadcode/xfunc.h | 4 +- src/include/optimizer/clauses.h | 4 +- src/include/optimizer/cost.h | 4 +- src/include/optimizer/geqo.h | 4 +- src/include/optimizer/geqo_copy.h | 4 +- src/include/optimizer/geqo_gene.h | 4 +- src/include/optimizer/geqo_misc.h | 4 +- src/include/optimizer/geqo_mutation.h | 4 +- src/include/optimizer/geqo_pool.h | 4 +- src/include/optimizer/geqo_random.h | 4 +- src/include/optimizer/geqo_recombination.h | 4 +- src/include/optimizer/geqo_selection.h | 4 +- src/include/optimizer/joininfo.h | 4 +- src/include/optimizer/pathnode.h | 4 +- src/include/optimizer/paths.h | 4 +- src/include/optimizer/plancat.h | 4 +- src/include/optimizer/planmain.h | 4 +- src/include/optimizer/planner.h | 4 +- src/include/optimizer/prep.h | 4 +- src/include/optimizer/restrictinfo.h | 4 +- src/include/optimizer/subselect.h | 2 +- src/include/optimizer/tlist.h | 4 +- src/include/optimizer/var.h | 4 +- src/include/parser/analyze.h | 4 +- src/include/parser/gramparse.h | 4 +- src/include/parser/keywords.h | 4 +- src/include/parser/parse_agg.h | 4 +- src/include/parser/parse_clause.h | 4 +- src/include/parser/parse_coerce.h | 4 +- src/include/parser/parse_expr.h | 4 +- src/include/parser/parse_func.h | 6 +- src/include/parser/parse_node.h | 4 +- src/include/parser/parse_oper.h | 4 +- src/include/parser/parse_relation.h | 4 +- src/include/parser/parse_target.h | 4 +- src/include/parser/parse_type.h | 4 +- src/include/parser/parser.h | 4 +- src/include/parser/parsetree.h | 4 +- src/include/parser/scansup.h | 4 +- src/include/pgstat.h | 4 +- src/include/port/darwin/sem.h | 4 +- src/include/port/qnx4.h | 4 +- src/include/port/solaris.h | 6 +- src/include/postgres.h | 8 +- src/include/postgres_fe.h | 4 +- src/include/regex/cclass.h | 16 +- src/include/regex/cname.h | 2 +- src/include/regex/regex.h | 2 +- src/include/regex/utils.h | 2 +- src/include/rewrite/prs2lock.h | 4 +- src/include/rewrite/rewriteDefine.h | 4 +- src/include/rewrite/rewriteHandler.h | 4 +- src/include/rewrite/rewriteManip.h | 4 +- src/include/rewrite/rewriteRemove.h | 4 +- src/include/rewrite/rewriteSupport.h | 4 +- src/include/rusagestub.h | 4 +- src/include/storage/backendid.h | 4 +- src/include/storage/block.h | 4 +- src/include/storage/buf.h | 4 +- src/include/storage/buf_internals.h | 8 +- src/include/storage/buffile.h | 4 +- src/include/storage/bufpage.h | 4 +- src/include/storage/fd.h | 4 +- src/include/storage/freespace.h | 4 +- src/include/storage/ipc.h | 6 +- src/include/storage/item.h | 4 +- src/include/storage/itemid.h | 4 +- src/include/storage/itempos.h | 6 +- src/include/storage/itemptr.h | 4 +- src/include/storage/large_object.h | 4 +- src/include/storage/lmgr.h | 4 +- src/include/storage/lock.h | 6 +- src/include/storage/lwlock.h | 4 +- src/include/storage/off.h | 4 +- src/include/storage/page.h | 4 +- src/include/storage/pmsignal.h | 6 +- src/include/storage/pos.h | 4 +- src/include/storage/proc.h | 4 +- src/include/storage/relfilenode.h | 2 +- src/include/storage/shmem.h | 4 +- src/include/storage/sinval.h | 4 +- src/include/storage/sinvaladt.h | 4 +- src/include/storage/smgr.h | 4 +- src/include/storage/spin.h | 4 +- src/include/tcop/dest.h | 4 +- src/include/tcop/fastpath.h | 4 +- src/include/tcop/pquery.h | 4 +- src/include/tcop/tcopdebug.h | 4 +- src/include/tcop/tcopprot.h | 6 +- src/include/tcop/utility.h | 4 +- src/include/utils/acl.h | 4 +- src/include/utils/array.h | 4 +- src/include/utils/ascii.h | 6 +- src/include/utils/bit.h | 4 +- src/include/utils/builtins.h | 4 +- src/include/utils/cash.h | 2 +- src/include/utils/catcache.h | 4 +- src/include/utils/date.h | 4 +- src/include/utils/datetime.h | 6 +- src/include/utils/datum.h | 4 +- src/include/utils/dynahash.h | 4 +- src/include/utils/dynamic_loader.h | 4 +- src/include/utils/elog.h | 4 +- src/include/utils/exc.h | 4 +- src/include/utils/excid.h | 4 +- src/include/utils/fcache.h | 4 +- src/include/utils/fmgrtab.h | 4 +- src/include/utils/geo_decls.h | 4 +- src/include/utils/guc.h | 4 +- src/include/utils/hsearch.h | 4 +- src/include/utils/inet.h | 4 +- src/include/utils/int8.h | 4 +- src/include/utils/inval.h | 4 +- src/include/utils/logtape.h | 4 +- src/include/utils/lsyscache.h | 4 +- src/include/utils/memutils.h | 4 +- src/include/utils/nabstime.h | 4 +- src/include/utils/numeric.h | 4 +- src/include/utils/palloc.h | 4 +- src/include/utils/pg_crc.h | 6 +- src/include/utils/pg_locale.h | 6 +- src/include/utils/pg_lzcompress.h | 4 +- src/include/utils/portal.h | 4 +- src/include/utils/ps_status.h | 4 +- src/include/utils/rel.h | 4 +- src/include/utils/relcache.h | 4 +- src/include/utils/selfuncs.h | 4 +- src/include/utils/sets.h | 4 +- src/include/utils/syscache.h | 4 +- src/include/utils/temprel.h | 4 +- src/include/utils/timestamp.h | 4 +- src/include/utils/tqual.h | 4 +- src/include/utils/tuplesort.h | 4 +- src/include/utils/tuplestore.h | 4 +- src/interfaces/ecpg/include/ecpgerrno.h | 2 +- src/interfaces/ecpg/include/ecpglib.h | 14 +- src/interfaces/ecpg/include/sqlca.h | 4 +- src/interfaces/ecpg/lib/data.c | 10 +- src/interfaces/ecpg/lib/descriptor.c | 4 +- src/interfaces/ecpg/lib/execute.c | 8 +- src/interfaces/ecpg/lib/pg_type.h | 4 +- src/interfaces/ecpg/lib/prepare.c | 4 +- src/interfaces/libpgtcl/libpgtcl.h | 4 +- src/interfaces/libpgtcl/pgtclCmds.c | 4 +- src/interfaces/libpgtcl/pgtclCmds.h | 8 +- src/interfaces/libpgtcl/pgtclId.c | 4 +- src/interfaces/libpq/fe-auth.c | 12 +- src/interfaces/libpq/fe-auth.h | 6 +- src/interfaces/libpq/fe-connect.c | 8 +- src/interfaces/libpq/fe-misc.c | 6 +- src/interfaces/libpq/libpq-fe.h | 415 +++++++++++++------------ src/interfaces/libpq/libpq-int.h | 14 +- src/interfaces/libpq/pqexpbuffer.h | 4 +- src/interfaces/libpq/pqsignal.c | 4 +- src/interfaces/libpq/pqsignal.h | 4 +- src/interfaces/odbc/bind.h | 2 +- src/interfaces/odbc/connection.c | 8 +- src/interfaces/odbc/connection.h | 2 +- src/interfaces/odbc/convert.c | 130 ++++---- src/interfaces/odbc/convert.h | 2 +- src/interfaces/odbc/dlg_specific.c | 10 +- src/interfaces/odbc/dlg_specific.h | 2 +- src/interfaces/odbc/drvconn.c | 4 +- src/interfaces/odbc/environ.c | 2 +- src/interfaces/odbc/gpps.c | 4 +- src/interfaces/odbc/info.c | 38 +-- src/interfaces/odbc/iodbc.h | 4 +- src/interfaces/odbc/isql.h | 8 +- src/interfaces/odbc/isqlext.h | 2 +- src/interfaces/odbc/odbcapi30.c | 4 +- src/interfaces/odbc/parse.c | 2 +- src/interfaces/odbc/pgapifunc.h | 2 +- src/interfaces/odbc/pgtypes.c | 17 +- src/interfaces/odbc/pgtypes.h | 4 +- src/interfaces/odbc/psqlodbc.c | 4 +- src/interfaces/odbc/psqlodbc.h | 30 +- src/interfaces/odbc/resource.h | 4 +- src/interfaces/odbc/results.c | 10 +- src/interfaces/odbc/setup.c | 2 +- src/interfaces/odbc/statement.c | 15 +- src/interfaces/perl5/ppport.h | 4 +- src/interfaces/python/pgmodule.c | 38 +-- src/pl/plperl/plperl.c | 4 +- src/pl/plperl/ppport.h | 4 +- src/pl/plpgsql/src/plpgsql.h | 72 ++--- src/pl/plpython/plpython.c | 22 +- src/pl/plpython/plpython.h | 4 +- src/pl/tcl/pltcl.c | 8 +- src/test/examples/testlibpq.c | 6 +- src/test/regress/regress.c | 4 +- src/tools/pgindent/pgindent | 4 +- src/tutorial/beard.c | 4 +- src/tutorial/complex.c | 2 +- src/utils/dllinit.c | 6 +- src/utils/getopt.c | 2 +- 503 files changed, 1652 insertions(+), 1614 deletions(-) diff --git a/contrib/btree_gist/btree_gist.c b/contrib/btree_gist/btree_gist.c index 837b2ed7bd..924062ed03 100644 --- a/contrib/btree_gist/btree_gist.c +++ b/contrib/btree_gist/btree_gist.c @@ -15,20 +15,20 @@ typedef struct intkey { int4 lower; int4 upper; -} INT4KEY; +} INT4KEY; typedef struct tskey { Timestamp lower; Timestamp upper; -} TSKEY; +} TSKEY; /* used for sorting */ typedef struct rix { int index; char *r; -} RIX; +} RIX; /* ** int4key in/out diff --git a/contrib/chkpass/chkpass.c b/contrib/chkpass/chkpass.c index c7c3197c92..7dfa95082a 100644 --- a/contrib/chkpass/chkpass.c +++ b/contrib/chkpass/chkpass.c @@ -4,7 +4,7 @@ * darcy@druid.net * http://www.druid.net/darcy/ * - * $Id: chkpass.c,v 1.5 2001/10/25 05:49:19 momjian Exp $ + * $Id: chkpass.c,v 1.6 2001/11/05 17:46:22 momjian Exp $ * best viewed with tabs set to 4 */ @@ -32,7 +32,7 @@ typedef struct chkpass { char password[16]; -} chkpass; +} chkpass; /* * Various forward declarations: diff --git a/contrib/cube/cubedata.h b/contrib/cube/cubedata.h index 359fab2871..a1c5e8efcd 100644 --- a/contrib/cube/cubedata.h +++ b/contrib/cube/cubedata.h @@ -3,4 +3,4 @@ typedef struct NDBOX unsigned int size; /* required to be a Postgres varlena type */ unsigned int dim; float x[1]; -} NDBOX; +} NDBOX; diff --git a/contrib/dbase/dbf.h b/contrib/dbase/dbf.h index ab64d46690..5d17c2ba14 100644 --- a/contrib/dbase/dbf.h +++ b/contrib/dbase/dbf.h @@ -51,7 +51,7 @@ typedef struct u_char dbh_hlen[2]; /* length of this header */ u_char dbh_rlen[2]; /* length of a record */ u_char dbh_stub[20]; /* misc stuff we don't need */ -} dbf_header; +} dbf_header; /* disk field-description */ @@ -64,7 +64,7 @@ typedef struct u_char dbf_dec; /* number of decimal positions if type is * 'N' */ u_char dbf_stub[14]; /* stuff we don't need */ -} dbf_field; +} dbf_field; /* memory field-description */ @@ -74,7 +74,7 @@ typedef struct u_char db_type; /* field-type */ u_char db_flen; /* field-length */ u_char db_dec; /* number of decimal positions */ -} f_descr; +} f_descr; /* memory dfb-header */ @@ -95,7 +95,7 @@ typedef struct u_char *db_buff; /* record-buffer to save malloc()'s */ f_descr *db_fields; /* pointer to an array of field- * descriptions */ -} dbhead; +} dbhead; /* structure that contains everything a user wants from a field, including the contents (in ASCII). Warning! db_flen may be bigger than the actual @@ -109,7 +109,7 @@ typedef struct u_char db_flen; /* field-length */ u_char db_dec; /* number of decimal positions */ u_char *db_contents; /* contents of the field in ASCII */ -} field; +} field; /* prototypes for functions */ @@ -136,4 +136,4 @@ extern void put_long(u_char *cp, long lval); extern short get_short(u_char *cp); extern void put_short(u_char *cp, short lval); -#endif /* _DBF_H */ +#endif /* _DBF_H */ diff --git a/contrib/dblink/dblink.h b/contrib/dblink/dblink.h index 4d2fd6e1ba..8c5a5bdc28 100644 --- a/contrib/dblink/dblink.h +++ b/contrib/dblink/dblink.h @@ -54,7 +54,7 @@ typedef struct */ PGresult *res; -} dblink_results; +} dblink_results; /* * External declarations @@ -67,4 +67,4 @@ extern Datum dblink_tok(PG_FUNCTION_ARGS); */ dblink_results *init_dblink_results(MemoryContext fn_mcxt); -#endif /* DBLINK_H */ +#endif /* DBLINK_H */ diff --git a/contrib/fulltextindex/fti.c b/contrib/fulltextindex/fti.c index a259e4b08b..aabb2caf9f 100644 --- a/contrib/fulltextindex/fti.c +++ b/contrib/fulltextindex/fti.c @@ -103,7 +103,7 @@ char *StopWords[] = { /* list of words to skip in indexing */ "the", "yes" }; -#endif /* USE_STOP_WORDS */ +#endif /* USE_STOP_WORDS */ /* stuff for caching query-plans, stolen from contrib/spi/\*.c */ typedef struct @@ -111,7 +111,7 @@ typedef struct char *ident; int nplans; void **splan; -} EPlan; +} EPlan; static EPlan *InsertPlans = NULL; static EPlan *DeletePlans = NULL; @@ -403,7 +403,7 @@ is_stopword(char *text) else StopHigh = StopMiddle; } -#endif /* USE_STOP_WORDS */ +#endif /* USE_STOP_WORDS */ return (false); } diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.h b/contrib/fuzzystrmatch/fuzzystrmatch.h index 9c53981843..23e5e57d92 100644 --- a/contrib/fuzzystrmatch/fuzzystrmatch.h +++ b/contrib/fuzzystrmatch/fuzzystrmatch.h @@ -169,4 +169,4 @@ char _codes[26] = { /* These prevent GH from becoming F */ #define NOGHTOF(c) (ENCODE(c) & 16) /* BDH */ -#endif /* FUZZYSTRMATCH_H */ +#endif /* FUZZYSTRMATCH_H */ diff --git a/contrib/isbn_issn/isbn_issn.c b/contrib/isbn_issn/isbn_issn.c index bc21a0622e..70115ceab2 100644 --- a/contrib/isbn_issn/isbn_issn.c +++ b/contrib/isbn_issn/isbn_issn.c @@ -1,7 +1,7 @@ /* * PostgreSQL type definitions for ISBNs. * - * $Id: isbn_issn.c,v 1.3 2001/02/10 02:31:25 tgl Exp $ + * $Id: isbn_issn.c,v 1.4 2001/11/05 17:46:23 momjian Exp $ */ #include "postgres.h" @@ -16,7 +16,7 @@ typedef struct isbn { char num[13]; char pad[3]; -} isbn; +} isbn; /* * Various forward declarations: @@ -204,7 +204,7 @@ typedef struct issn { char num[9]; char pad[7]; -} issn; +} issn; /* * Various forward declarations: diff --git a/contrib/pg_dumplo/pg_dumplo.h b/contrib/pg_dumplo/pg_dumplo.h index 5bb298fb00..cbced20ec8 100644 --- a/contrib/pg_dumplo/pg_dumplo.h +++ b/contrib/pg_dumplo/pg_dumplo.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------------------- * pg_dumplo * - * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/pg_dumplo.h,v 1.6 2001/10/28 06:25:40 momjian Exp $ + * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/pg_dumplo.h,v 1.7 2001/11/05 17:46:23 momjian Exp $ * * Karel Zak 1999-2000 * ------------------------------------------------------------------------- @@ -41,7 +41,7 @@ typedef struct char *lo_table, *lo_attr; Oid lo_oid; -} LOlist; +} LOlist; typedef struct { @@ -60,7 +60,7 @@ typedef struct quiet; PGresult *res; PGconn *conn; -} LODumpMaster; +} LODumpMaster; typedef enum { @@ -69,7 +69,7 @@ typedef enum ACTION_EXPORT_ATTR, ACTION_EXPORT_ALL, ACTION_IMPORT -} PGLODUMP_ACTIONS; +} PGLODUMP_ACTIONS; extern char *progname; @@ -79,4 +79,4 @@ extern void load_lolist(LODumpMaster * pgLO); extern void pglo_export(LODumpMaster * pgLO); extern void pglo_import(LODumpMaster * pgLO); -#endif /* PG_DUMPLO_H */ +#endif /* PG_DUMPLO_H */ diff --git a/contrib/pg_logger/pg_logger.c b/contrib/pg_logger/pg_logger.c index cc2fdbed30..cb28bf5e7a 100644 --- a/contrib/pg_logger/pg_logger.c +++ b/contrib/pg_logger/pg_logger.c @@ -18,7 +18,7 @@ struct const char *tag; int size; int priority; -} tags[] = +} tags[] = { { diff --git a/contrib/pg_resetxlog/pg_resetxlog.c b/contrib/pg_resetxlog/pg_resetxlog.c index 653ba94371..554bc83939 100644 --- a/contrib/pg_resetxlog/pg_resetxlog.c +++ b/contrib/pg_resetxlog/pg_resetxlog.c @@ -23,7 +23,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.9 2001/10/28 06:25:41 momjian Exp $ + * $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.10 2001/11/05 17:46:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -221,7 +221,7 @@ typedef struct crc64V0 { uint32 crc1; uint32 crc2; -} crc64V0; +} crc64V0; static uint32 crc_tableV0[] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, @@ -309,7 +309,7 @@ typedef struct ControlFileDataV0 char lc_collate[LOCALE_NAME_BUFLEN_V0]; char lc_ctype[LOCALE_NAME_BUFLEN_V0]; char archdir[MAXPGPATH]; /* where to move offline log files */ -} ControlFileDataV0; +} ControlFileDataV0; typedef struct CheckPointV0 { @@ -323,7 +323,7 @@ typedef struct CheckPointV0 TransactionId nextXid; Oid nextOid; bool Shutdown; -} CheckPointV0; +} CheckPointV0; typedef struct XLogRecordV0 { @@ -334,14 +334,14 @@ typedef struct XLogRecordV0 uint16 xl_len; /* total len of record *data* */ uint8 xl_info; RmgrId xl_rmid; /* resource manager inserted this record */ -} XLogRecordV0; +} XLogRecordV0; #define SizeOfXLogRecordV0 DOUBLEALIGN(sizeof(XLogRecordV0)) typedef struct XLogContRecordV0 { uint16 xl_len; /* len of data left */ -} XLogContRecordV0; +} XLogContRecordV0; #define SizeOfXLogContRecordV0 DOUBLEALIGN(sizeof(XLogContRecordV0)) @@ -351,7 +351,7 @@ typedef struct XLogPageHeaderDataV0 { uint32 xlp_magic; uint16 xlp_info; -} XLogPageHeaderDataV0; +} XLogPageHeaderDataV0; #define SizeOfXLogPHDV0 DOUBLEALIGN(sizeof(XLogPageHeaderDataV0)) diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c index c8aa0c14b7..8d20caf3e4 100644 --- a/contrib/pgbench/pgbench.c +++ b/contrib/pgbench/pgbench.c @@ -1,5 +1,5 @@ /* - * $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.12 2001/10/25 05:49:19 momjian Exp $ + * $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.13 2001/11/05 17:46:23 momjian Exp $ * * pgbench: a simple TPC-B like benchmark program for PostgreSQL * written by Tatsuo Ishii @@ -39,7 +39,7 @@ /* for getrlimit */ #include -#endif /* WIN32 */ +#endif /* WIN32 */ /******************************************************************** * some configurable parameters */ @@ -90,7 +90,7 @@ typedef struct int tid; /* teller id for this transaction */ int delta; int abalance; -} CState; +} CState; static void usage() @@ -680,7 +680,7 @@ main(int argc, char **argv) #else /* but BSD doesn't ... */ if (getrlimit(RLIMIT_OFILE, &rlim) == -1) { -#endif /* HAVE_RLIMIT_NOFILE */ +#endif /* HAVE_RLIMIT_NOFILE */ fprintf(stderr, "getrlimit failed. reason: %s\n", strerror(errno)); exit(1); } @@ -690,7 +690,7 @@ main(int argc, char **argv) fprintf(stderr, "Use limit/ulimt to increase the limit before using pgbench.\n"); exit(1); } -#endif /* #ifndef __CYGWIN__ */ +#endif /* #ifndef __CYGWIN__ */ break; case 'C': is_connect = 1; diff --git a/contrib/pgcrypto/blf.c b/contrib/pgcrypto/blf.c index aae5b6033a..e465bfe48a 100644 --- a/contrib/pgcrypto/blf.c +++ b/contrib/pgcrypto/blf.c @@ -48,7 +48,7 @@ #define inline __inline #else /* !__GNUC__ */ #define inline -#endif /* !__GNUC__ */ +#endif /* !__GNUC__ */ /* Function for Feistel Networks */ diff --git a/contrib/pgcrypto/blf.h b/contrib/pgcrypto/blf.h index 4677d05520..81159b13be 100644 --- a/contrib/pgcrypto/blf.h +++ b/contrib/pgcrypto/blf.h @@ -50,7 +50,7 @@ typedef struct BlowfishContext { uint32 S[4][256]; /* S-Boxes */ uint32 P[BLF_N + 2]; /* Subkeys */ -} blf_ctx; +} blf_ctx; /* Raw access to customized Blowfish * blf_key is just: diff --git a/contrib/pgcrypto/crypt-blowfish.c b/contrib/pgcrypto/crypt-blowfish.c index 3bc8e19fa9..8ec2b188e0 100644 --- a/contrib/pgcrypto/crypt-blowfish.c +++ b/contrib/pgcrypto/crypt-blowfish.c @@ -61,7 +61,7 @@ typedef struct { BF_word S[4][0x100]; BF_key P; -} BF_ctx; +} BF_ctx; /* * Magic IV for 64 Blowfish encryptions that we do at the end. diff --git a/contrib/pgcrypto/crypt-des.c b/contrib/pgcrypto/crypt-des.c index ddfabe14b6..531a8a315f 100644 --- a/contrib/pgcrypto/crypt-des.c +++ b/contrib/pgcrypto/crypt-des.c @@ -713,7 +713,7 @@ px_crypt_des(const char *key, const char *setting) p = output + strlen(output); } else -#endif /* !DISABLE_XDES */ +#endif /* !DISABLE_XDES */ { /* * "old"-style: setting - 2 bytes of salt key - up to 8 characters diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c index ba1d17efd9..21dbe08614 100644 --- a/contrib/pgcrypto/internal.c +++ b/contrib/pgcrypto/internal.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: internal.c,v 1.7 2001/10/28 06:25:41 momjian Exp $ + * $Id: internal.c,v 1.8 2001/11/05 17:46:23 momjian Exp $ */ @@ -61,7 +61,7 @@ static struct int_digest { char *name; void (*init) (PX_MD * h); -} int_digest_list[] = +} int_digest_list[] = { { @@ -520,7 +520,7 @@ static struct { char *name; PX_Cipher *(*load) (void); -} int_ciphers[] = +} int_ciphers[] = { { diff --git a/contrib/pgcrypto/md5.h b/contrib/pgcrypto/md5.h index dfabe24a1e..feadee2e80 100644 --- a/contrib/pgcrypto/md5.h +++ b/contrib/pgcrypto/md5.h @@ -1,4 +1,4 @@ -/* $Id: md5.h,v 1.6 2001/10/28 06:25:41 momjian Exp $ */ +/* $Id: md5.h,v 1.7 2001/11/05 17:46:23 momjian Exp $ */ /* $KAME: md5.h,v 1.3 2000/02/22 14:01:18 itojun Exp $ */ /* @@ -59,7 +59,7 @@ typedef struct unsigned int md5_i; uint8 md5_buf[MD5_BUFLEN]; -} md5_ctxt; +} md5_ctxt; extern void md5_init(md5_ctxt *); extern void md5_loop(md5_ctxt *, const uint8 *, unsigned int); @@ -76,4 +76,4 @@ do { \ md5_result((x), (y)); \ } while (0) -#endif /* ! _NETINET6_MD5_H_ */ +#endif /* ! _NETINET6_MD5_H_ */ diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c index 66b341949a..c31954efd0 100644 --- a/contrib/pgcrypto/openssl.c +++ b/contrib/pgcrypto/openssl.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openssl.c,v 1.7 2001/10/28 06:25:41 momjian Exp $ + * $Id: openssl.c,v 1.8 2001/11/05 17:46:23 momjian Exp $ */ #include @@ -110,7 +110,7 @@ typedef struct uint8 iv[EVP_MAX_IV_LENGTH]; uint klen; uint init; -} ossldata; +} ossldata; /* generic EVP */ @@ -324,35 +324,35 @@ struct { char *name; PX_Cipher cf; -} spec_types[] = +} spec_types[] = { { "bf-cbc", { gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size, - bf_init, bf_cbc_encrypt, bf_cbc_decrypt, gen_evp_free + bf_init, bf_cbc_encrypt, bf_cbc_decrypt, gen_evp_free } }, { "bf-ecb", { gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size, - bf_init, bf_ecb_encrypt, bf_ecb_decrypt, gen_evp_free + bf_init, bf_ecb_encrypt, bf_ecb_decrypt, gen_evp_free } }, { "bf-cfb", { gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size, - bf_init, bf_cfb64_encrypt, bf_cfb64_decrypt, gen_evp_free + bf_init, bf_cfb64_encrypt, bf_cfb64_decrypt, gen_evp_free } }, { "bf-ofb", { gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size, - bf_init, bf_ofb64_encrypt, bf_ofb64_decrypt, gen_evp_free + bf_init, bf_ofb64_encrypt, bf_ofb64_decrypt, gen_evp_free } }, { diff --git a/contrib/pgcrypto/px-crypt.c b/contrib/pgcrypto/px-crypt.c index fc0c4e94ac..4bc1e8179f 100644 --- a/contrib/pgcrypto/px-crypt.c +++ b/contrib/pgcrypto/px-crypt.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: px-crypt.c,v 1.4 2001/10/28 06:25:41 momjian Exp $ + * $Id: px-crypt.c,v 1.5 2001/11/05 17:46:23 momjian Exp $ */ #include @@ -75,7 +75,7 @@ static struct unsigned id_len; char *(*crypt) (const char *psw, const char *salt, char *buf, unsigned len); -} px_crypt_list[] = +} px_crypt_list[] = { { diff --git a/contrib/pgcrypto/px-crypt.h b/contrib/pgcrypto/px-crypt.h index 3d6f13ff1a..2c1bcbf4b6 100644 --- a/contrib/pgcrypto/px-crypt.h +++ b/contrib/pgcrypto/px-crypt.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: px-crypt.h,v 1.4 2001/10/28 06:25:41 momjian Exp $ + * $Id: px-crypt.h,v 1.5 2001/11/05 17:46:23 momjian Exp $ */ #ifndef _PX_CRYPT_H @@ -88,6 +88,6 @@ char *px_crypt_des(const char *key, const char *setting); /* crypt-md5.c */ char *px_crypt_md5(const char *pw, const char *salt, char *dst, unsigned dstlen); -#endif /* !PX_SYSTEM_CRYPT */ +#endif /* !PX_SYSTEM_CRYPT */ -#endif /* _PX_CRYPT_H */ +#endif /* _PX_CRYPT_H */ diff --git a/contrib/pgcrypto/px.h b/contrib/pgcrypto/px.h index d2a87b26e1..b234600a28 100644 --- a/contrib/pgcrypto/px.h +++ b/contrib/pgcrypto/px.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: px.h,v 1.3 2001/10/25 05:49:20 momjian Exp $ + * $Id: px.h,v 1.4 2001/11/05 17:46:23 momjian Exp $ */ #ifndef __PX_H @@ -180,4 +180,4 @@ const char *px_resolve_alias(const PX_Alias * aliases, const char *name); (c)->decrypt(c, data, dlen, res, rlen) #define px_combo_free(c) (c)->free(c) -#endif /* __PX_H */ +#endif /* __PX_H */ diff --git a/contrib/pgcrypto/random.c b/contrib/pgcrypto/random.c index 4c3bb6db1b..ce5f838a0c 100644 --- a/contrib/pgcrypto/random.c +++ b/contrib/pgcrypto/random.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: random.c,v 1.4 2001/10/28 06:25:41 momjian Exp $ + * $Id: random.c,v 1.5 2001/11/05 17:46:23 momjian Exp $ */ @@ -77,7 +77,7 @@ px_get_random_bytes(uint8 *dst, unsigned count) close(fd); return res; } -#endif /* RAND_DEV */ +#endif /* RAND_DEV */ #ifdef RAND_SILLY @@ -90,7 +90,7 @@ px_get_random_bytes(uint8 *dst, unsigned count) *dst++ = random(); return i; } -#endif /* RAND_SILLY */ +#endif /* RAND_SILLY */ #ifdef RAND_OPENSSL @@ -125,4 +125,4 @@ px_get_random_bytes(uint8 *dst, unsigned count) return -1; } -#endif /* RAND_OPENSSL */ +#endif /* RAND_OPENSSL */ diff --git a/contrib/pgcrypto/rijndael.c b/contrib/pgcrypto/rijndael.c index 546f39a20f..55b09549c0 100644 --- a/contrib/pgcrypto/rijndael.c +++ b/contrib/pgcrypto/rijndael.c @@ -97,7 +97,7 @@ static u4byte il_tab[4][256]; #endif static u4byte tab_gen = 0; -#endif /* !PRE_CALC_TABLES */ +#endif /* !PRE_CALC_TABLES */ #define ff_mult(a,b) (a && b ? pow_tab[(log_tab[a] + log_tab[b]) % 255] : 0) @@ -251,7 +251,7 @@ gen_tabs(void) } tab_gen = 1; -#endif /* !PRE_CALC_TABLES */ +#endif /* !PRE_CALC_TABLES */ } diff --git a/contrib/pgcrypto/rijndael.h b/contrib/pgcrypto/rijndael.h index 2f54e0c738..59a4be7edd 100644 --- a/contrib/pgcrypto/rijndael.h +++ b/contrib/pgcrypto/rijndael.h @@ -33,7 +33,7 @@ typedef struct _rijndael_ctx int decrypt; u4byte e_key[64]; u4byte d_key[64]; -} rijndael_ctx; +} rijndael_ctx; /* 2. Standard interface for AES cryptographic routines */ @@ -54,4 +54,4 @@ void aes_ecb_decrypt(rijndael_ctx * ctx, uint8 *data, unsigned len); void aes_cbc_encrypt(rijndael_ctx * ctx, uint8 *iva, uint8 *data, unsigned len); void aes_cbc_decrypt(rijndael_ctx * ctx, uint8 *iva, uint8 *data, unsigned len); -#endif /* _RIJNDAEL_H_ */ +#endif /* _RIJNDAEL_H_ */ diff --git a/contrib/pgcrypto/sha1.c b/contrib/pgcrypto/sha1.c index 129ce7a55c..01bd072089 100644 --- a/contrib/pgcrypto/sha1.c +++ b/contrib/pgcrypto/sha1.c @@ -1,4 +1,4 @@ -/* $Id: sha1.c,v 1.9 2001/10/28 06:25:41 momjian Exp $ */ +/* $Id: sha1.c,v 1.10 2001/11/05 17:46:23 momjian Exp $ */ /* $KAME: sha1.c,v 1.3 2000/02/22 14:01:18 itojun Exp $ */ /* @@ -346,4 +346,4 @@ sha1_result(struct sha1_ctxt * ctxt, uint8 *digest0) #endif } -#endif /* unsupported */ +#endif /* unsupported */ diff --git a/contrib/pgcrypto/sha1.h b/contrib/pgcrypto/sha1.h index 1699b385a4..096a9a40ad 100644 --- a/contrib/pgcrypto/sha1.h +++ b/contrib/pgcrypto/sha1.h @@ -1,4 +1,4 @@ -/* $Id: sha1.h,v 1.7 2001/10/28 06:25:41 momjian Exp $ */ +/* $Id: sha1.h,v 1.8 2001/11/05 17:46:23 momjian Exp $ */ /* $KAME: sha1.h,v 1.4 2000/02/22 14:01:18 itojun Exp $ */ /* @@ -72,4 +72,4 @@ typedef struct sha1_ctxt SHA1_CTX; #define SHA1_RESULTLEN (160/8) -#endif /* _NETINET6_SHA1_H_ */ +#endif /* _NETINET6_SHA1_H_ */ diff --git a/contrib/seg/segdata.h b/contrib/seg/segdata.h index 773883bbb7..69d85e0bc0 100644 --- a/contrib/seg/segdata.h +++ b/contrib/seg/segdata.h @@ -6,4 +6,4 @@ typedef struct SEG char u_sigd; char l_ext; char u_ext; -} SEG; +} SEG; diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c index f1163739e6..b4e6845ac6 100644 --- a/contrib/spi/refint.c +++ b/contrib/spi/refint.c @@ -17,7 +17,7 @@ typedef struct char *ident; int nplans; void **splan; -} EPlan; +} EPlan; static EPlan *FPlans = NULL; static int nFPlans = 0; diff --git a/contrib/spi/timetravel.c b/contrib/spi/timetravel.c index bc8a1112f4..1731190a5d 100644 --- a/contrib/spi/timetravel.c +++ b/contrib/spi/timetravel.c @@ -17,7 +17,7 @@ typedef struct { char *ident; void *splan; -} EPlan; +} EPlan; static EPlan *Plans = NULL; /* for UPDATE/DELETE */ static int nPlans = 0; diff --git a/contrib/tsearch/gistidx.h b/contrib/tsearch/gistidx.h index cb4d2f5a70..db1b501e92 100644 --- a/contrib/tsearch/gistidx.h +++ b/contrib/tsearch/gistidx.h @@ -46,7 +46,7 @@ typedef struct int4 len; int4 flag; char data[1]; -} GISTTYPE; +} GISTTYPE; #define ARRKEY 0x01 #define SIGNKEY 0x02 diff --git a/contrib/tsearch/morph.c b/contrib/tsearch/morph.c index 3a66ecbbc6..9eaefabfaf 100644 --- a/contrib/tsearch/morph.c +++ b/contrib/tsearch/morph.c @@ -34,7 +34,7 @@ typedef struct char *(*lemmatize) (void *, char *, int *); int (*is_stoplemm) (void *, char *, int); int (*is_stemstoplemm) (void *, char *, int); -} DICT; +} DICT; /* insert all dictionaries */ #define DICT_BODY diff --git a/contrib/tsearch/query.c b/contrib/tsearch/query.c index 4bda2617af..46703d70a3 100644 --- a/contrib/tsearch/query.c +++ b/contrib/tsearch/query.c @@ -72,7 +72,7 @@ typedef struct NODE int2 distance; int2 length; struct NODE *next; -} NODE; +} NODE; typedef struct { @@ -92,7 +92,7 @@ typedef struct /* state for value's parser */ TI_IN_STATE valstate; -} QPRS_STATE; +} QPRS_STATE; /* * get token from query string @@ -322,7 +322,7 @@ typedef struct WordEntry *arre; char *values; char *operand; -} CHKVAL; +} CHKVAL; /* * compare 2 string values @@ -626,7 +626,7 @@ typedef struct char *cur; char *op; int4 buflen; -} INFIX; +} INFIX; #define RESIZEBUF(inf,addsize) \ while( ( inf->cur - inf->buf ) + addsize + 1 >= inf->buflen ) \ diff --git a/contrib/tsearch/query.h b/contrib/tsearch/query.h index 4b3664b2ae..6d55f6b411 100644 --- a/contrib/tsearch/query.h +++ b/contrib/tsearch/query.h @@ -17,7 +17,7 @@ typedef struct ITEM /* user-friendly value */ uint16 distance; uint16 length; -} ITEM; +} ITEM; /* *Storage: @@ -28,7 +28,7 @@ typedef struct int4 len; int4 size; char data[1]; -} QUERYTYPE; +} QUERYTYPE; #define HDRSIZEQT ( 2*sizeof(int4) ) #define COMPUTESIZE(size,lenofoperand) ( HDRSIZEQT + size * sizeof(ITEM) + lenofoperand ) diff --git a/contrib/tsearch/rewrite.c b/contrib/tsearch/rewrite.c index 9ad7a0a86a..5036c420ff 100644 --- a/contrib/tsearch/rewrite.c +++ b/contrib/tsearch/rewrite.c @@ -24,7 +24,7 @@ typedef struct NODE struct NODE *left; struct NODE *right; ITEM *valnode; -} NODE; +} NODE; /* * make query tree from plain view of query @@ -50,7 +50,7 @@ typedef struct ITEM *ptr; int4 len; int4 cur; -} PLAINTREE; +} PLAINTREE; static void plainnode(PLAINTREE * state, NODE * node) diff --git a/contrib/tsearch/txtidx.c b/contrib/tsearch/txtidx.c index 735e90c96a..5eeb69b151 100644 --- a/contrib/tsearch/txtidx.c +++ b/contrib/tsearch/txtidx.c @@ -334,7 +334,7 @@ typedef struct WORD *words; int4 lenwords; int4 curwords; -} PRSTEXT; +} PRSTEXT; /* * Parse text to lexems diff --git a/contrib/tsearch/txtidx.h b/contrib/tsearch/txtidx.h index 3344186bdd..f528cbd5e7 100644 --- a/contrib/tsearch/txtidx.h +++ b/contrib/tsearch/txtidx.h @@ -18,14 +18,14 @@ typedef struct { uint16 len; uint16 pos; -} WordEntry; +} WordEntry; typedef struct { int4 len; int4 size; char data[1]; -} txtidx; +} txtidx; #define DATAHDRSIZE (sizeof(int4)*2) #define CALCDATASIZE(x, lenstr) ( x * sizeof(WordEntry) + DATAHDRSIZE + lenstr ) @@ -41,7 +41,7 @@ typedef struct int4 len; int4 state; bool oprisdelim; -} TI_IN_STATE; +} TI_IN_STATE; int4 gettoken_txtidx(TI_IN_STATE * state); diff --git a/contrib/xml/pgxml.h b/contrib/xml/pgxml.h index 605031861d..2b80124b77 100644 --- a/contrib/xml/pgxml.h +++ b/contrib/xml/pgxml.h @@ -24,7 +24,7 @@ typedef struct char *results[MAXRESULTS]; int32 reslens[MAXRESULTS]; char *resbuf; /* pointer to the result buffer for pfree */ -} XPath_Results; +} XPath_Results; @@ -36,7 +36,7 @@ typedef struct char *resptr; int32 reslen; XPath_Results *xpres; -} pgxml_udata; +} pgxml_udata; #define UD ((pgxml_udata *) userData) diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index 0c4e698f01..38fe008e8e 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 bf7798a07d..5073a2e190 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 5ddefde8c7..f46c75fd6a 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 4fa9add7bd..9e0fb8fe13 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 e49f06b1c3..bf3e39640d 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 4b327bff45..6d584526f5 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 9843e0cb93..1e74678831 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 bb94fc27a1..5c26227748 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 e5c2f7d758..11bc02e1a9 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 123dbdd247..932eeeedbf 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 b5c25516cd..ca05a83618 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 016b9c1d98..32d9293f56 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 3cc26fa51c..94c80ca086 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 b09b9bbfff..eb707283a2 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 81e7a8f91f..c939e544a6 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 93c52e1b33..d5afd8b44f 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 37a338ff96..b8a1c92e14 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 42abe24f13..d319161b9a 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 c1f76152c5..3ca1243a7e 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 9b95ecad27..a7ccd3768f 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 99e5fac702..9b4dc95923 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 1fd625b1ad..df9091e9b4 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 83921ee014..04fdad7f07 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 3c66f1f280..7812f40097 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 8ea425a701..f3964997be 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 5f9d3cdb48..4fb707f0cf 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 d8c7a1d852..fb07e680e3 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 be5896e375..b1be078141 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 667ac835f2..2138d44558 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 dcea8907ed..782990d0d2 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 fc509c4d94..d41df4b2b5 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 faca5728e6..1b71ecbef5 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 652e7c294a..167901acdf 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 180637d099..76921d8e9a 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 7e23481627..4f637f48d1 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 859c409709..d00867d648 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 40e9700f02..104e1ab3ba 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 388ddf1d1f..140f43bd82 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 b4375d67d8..bb398a7068 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 7808705b37..f83d04e69c 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 a8fd72ff4c..a447509c22 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 88f9592aad..28b5ce53cf 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 dadf5f71b1..6691141402 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 adfe9bb06d..b647cf09f1 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 7d4c1ec7f9..1af6d3d3f5 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 b7b5d576ee..2cdde7574f 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 829904303b..b0477a255b 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 #include @@ -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 022be0f39b..6f9b3a3f31 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 a4a5d134b6..87efa317f7 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 e0955deb5c..3db2436597 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 dc28e3e9c4..4ed308321a 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 #include diff --git a/src/backend/port/dynloader/netbsd.h b/src/backend/port/dynloader/netbsd.h index aa516053a5..8310de4db2 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 d86c2c5cea..f1345d0788 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 dc28e3e9c4..4ed308321a 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 #include diff --git a/src/backend/port/dynloader/openbsd.h b/src/backend/port/dynloader/openbsd.h index c08c8b3b91..644b149b80 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 d411a895b1..88421319fd 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 c7db92d3e6..171c9e4c4d 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 cc6b4dc776..ddb6b965b9 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 f1e74afd47..6990892f3b 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 abce7465a5..191f81b42e 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 18edf7e0ba..2b350755a9 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 83f0e2c82a..c8a652f733 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 5c1b04cc69..691273fdbd 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 d0d33189b7..01ee8761c7 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 ebcfe7f19e..9022208460 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 c5af05ec6b..f28a02230e 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 85537e25e5..76c30a4360 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 5bb34f8549..52253cb084 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 #include diff --git a/src/backend/port/strtol.c b/src/backend/port/strtol.c index e6a7fb6d7b..a3153ee16a 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 #include diff --git a/src/backend/port/strtoul.c b/src/backend/port/strtoul.c index 9481ccc4a0..5cb7f7855a 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 #include diff --git a/src/backend/port/sunos4/float.h b/src/backend/port/sunos4/float.h index 2be9b70a77..cf52e40cbb 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 58e5001110..de4a5fa348 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 f7c0f3ac8f..3fa00946aa 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 1ca42ea8fa..49f67c91c7 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 cd0453c573..37570e6b11 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 0a74896e95..49ee9990be 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 6e8e0f9b8b..c947846745 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 8936685f94..d0a08d20a5 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 8ae9906101..8d06cbbffc 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 1ecda0c761..bfe2620d69 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 a172cef74f..4dbc3a5c73 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 4fbb621160..d6f959f5ac 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 35931f00a1..56a1d87b84 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 778b543e57..5030033f09 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 7c268937c3..3c90f10869 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 86c5bac6d9..ea7b40581e 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 0c13062dcb..f5bb8e3488 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 fab130cd37..7d664da3dc 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 39ec8fa542..6386b7697c 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 3fb46d73e2..29222d7285 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 -#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 9404635715..71e1203ad4 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 aed53855a4..cf7173159c 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 19d9d529c9..f61b285dab 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 $ * *------------------------------------------------------------------------- */ @@ -29,16 +29,17 @@ typedef struct y; } 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 8617470de9..a62672a5e5 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 fd6653c8fa..04ef7027d1 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 2a59c25b35..21139b89f4 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 fb575c8bb9..7d2018d747 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 270abc161e..d7c92bb91b 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 f447caa66c..1b955d5e6c 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 ebba29a01e..59b9714453 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 28d282e60d..fd4b9c3719 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 926d7875ba..a61717a860 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 7175627111..85b871078b 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 efac9a73a9..cab6291acd 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 9f1698df64..7eab8d7333 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 d9554b9575..8af7072334 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 18d2000d21..6fffd7bab8 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 4ed8c66528..62b1b106b8 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 3a890a674c..ee72286a5f 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 f1bd25036b..354436b0d6 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 f45fb63fd8..317555f0ac 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 */ diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 07f4ad8a4d..939556a572 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.36 2001/11/04 04:05:36 pjw Exp $ + * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.37 2001/11/05 17:46:30 momjian Exp $ * * Modifications - 28-Jun-2000 - pjw@rhyme.com.au * @@ -59,7 +59,7 @@ * * Modifications - 01-Nov-2001 - pjw@rhyme.com.au * - Fix handling of {data/schema}-only restores when using a full - * backup file; prior version was restoring schema in data-only + * backup file; prior version was restoring schema in data-only * restores. Added enum to make code easier to understand. * *------------------------------------------------------------------------- @@ -75,10 +75,11 @@ #include "pqexpbuffer.h" #include "libpq/libpq-fs.h" -typedef enum _teReqs_ { +typedef enum _teReqs_ +{ REQ_SCHEMA = 1, - REQ_DATA = 2, - REQ_ALL = REQ_SCHEMA + REQ_DATA + REQ_DATA = 2, + REQ_ALL = REQ_SCHEMA + REQ_DATA } teReqs; static void _SortToc(ArchiveHandle *AH, TocSortCompareFn fn); @@ -91,7 +92,7 @@ static int _printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt, static void _reconnectAsOwner(ArchiveHandle *AH, const char *dbname, TocEntry *te); static void _reconnectAsUser(ArchiveHandle *AH, const char *dbname, const char *user); -static teReqs _tocEntryRequired(TocEntry *te, RestoreOptions *ropt); +static teReqs _tocEntryRequired(TocEntry *te, RestoreOptions *ropt); static void _disableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt); static void _enableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt); static TocEntry *_getTocEntry(ArchiveHandle *AH, int id); @@ -426,7 +427,7 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt) reqs = _tocEntryRequired(te, ropt); - if ((reqs & REQ_DATA) != 0) /* We loaded the data */ + if ((reqs & REQ_DATA) != 0) /* We loaded the data */ { ahlog(AH, 1, "fixing up large object cross-reference for %s\n", te->name); FixupBlobRefs(AH, te->name); @@ -1854,7 +1855,7 @@ ReadToc(ArchiveHandle *AH) static teReqs _tocEntryRequired(TocEntry *te, RestoreOptions *ropt) { - teReqs res = 3; /* Schema = 1, Data = 2, Both = 3 */ + teReqs res = 3; /* Schema = 1, Data = 2, Both = 3 */ /* If it's an ACL, maybe ignore it */ if (ropt->aclsSkip && strcmp(te->desc, "ACL") == 0) @@ -1898,14 +1899,20 @@ _tocEntryRequired(TocEntry *te, RestoreOptions *ropt) return 0; } - /* Check if we had a dataDumper. Indicates if the entry is schema or data */ - if (!te->hadDumper) { - /* Special Case: If 'SEQUENCE SET' then it is considered a data entry */ - if (strcmp(te->desc, "SEQUENCE SET") == 0) { - res = res & REQ_DATA; - } else { + /* + * Check if we had a dataDumper. Indicates if the entry is schema or + * data + */ + if (!te->hadDumper) + { + /* + * Special Case: If 'SEQUENCE SET' then it is considered a data + * entry + */ + if (strcmp(te->desc, "SEQUENCE SET") == 0) + res = res & REQ_DATA; + else res = res & ~REQ_DATA; - } } /* Mask it if we only want schema */ diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h index 15b670ee28..cb7671ca69 100644 --- a/src/bin/pg_dump/pg_backup_archiver.h +++ b/src/bin/pg_dump/pg_backup_archiver.h @@ -17,7 +17,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.40 2001/11/04 04:05:36 pjw Exp $ + * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.41 2001/11/05 17:46:30 momjian Exp $ * * Modifications - 28-Jun-2000 - pjw@rhyme.com.au * - Initial version. @@ -68,7 +68,7 @@ typedef z_stream *z_streamp; #define K_VERS_MAJOR 1 #define K_VERS_MINOR 5 -#define K_VERS_REV 7 +#define K_VERS_REV 7 /* Data block types */ #define BLK_DATA 1 diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h index 19728a1461..3a59d5edf1 100644 --- a/src/bin/pg_dump/pg_dump.h +++ b/src/bin/pg_dump/pg_dump.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_dump.h,v 1.75 2001/10/28 06:25:58 momjian Exp $ + * $Id: pg_dump.h,v 1.76 2001/11/05 17:46:30 momjian Exp $ * * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2 * @@ -280,4 +280,4 @@ extern void dumpIndexes(Archive *fout, IndInfo *indinfo, int numIndexes, extern const char *fmtId(const char *identifier, bool force_quotes); extern void exit_nicely(void); -#endif /* PG_DUMP_H */ +#endif /* PG_DUMP_H */ diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c index 633d791614..aa8c84d289 100644 --- a/src/bin/pg_dump/pg_restore.c +++ b/src/bin/pg_dump/pg_restore.c @@ -34,7 +34,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_restore.c,v 1.28 2001/11/04 04:05:36 pjw Exp $ + * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_restore.c,v 1.29 2001/11/05 17:46:30 momjian Exp $ * * Modifications - 28-Jun-2000 - pjw@rhyme.com.au * @@ -133,7 +133,7 @@ main(int argc, char **argv) {"use-set-session-authorization", no_argument, &use_setsessauth, 1}, {NULL, 0, NULL, 0} }; -#endif /* HAVE_GETOPT_LONG */ +#endif /* HAVE_GETOPT_LONG */ #ifdef ENABLE_NLS diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 72e64a8900..2dc3d97c3c 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.62 2001/10/28 06:25:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.63 2001/11/05 17:46:30 momjian Exp $ */ #include "postgres_fe.h" #include "command.h" @@ -288,7 +288,7 @@ exec_command(const char *cmd, * directory, so if someone wants to code this here instead... */ dir = "/"; -#endif /* WIN32 */ +#endif /* WIN32 */ } if (chdir(dir) == -1) diff --git a/src/bin/psql/command.h b/src/bin/psql/command.h index 5064bf505f..b026cf4f8a 100644 --- a/src/bin/psql/command.h +++ b/src/bin/psql/command.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/command.h,v 1.12 2001/10/28 06:25:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/command.h,v 1.13 2001/11/05 17:46:30 momjian Exp $ */ #ifndef COMMAND_H #define COMMAND_H @@ -41,4 +41,4 @@ bool do_pset(const char *param, printQueryOpt *popt, bool quiet); -#endif /* COMMAND_H */ +#endif /* COMMAND_H */ diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index 0380f1f1bc..3a92f9642f 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.37 2001/10/25 05:49:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.38 2001/11/05 17:46:30 momjian Exp $ */ #include "postgres_fe.h" @@ -306,7 +306,7 @@ handle_sigint(SIGNAL_ARGS) } errno = save_errno; /* just in case the write changed it */ } -#endif /* not WIN32 */ +#endif /* not WIN32 */ /* diff --git a/src/bin/psql/common.h b/src/bin/psql/common.h index bdaa2ec98e..a148fcce0a 100644 --- a/src/bin/psql/common.h +++ b/src/bin/psql/common.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.16 2001/10/28 06:25:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.17 2001/11/05 17:46:31 momjian Exp $ */ #ifndef COMMON_H #define COMMON_H @@ -31,10 +31,10 @@ extern PGconn *cancelConn; #ifndef WIN32 extern void handle_sigint(SIGNAL_ARGS); -#endif /* not WIN32 */ +#endif /* not WIN32 */ extern PGresult *PSQLexec(const char *query); extern bool SendQuery(const char *query); -#endif /* COMMON_H */ +#endif /* COMMON_H */ diff --git a/src/bin/psql/describe.h b/src/bin/psql/describe.h index d79bf3988b..88c1b6df49 100644 --- a/src/bin/psql/describe.h +++ b/src/bin/psql/describe.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.12 2001/10/28 06:25:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.13 2001/11/05 17:46:31 momjian Exp $ */ #ifndef DESCRIBE_H #define DESCRIBE_H @@ -40,4 +40,4 @@ bool listAllDbs(bool desc); /* \dt, \di, \ds, \dS, etc. */ bool listTables(const char *infotype, const char *name, bool desc); -#endif /* DESCRIBE_H */ +#endif /* DESCRIBE_H */ diff --git a/src/bin/psql/input.h b/src/bin/psql/input.h index db8af0de13..8c6def33a3 100644 --- a/src/bin/psql/input.h +++ b/src/bin/psql/input.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.14 2001/10/28 06:25:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.15 2001/11/05 17:46:31 momjian Exp $ */ #ifndef INPUT_H #define INPUT_H @@ -40,4 +40,4 @@ char *gets_fromFile(FILE *source); void initializeInput(int flags); bool saveHistory(char *fname); -#endif /* INPUT_H */ +#endif /* INPUT_H */ diff --git a/src/bin/psql/large_obj.h b/src/bin/psql/large_obj.h index 2af4bcbf9f..c666b999a2 100644 --- a/src/bin/psql/large_obj.h +++ b/src/bin/psql/large_obj.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.h,v 1.10 2001/10/28 06:25:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.h,v 1.11 2001/11/05 17:46:31 momjian Exp $ */ #ifndef LARGE_OBJ_H #define LARGE_OBJ_H @@ -13,4 +13,4 @@ bool do_lo_import(const char *filename_arg, const char *comment_arg); bool do_lo_unlink(const char *loid_arg); bool do_lo_list(void); -#endif /* LARGE_OBJ_H */ +#endif /* LARGE_OBJ_H */ diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c index 3de66712b5..4da5bf10cc 100644 --- a/src/bin/psql/mainloop.c +++ b/src/bin/psql/mainloop.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.42 2001/10/28 06:25:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.43 2001/11/05 17:46:31 momjian Exp $ */ #include "postgres_fe.h" #include "mainloop.h" @@ -141,7 +141,7 @@ MainLoop(FILE *source) * ready */ pqsignal(SIGINT, handle_sigint); /* control-C => cancel */ -#endif /* not WIN32 */ +#endif /* not WIN32 */ if (slashCmdStatus == CMD_NEWEDIT) { diff --git a/src/bin/psql/mainloop.h b/src/bin/psql/mainloop.h index eadccc1363..6bec7b4b9f 100644 --- a/src/bin/psql/mainloop.h +++ b/src/bin/psql/mainloop.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.h,v 1.12 2001/10/28 06:25:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.h,v 1.13 2001/11/05 17:46:31 momjian Exp $ */ #ifndef MAINLOOP_H #define MAINLOOP_H @@ -18,4 +18,4 @@ extern sigjmp_buf main_loop_jmp; int MainLoop(FILE *source); -#endif /* MAINLOOP_H */ +#endif /* MAINLOOP_H */ diff --git a/src/bin/psql/mbprint.h b/src/bin/psql/mbprint.h index 7a83135806..3c5660f376 100644 --- a/src/bin/psql/mbprint.h +++ b/src/bin/psql/mbprint.h @@ -1,4 +1,4 @@ -/* $Id: mbprint.h,v 1.3 2001/10/28 06:25:58 momjian Exp $ */ +/* $Id: mbprint.h,v 1.4 2001/11/05 17:46:31 momjian Exp $ */ #ifndef MBPRINT_H #define MBPRINT_H @@ -10,8 +10,8 @@ pg_wchar utf2ucs(const unsigned char *c); unsigned char *mbvalidate(unsigned char *pwcs); -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ int pg_wcswidth(unsigned char *pwcs, int len); -#endif /* MBPRINT_H */ +#endif /* MBPRINT_H */ diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h index 6223b2721c..59c32830d2 100644 --- a/src/bin/psql/print.h +++ b/src/bin/psql/print.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/print.h,v 1.11 2001/10/28 06:25:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/print.h,v 1.12 2001/11/05 17:46:31 momjian Exp $ */ #ifndef PRINT_H #define PRINT_H @@ -75,4 +75,4 @@ typedef struct _printQueryOpt void printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout); -#endif /* PRINT_H */ +#endif /* PRINT_H */ diff --git a/src/bin/psql/prompt.h b/src/bin/psql/prompt.h index 965f4bb55e..a69310ad37 100644 --- a/src/bin/psql/prompt.h +++ b/src/bin/psql/prompt.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/prompt.h,v 1.10 2001/10/28 06:25:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/prompt.h,v 1.11 2001/11/05 17:46:31 momjian Exp $ */ #ifndef PROMPT_H #define PROMPT_H @@ -21,4 +21,4 @@ typedef enum _promptStatus char *get_prompt(promptStatus_t status); -#endif /* PROMPT_H */ +#endif /* PROMPT_H */ diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index c1d2dbc993..9e4185de3b 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.53 2001/10/28 06:25:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.54 2001/11/05 17:46:31 momjian Exp $ */ #include "postgres_fe.h" @@ -15,7 +15,7 @@ #include #include #include -#endif /* WIN32 */ +#endif /* WIN32 */ #ifdef HAVE_GETOPT_H #include @@ -364,7 +364,7 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options) }; int optindex; -#endif /* HAVE_GETOPT_LONG */ +#endif /* HAVE_GETOPT_LONG */ extern char *optarg; extern int optind; @@ -382,7 +382,7 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options) * options. */ while ((c = getopt(argc, argv, "aAc:d:eEf:F:h:Hlno:p:P:qR:sStT:uU:v:VWxX?-")) != -1) -#endif /* not HAVE_GETOPT_LONG */ +#endif /* not HAVE_GETOPT_LONG */ { switch (c) { diff --git a/src/bin/psql/stringutils.h b/src/bin/psql/stringutils.h index 1feb2e4d06..faafc606d5 100644 --- a/src/bin/psql/stringutils.h +++ b/src/bin/psql/stringutils.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/stringutils.h,v 1.16 2001/10/28 06:25:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/stringutils.h,v 1.17 2001/11/05 17:46:31 momjian Exp $ */ #ifndef STRINGUTILS_H #define STRINGUTILS_H @@ -18,4 +18,4 @@ extern char *strtokx(const char *s, unsigned int *token_pos, int encoding); -#endif /* STRINGUTILS_H */ +#endif /* STRINGUTILS_H */ diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index c7998d1d6d..e8ff0f6411 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.40 2001/10/28 06:25:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.41 2001/11/05 17:46:31 momjian Exp $ */ /*---------------------------------------------------------------------- @@ -1112,6 +1112,6 @@ dequote_file_name(char *text, char quote_char) return s; } -#endif /* 0 */ +#endif /* 0 */ -#endif /* USE_READLINE */ +#endif /* USE_READLINE */ diff --git a/src/bin/psql/variables.h b/src/bin/psql/variables.h index 8e96966f8e..a3e79b7621 100644 --- a/src/bin/psql/variables.h +++ b/src/bin/psql/variables.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/variables.h,v 1.9 2001/10/25 05:49:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/variables.h,v 1.10 2001/11/05 17:46:31 momjian Exp $ */ /* @@ -36,4 +36,4 @@ bool SetVariableBool(VariableSpace space, const char *name); bool DeleteVariable(VariableSpace space, const char *name); void DestroyVariableSpace(VariableSpace space); -#endif /* VARIABLES_H */ +#endif /* VARIABLES_H */ diff --git a/src/include/access/attnum.h b/src/include/access/attnum.h index 83173548cb..8f0e9b5471 100644 --- a/src/include/access/attnum.h +++ b/src/include/access/attnum.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: attnum.h,v 1.14 2001/10/28 06:25:59 momjian Exp $ + * $Id: attnum.h,v 1.15 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -60,4 +60,4 @@ typedef int16 AttrNumber; #define AttrOffsetGetAttrNumber(attributeOffset) \ ((AttrNumber) (1 + attributeOffset)) -#endif /* ATTNUM_H */ +#endif /* ATTNUM_H */ diff --git a/src/include/access/clog.h b/src/include/access/clog.h index 5710c97828..9fcb456cec 100644 --- a/src/include/access/clog.h +++ b/src/include/access/clog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: clog.h,v 1.4 2001/10/28 06:25:59 momjian Exp $ + * $Id: clog.h,v 1.5 2001/11/05 17:46:31 momjian Exp $ */ #ifndef CLOG_H #define CLOG_H @@ -47,4 +47,4 @@ extern void clog_redo(XLogRecPtr lsn, XLogRecord *record); extern void clog_undo(XLogRecPtr lsn, XLogRecord *record); extern void clog_desc(char *buf, uint8 xl_info, char *rec); -#endif /* CLOG_H */ +#endif /* CLOG_H */ diff --git a/src/include/access/genam.h b/src/include/access/genam.h index dbef1a6cda..db212156c8 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: genam.h,v 1.30 2001/11/02 16:30:29 tgl Exp $ + * $Id: genam.h,v 1.31 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,4 +64,4 @@ extern IndexScanDesc RelationGetIndexScan(Relation relation, bool scanFromEnd, uint16 numberOfKeys, ScanKey key); extern void IndexScanEnd(IndexScanDesc scan); -#endif /* GENAM_H */ +#endif /* GENAM_H */ diff --git a/src/include/access/gist.h b/src/include/access/gist.h index 14d45ff258..c6f9a01260 100644 --- a/src/include/access/gist.h +++ b/src/include/access/gist.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: gist.h,v 1.34 2001/10/28 06:25:59 momjian Exp $ + * $Id: gist.h,v 1.35 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -185,4 +185,4 @@ extern void gist_desc(char *buf, uint8 xl_info, char *rec); /* gistget.c */ extern Datum gistgettuple(PG_FUNCTION_ARGS); -#endif /* GIST_H */ +#endif /* GIST_H */ diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h index a96c4d5f96..f1149cb736 100644 --- a/src/include/access/gistscan.h +++ b/src/include/access/gistscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: gistscan.h,v 1.18 2001/10/28 06:25:59 momjian Exp $ + * $Id: gistscan.h,v 1.19 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,4 +24,4 @@ extern Datum gistendscan(PG_FUNCTION_ARGS); extern void gistadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum); extern void AtEOXact_gist(void); -#endif /* GISTSCAN_H */ +#endif /* GISTSCAN_H */ diff --git a/src/include/access/hash.h b/src/include/access/hash.h index 5d02855e76..835d778d90 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: hash.h,v 1.41 2001/10/28 06:25:59 momjian Exp $ + * $Id: hash.h,v 1.42 2001/11/05 17:46:31 momjian Exp $ * * NOTES * modeled after Margo Seltzer's hash implementation for unix. @@ -328,4 +328,4 @@ extern void hash_redo(XLogRecPtr lsn, XLogRecord *record); extern void hash_undo(XLogRecPtr lsn, XLogRecord *record); extern void hash_desc(char *buf, uint8 xl_info, char *rec); -#endif /* HASH_H */ +#endif /* HASH_H */ diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index b0124ed31c..9798b5f76a 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: heapam.h,v 1.71 2001/11/02 16:30:29 tgl Exp $ + * $Id: heapam.h,v 1.72 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -83,7 +83,7 @@ extern Datum nocachegetattr(HeapTuple tup, int attnum, extern Datum fastgetattr(HeapTuple tup, int attnum, TupleDesc tupleDesc, bool *isnull); -#endif /* defined(DISABLE_COMPLEX_MACRO) */ +#endif /* defined(DISABLE_COMPLEX_MACRO) */ /* ---------------- @@ -139,6 +139,7 @@ extern void relation_close(Relation relation, LOCKMODE lockmode); extern Relation heap_open(Oid relationId, LOCKMODE lockmode); extern Relation heap_openr(const char *relationName, LOCKMODE lockmode); + #define heap_close(r,l) relation_close(r,l) extern HeapScanDesc heap_beginscan(Relation relation, int atend, @@ -186,4 +187,4 @@ extern HeapTuple heap_modifytuple(HeapTuple tuple, extern void heap_freetuple(HeapTuple tuple); extern HeapTuple heap_addheader(int natts, Size structlen, void *structure); -#endif /* HEAPAM_H */ +#endif /* HEAPAM_H */ diff --git a/src/include/access/hio.h b/src/include/access/hio.h index 924b3494ea..fbf634117e 100644 --- a/src/include/access/hio.h +++ b/src/include/access/hio.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: hio.h,v 1.21 2001/10/28 06:25:59 momjian Exp $ + * $Id: hio.h,v 1.22 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,4 @@ extern void RelationPutHeapTuple(Relation relation, Buffer buffer, extern Buffer RelationGetBufferForTuple(Relation relation, Size len, Buffer otherBuffer); -#endif /* HIO_H */ +#endif /* HIO_H */ diff --git a/src/include/access/htup.h b/src/include/access/htup.h index ed3afc2e74..08506bbf8f 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: htup.h,v 1.50 2001/10/28 06:25:59 momjian Exp $ + * $Id: htup.h,v 1.51 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -276,4 +276,4 @@ typedef HeapTupleData *HeapTuple; #define HeapTupleHasExtended(tuple) \ ((((HeapTuple)(tuple))->t_data->t_infomask & HEAP_HASEXTENDED) != 0) -#endif /* HTUP_H */ +#endif /* HTUP_H */ diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h index 57b2151019..7538eab62c 100644 --- a/src/include/access/ibit.h +++ b/src/include/access/ibit.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: ibit.h,v 1.17 2001/10/28 06:25:59 momjian Exp $ + * $Id: ibit.h,v 1.18 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,4 +29,4 @@ typedef IndexAttributeBitMapData *IndexAttributeBitMap; */ #define IndexAttributeBitMapIsValid(bits) PointerIsValid(bits) -#endif /* IBIT_H */ +#endif /* IBIT_H */ diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h index 58ee91c07a..2913980395 100644 --- a/src/include/access/iqual.h +++ b/src/include/access/iqual.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: iqual.h,v 1.17 2001/10/28 06:25:59 momjian Exp $ + * $Id: iqual.h,v 1.18 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,4 @@ extern int NIndexTupleProcessed; extern bool index_keytest(IndexTuple tuple, TupleDesc tupdesc, int scanKeySize, ScanKey key); -#endif /* IQUAL_H */ +#endif /* IQUAL_H */ diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h index 7b88b2f2ac..c1000cb70b 100644 --- a/src/include/access/istrat.h +++ b/src/include/access/istrat.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: istrat.h,v 1.22 2001/10/28 06:25:59 momjian Exp $ + * $Id: istrat.h,v 1.23 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,4 +64,4 @@ extern void IndexSupportInitialize(IndexStrategy indexStrategy, StrategyNumber maxSupportNumber, AttrNumber maxAttributeNumber); -#endif /* ISTRAT_H */ +#endif /* ISTRAT_H */ diff --git a/src/include/access/itup.h b/src/include/access/itup.h index 4e7835df80..81c7a61cd2 100644 --- a/src/include/access/itup.h +++ b/src/include/access/itup.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: itup.h,v 1.32 2001/10/25 05:49:55 momjian Exp $ + * $Id: itup.h,v 1.33 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -151,4 +151,4 @@ extern RetrieveIndexResult FormRetrieveIndexResult(ItemPointer indexItemPointer, ItemPointer heapItemPointer); extern void CopyIndexTuple(IndexTuple source, IndexTuple *target); -#endif /* ITUP_H */ +#endif /* ITUP_H */ diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index 82a4cb285f..40ff15e2df 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nbtree.h,v 1.58 2001/10/28 06:25:59 momjian Exp $ + * $Id: nbtree.h,v 1.59 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -399,4 +399,4 @@ extern void _bt_spooldestroy(BTSpool *btspool); extern void _bt_spool(BTItem btitem, BTSpool *btspool); extern void _bt_leafbuild(BTSpool *btspool, BTSpool *spool2); -#endif /* NBTREE_H */ +#endif /* NBTREE_H */ diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h index 68420cd1b9..ff775eb269 100644 --- a/src/include/access/printtup.h +++ b/src/include/access/printtup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: printtup.h,v 1.17 2001/10/28 06:25:59 momjian Exp $ + * $Id: printtup.h,v 1.18 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,4 +29,4 @@ extern void spi_printtup(HeapTuple tuple, TupleDesc tupdesc, extern bool getTypeOutputInfo(Oid type, Oid *typOutput, Oid *typElem, bool *typIsVarlena); -#endif /* PRINTTUP_H */ +#endif /* PRINTTUP_H */ diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h index e79ad6cdf6..65ac772166 100644 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: relscan.h,v 1.24 2001/10/28 06:25:59 momjian Exp $ + * $Id: relscan.h,v 1.25 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -76,4 +76,4 @@ typedef IndexScanDesc *IndexScanDescPtr; */ #define IndexScanIsValid(scan) PointerIsValid(scan) -#endif /* RELSCAN_H */ +#endif /* RELSCAN_H */ diff --git a/src/include/access/rmgr.h b/src/include/access/rmgr.h index 3ea234f83e..1502ec6d63 100644 --- a/src/include/access/rmgr.h +++ b/src/include/access/rmgr.h @@ -3,7 +3,7 @@ * * Resource managers definition * - * $Id: rmgr.h,v 1.8 2001/10/28 06:25:59 momjian Exp $ + * $Id: rmgr.h,v 1.9 2001/11/05 17:46:31 momjian Exp $ */ #ifndef RMGR_H #define RMGR_H @@ -25,4 +25,4 @@ typedef uint8 RmgrId; #define RM_SEQ_ID 15 #define RM_MAX_ID RM_SEQ_ID -#endif /* RMGR_H */ +#endif /* RMGR_H */ diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h index 6e605e7016..d271f83b45 100644 --- a/src/include/access/rtree.h +++ b/src/include/access/rtree.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rtree.h,v 1.26 2001/10/28 06:25:59 momjian Exp $ + * $Id: rtree.h,v 1.27 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -135,4 +135,4 @@ extern void AtEOXact_rtree(void); extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum, RegProcedure proc); -#endif /* RTREE_H */ +#endif /* RTREE_H */ diff --git a/src/include/access/rtscan.h b/src/include/access/rtscan.h index af169d007b..004affe5ac 100644 --- a/src/include/access/rtscan.h +++ b/src/include/access/rtscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rtscan.h,v 1.12 2001/10/28 06:25:59 momjian Exp $ + * $Id: rtscan.h,v 1.13 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,4 @@ void rtadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum); -#endif /* RTSCAN_H */ +#endif /* RTSCAN_H */ diff --git a/src/include/access/sdir.h b/src/include/access/sdir.h index 05a72b5032..39b2ec2746 100644 --- a/src/include/access/sdir.h +++ b/src/include/access/sdir.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sdir.h,v 1.11 2001/10/28 06:25:59 momjian Exp $ + * $Id: sdir.h,v 1.12 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -55,4 +55,4 @@ typedef enum ScanDirection #define ScanDirectionIsForward(direction) \ ((bool) ((direction) == ForwardScanDirection)) -#endif /* SDIR_H */ +#endif /* SDIR_H */ diff --git a/src/include/access/skey.h b/src/include/access/skey.h index 8a2dc2c3fb..e42474ea6f 100644 --- a/src/include/access/skey.h +++ b/src/include/access/skey.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: skey.h,v 1.19 2001/10/28 06:25:59 momjian Exp $ + * $Id: skey.h,v 1.20 2001/11/05 17:46:31 momjian Exp $ * * Note: * Needs more accessor/assignment routines. @@ -48,4 +48,4 @@ extern void ScanKeyEntryInitializeWithInfo(ScanKey entry, bits16 flags, AttrNumber attributeNumber, FmgrInfo *finfo, MemoryContext mcxt, Datum argument); -#endif /* SKEY_H */ +#endif /* SKEY_H */ diff --git a/src/include/access/strat.h b/src/include/access/strat.h index 9470c5664f..83c231cbc4 100644 --- a/src/include/access/strat.h +++ b/src/include/access/strat.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: strat.h,v 1.24 2001/10/28 06:25:59 momjian Exp $ + * $Id: strat.h,v 1.25 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -87,4 +87,4 @@ typedef struct IndexStrategyData typedef IndexStrategyData *IndexStrategy; -#endif /* STRAT_H */ +#endif /* STRAT_H */ diff --git a/src/include/access/transam.h b/src/include/access/transam.h index 2e22b69fa7..6df60abb2d 100644 --- a/src/include/access/transam.h +++ b/src/include/access/transam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: transam.h,v 1.43 2001/10/28 06:25:59 momjian Exp $ + * $Id: transam.h,v 1.44 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -122,4 +122,4 @@ extern bool AMI_OVERRIDE; /* in varsup.c */ extern VariableCache ShmemVariableCache; -#endif /* TRAMSAM_H */ +#endif /* TRAMSAM_H */ diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index e4f9dd0d3a..9b532c9e2e 100644 --- a/src/include/access/tupdesc.h +++ b/src/include/access/tupdesc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tupdesc.h,v 1.32 2001/10/28 06:25:59 momjian Exp $ + * $Id: tupdesc.h,v 1.33 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,7 +51,7 @@ typedef struct tupleDesc Form_pg_attribute *attrs; /* attrs[N] is a pointer to the description of Attribute Number N+1. */ TupleConstr *constr; -} *TupleDesc; +} *TupleDesc; extern TupleDesc CreateTemplateTupleDesc(int natts); @@ -75,4 +75,4 @@ extern bool TupleDescInitEntry(TupleDesc desc, extern TupleDesc BuildDescForRelation(List *schema, char *relname); -#endif /* TUPDESC_H */ +#endif /* TUPDESC_H */ diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h index 0d5606390d..2772c5a628 100644 --- a/src/include/access/tupmacs.h +++ b/src/include/access/tupmacs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tupmacs.h,v 1.19 2001/10/28 06:25:59 momjian Exp $ + * $Id: tupmacs.h,v 1.20 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -90,7 +90,7 @@ : \ PointerGetDatum((char *) (T)) \ ) -#endif /* SIZEOF_DATUM == 8 */ +#endif /* SIZEOF_DATUM == 8 */ /* * att_align aligns the given offset as needed for a datum of length attlen @@ -178,6 +178,6 @@ break; \ } \ } while (0) -#endif /* SIZEOF_DATUM == 8 */ +#endif /* SIZEOF_DATUM == 8 */ #endif diff --git a/src/include/access/tuptoaster.h b/src/include/access/tuptoaster.h index 99ea8d5998..7bc55dc53a 100644 --- a/src/include/access/tuptoaster.h +++ b/src/include/access/tuptoaster.h @@ -6,7 +6,7 @@ * * Copyright (c) 2000, PostgreSQL Development Team * - * $Id: tuptoaster.h,v 1.12 2001/10/25 05:49:55 momjian Exp $ + * $Id: tuptoaster.h,v 1.13 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -115,4 +115,4 @@ extern Datum toast_compress_datum(Datum value); */ extern Size toast_raw_datum_size(Datum value); -#endif /* TUPTOASTER_H */ +#endif /* TUPTOASTER_H */ diff --git a/src/include/access/valid.h b/src/include/access/valid.h index 4b05153147..b76e5111c2 100644 --- a/src/include/access/valid.h +++ b/src/include/access/valid.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: valid.h,v 1.25 2001/10/28 06:25:59 momjian Exp $ + * $Id: valid.h,v 1.26 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -131,4 +131,4 @@ do \ } \ } while (0) -#endif /* VALID_H */ +#endif /* VALID_H */ diff --git a/src/include/access/xact.h b/src/include/access/xact.h index c6297aa01c..796a053836 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xact.h,v 1.40 2001/10/28 06:25:59 momjian Exp $ + * $Id: xact.h,v 1.41 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -135,4 +135,4 @@ extern Datum xidout(PG_FUNCTION_ARGS); extern Datum xideq(PG_FUNCTION_ARGS); extern Datum xid_age(PG_FUNCTION_ARGS); -#endif /* XACT_H */ +#endif /* XACT_H */ diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index b3f54097a9..4278f2fbb8 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xlog.h,v 1.27 2001/10/28 06:25:59 momjian Exp $ + * $Id: xlog.h,v 1.28 2001/11/05 17:46:31 momjian Exp $ */ #ifndef XLOG_H #define XLOG_H @@ -216,4 +216,4 @@ extern XLogRecPtr GetUndoRecPtr(void); extern bool check_xlog_sync_method(const char *method); extern void assign_xlog_sync_method(const char *method); -#endif /* XLOG_H */ +#endif /* XLOG_H */ diff --git a/src/include/access/xlogdefs.h b/src/include/access/xlogdefs.h index 5e14710aa7..5100da68d4 100644 --- a/src/include/access/xlogdefs.h +++ b/src/include/access/xlogdefs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xlogdefs.h,v 1.6 2001/10/28 06:25:59 momjian Exp $ + * $Id: xlogdefs.h,v 1.7 2001/11/05 17:46:31 momjian Exp $ */ #ifndef XLOG_DEFS_H #define XLOG_DEFS_H @@ -56,4 +56,4 @@ typedef struct XLogRecPtr */ typedef uint32 StartUpID; -#endif /* XLOG_DEFS_H */ +#endif /* XLOG_DEFS_H */ diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h index 63fd93e483..3093aea632 100644 --- a/src/include/bootstrap/bootstrap.h +++ b/src/include/bootstrap/bootstrap.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: bootstrap.h,v 1.25 2001/10/28 06:25:59 momjian Exp $ + * $Id: bootstrap.h,v 1.26 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,4 +63,4 @@ extern void Int_yyerror(const char *str); #define BS_XLOG_CHECKPOINT 3 #define BS_XLOG_SHUTDOWN 4 -#endif /* BOOTSTRAP_H */ +#endif /* BOOTSTRAP_H */ diff --git a/src/include/c.h b/src/include/c.h index 10385c04bf..08335bb988 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: c.h,v 1.107 2001/10/28 06:25:59 momjian Exp $ + * $Id: c.h,v 1.108 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -115,7 +115,7 @@ */ #define _priv_CppIdentity(x)x #define CppConcat(x, y) _priv_CppIdentity(x)y -#endif /* !HAVE_STRINGIZE */ +#endif /* !HAVE_STRINGIZE */ /* * dummyret is used to set return values in macros that use ?: to make @@ -162,8 +162,8 @@ typedef char bool; #ifndef false #define false ((bool) 0) #endif -#endif /* not C++ */ -#endif /* __BEOS__ */ +#endif /* not C++ */ +#endif /* __BEOS__ */ typedef bool *BoolPtr; @@ -208,7 +208,7 @@ typedef char *Pointer; typedef signed char int8; /* == 8 bits */ typedef signed short int16; /* == 16 bits */ typedef signed int int32; /* == 32 bits */ -#endif /* __BEOS__ */ +#endif /* __BEOS__ */ /* * uintN @@ -220,7 +220,7 @@ typedef signed int int32; /* == 32 bits */ typedef unsigned char uint8; /* == 8 bits */ typedef unsigned short uint16; /* == 16 bits */ typedef unsigned int uint32; /* == 32 bits */ -#endif /* __BEOS__ */ +#endif /* __BEOS__ */ /* * boolN @@ -286,7 +286,7 @@ typedef unsigned long int uint64; #define INT64_IS_BUSTED #endif #endif -#endif /* __BEOS__ */ +#endif /* __BEOS__ */ /* * Size @@ -436,7 +436,7 @@ typedef NameData *Name; */ #ifndef offsetof #define offsetof(type, field) ((long) &((type *)0)->field) -#endif /* offsetof */ +#endif /* offsetof */ /* * lengthof @@ -646,4 +646,4 @@ extern int vsnprintf(char *str, size_t count, const char *fmt, va_list args); * ---------------- */ -#endif /* C_H */ +#endif /* C_H */ diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h index 182c303911..cf4f36fe4e 100644 --- a/src/include/catalog/catalog.h +++ b/src/include/catalog/catalog.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catalog.h,v 1.19 2001/10/28 06:25:59 momjian Exp $ + * $Id: catalog.h,v 1.20 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,4 +26,4 @@ extern bool IsSharedSystemRelationName(const char *relname); extern Oid newoid(void); -#endif /* CATALOG_H */ +#endif /* CATALOG_H */ diff --git a/src/include/catalog/catname.h b/src/include/catalog/catname.h index b50e6a00b9..ecdc81aed1 100644 --- a/src/include/catalog/catname.h +++ b/src/include/catalog/catname.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catname.h,v 1.22 2001/10/28 06:25:59 momjian Exp $ + * $Id: catname.h,v 1.23 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,4 +44,4 @@ extern char *SharedSystemRelationNames[]; -#endif /* CATNAME_H */ +#endif /* CATNAME_H */ diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h index cf3c8de0ea..c68a5d4b50 100644 --- a/src/include/catalog/heap.h +++ b/src/include/catalog/heap.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: heap.h,v 1.40 2001/10/28 06:25:59 momjian Exp $ + * $Id: heap.h,v 1.41 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,4 +53,4 @@ extern Form_pg_attribute SystemAttributeDefinition(AttrNumber attno, extern Form_pg_attribute SystemAttributeByName(const char *attname, bool relhasoids); -#endif /* HEAP_H */ +#endif /* HEAP_H */ diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index 9fc4fa66fb..fb6facec0a 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: index.h,v 1.42 2001/10/28 06:25:59 momjian Exp $ + * $Id: index.h,v 1.43 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -72,4 +72,4 @@ extern bool reindex_index(Oid indexId, bool force, bool inplace); extern bool activate_indexes_of_a_table(Oid relid, bool activate); extern bool reindex_relation(Oid relid, bool force); -#endif /* INDEX_H */ +#endif /* INDEX_H */ diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h index d75364e41d..2ca7bf8286 100644 --- a/src/include/catalog/indexing.h +++ b/src/include/catalog/indexing.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: indexing.h,v 1.55 2001/10/28 06:25:59 momjian Exp $ + * $Id: indexing.h,v 1.56 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -197,4 +197,4 @@ DECLARE_UNIQUE_INDEX(pg_type_typname_index on pg_type using btree(typname name_o /* last step of initialization script: build the indices declared above */ BUILD_INDICES -#endif /* INDEXING_H */ +#endif /* INDEXING_H */ diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h index f20ac5332a..f0bf81dedc 100644 --- a/src/include/catalog/pg_aggregate.h +++ b/src/include/catalog/pg_aggregate.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_aggregate.h,v 1.34 2001/10/28 06:25:59 momjian Exp $ + * $Id: pg_aggregate.h,v 1.35 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -165,4 +165,4 @@ extern void AggregateCreate(char *aggName, extern Datum AggNameGetInitVal(char *aggName, Oid basetype, bool *isNull); -#endif /* PG_AGGREGATE_H */ +#endif /* PG_AGGREGATE_H */ diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h index 3037911124..ef21ad6f08 100644 --- a/src/include/catalog/pg_am.h +++ b/src/include/catalog/pg_am.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_am.h,v 1.20 2001/10/28 06:25:59 momjian Exp $ + * $Id: pg_am.h,v 1.21 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -108,4 +108,4 @@ DESCR("hash index access method"); DATA(insert OID = 783 ( gist PGUID 100 7 0 f t f f gistgettuple gistinsert gistbeginscan gistrescan gistendscan gistmarkpos gistrestrpos gistbuild gistbulkdelete gistcostestimate )); DESCR("GiST index access method"); -#endif /* PG_AM_H */ +#endif /* PG_AM_H */ diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h index 9b2c0709a5..d742a1a093 100644 --- a/src/include/catalog/pg_amop.h +++ b/src/include/catalog/pg_amop.h @@ -16,7 +16,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_amop.h,v 1.44 2001/10/28 06:25:59 momjian Exp $ + * $Id: pg_amop.h,v 1.45 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -426,4 +426,4 @@ DATA(insert ( 2004 1 f 1062 )); /* timestamp_ops */ DATA(insert ( 2040 1 f 2060 )); -#endif /* PG_AMOP_H */ +#endif /* PG_AMOP_H */ diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h index dda8fbc3a5..a5f809cabf 100644 --- a/src/include/catalog/pg_amproc.h +++ b/src/include/catalog/pg_amproc.h @@ -14,7 +14,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_amproc.h,v 1.33 2001/10/28 06:26:00 momjian Exp $ + * $Id: pg_amproc.h,v 1.34 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -130,4 +130,4 @@ DATA(insert ( 2001 1 1696 )); DATA(insert ( 2004 1 456 )); DATA(insert ( 2040 1 452 )); -#endif /* PG_AMPROC_H */ +#endif /* PG_AMPROC_H */ diff --git a/src/include/catalog/pg_attrdef.h b/src/include/catalog/pg_attrdef.h index 520833472a..babf4b6d61 100644 --- a/src/include/catalog/pg_attrdef.h +++ b/src/include/catalog/pg_attrdef.h @@ -52,4 +52,4 @@ typedef FormData_pg_attrdef *Form_pg_attrdef; #define Anum_pg_attrdef_adbin 3 #define Anum_pg_attrdef_adsrc 4 -#endif /* PG_ATTRDEF_H */ +#endif /* PG_ATTRDEF_H */ diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h index 7a3759f642..15280703fc 100644 --- a/src/include/catalog/pg_attribute.h +++ b/src/include/catalog/pg_attribute.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_attribute.h,v 1.78 2001/10/28 06:26:00 momjian Exp $ + * $Id: pg_attribute.h,v 1.79 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -195,7 +195,7 @@ typedef FormData_pg_attribute *Form_pg_attribute; (attribute)->atttypid = (Oid) -1; \ (attribute)->attnotnull = false; \ (attribute)->atthasdef = false; -#endif /* _DROP_COLUMN_HACK__ */ +#endif /* _DROP_COLUMN_HACK__ */ /* ---------------- * SCHEMA_ macros for declaring hardcoded tuple descriptors. @@ -486,4 +486,4 @@ DATA(insert ( 1259 tableoid 26 0 4 -7 0 -1 -1 t p f i f f)); */ DATA(insert ( 376 xactlockfoo 26 0 4 1 0 -1 -1 t p f i f f)); -#endif /* PG_ATTRIBUTE_H */ +#endif /* PG_ATTRIBUTE_H */ diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h index f5e86ec212..facd354a76 100644 --- a/src/include/catalog/pg_class.h +++ b/src/include/catalog/pg_class.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_class.h,v 1.56 2001/10/28 06:26:00 momjian Exp $ + * $Id: pg_class.h,v 1.57 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -168,4 +168,4 @@ DESCR(""); #define RELKIND_TOASTVALUE 't' /* moved off huge values */ #define RELKIND_VIEW 'v' /* view */ -#endif /* PG_CLASS_H */ +#endif /* PG_CLASS_H */ diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h index a0646f7b2e..2bc01d6b17 100644 --- a/src/include/catalog/pg_control.h +++ b/src/include/catalog/pg_control.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_control.h,v 1.5 2001/10/28 06:26:00 momjian Exp $ + * $Id: pg_control.h,v 1.6 2001/11/05 17:46:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -111,4 +111,4 @@ typedef struct ControlFileData char lc_ctype[LOCALE_NAME_BUFLEN]; } ControlFileData; -#endif /* PG_CONTROL_H */ +#endif /* PG_CONTROL_H */ diff --git a/src/include/catalog/pg_database.h b/src/include/catalog/pg_database.h index 1efad4ee0f..34df08595e 100644 --- a/src/include/catalog/pg_database.h +++ b/src/include/catalog/pg_database.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_database.h,v 1.20 2001/10/28 06:26:00 momjian Exp $ + * $Id: pg_database.h,v 1.21 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -79,4 +79,4 @@ DATAMARKOID(= 2) #undef DATAMARKOID -#endif /* PG_DATABASE_H */ +#endif /* PG_DATABASE_H */ diff --git a/src/include/catalog/pg_description.h b/src/include/catalog/pg_description.h index d6c49357f3..9aa0127abf 100644 --- a/src/include/catalog/pg_description.h +++ b/src/include/catalog/pg_description.h @@ -22,7 +22,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_description.h,v 1.15 2001/10/28 06:26:00 momjian Exp $ + * $Id: pg_description.h,v 1.16 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -84,4 +84,4 @@ typedef FormData_pg_description *Form_pg_description; * by genbki.sh and loaded during initdb. */ -#endif /* PG_DESCRIPTION_H */ +#endif /* PG_DESCRIPTION_H */ diff --git a/src/include/catalog/pg_group.h b/src/include/catalog/pg_group.h index f66cecc5cc..e64cb3f396 100644 --- a/src/include/catalog/pg_group.h +++ b/src/include/catalog/pg_group.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_group.h,v 1.12 2001/10/28 06:26:00 momjian Exp $ + * $Id: pg_group.h,v 1.13 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -41,4 +41,4 @@ typedef FormData_pg_group *Form_pg_group; #define Anum_pg_group_grosysid 2 #define Anum_pg_group_grolist 3 -#endif /* PG_GROUP_H */ +#endif /* PG_GROUP_H */ diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h index 0dc7c0c0d2..8b0c9dc979 100644 --- a/src/include/catalog/pg_index.h +++ b/src/include/catalog/pg_index.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_index.h,v 1.26 2001/10/28 06:26:00 momjian Exp $ + * $Id: pg_index.h,v 1.27 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -72,4 +72,4 @@ typedef FormData_pg_index *Form_pg_index; #define Anum_pg_index_indreference 9 #define Anum_pg_index_indpred 10 -#endif /* PG_INDEX_H */ +#endif /* PG_INDEX_H */ diff --git a/src/include/catalog/pg_inherits.h b/src/include/catalog/pg_inherits.h index 6e6b3912ce..eb105698f2 100644 --- a/src/include/catalog/pg_inherits.h +++ b/src/include/catalog/pg_inherits.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_inherits.h,v 1.12 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_inherits.h,v 1.13 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -54,4 +54,4 @@ typedef FormData_pg_inherits *Form_pg_inherits; #define Anum_pg_inherits_inhparent 2 #define Anum_pg_inherits_inhseqno 3 -#endif /* PG_INHERITS_H */ +#endif /* PG_INHERITS_H */ diff --git a/src/include/catalog/pg_language.h b/src/include/catalog/pg_language.h index 20823c3bfb..9099a9431b 100644 --- a/src/include/catalog/pg_language.h +++ b/src/include/catalog/pg_language.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_language.h,v 1.14 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_language.h,v 1.15 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -73,4 +73,4 @@ DATA(insert OID = 14 ( "sql" f f 0 "postgres")); DESCR("SQL-language functions"); #define SQLlanguageId 14 -#endif /* PG_LANGUAGE_H */ +#endif /* PG_LANGUAGE_H */ diff --git a/src/include/catalog/pg_largeobject.h b/src/include/catalog/pg_largeobject.h index 54a3c4eca2..06dfab99a4 100644 --- a/src/include/catalog/pg_largeobject.h +++ b/src/include/catalog/pg_largeobject.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_largeobject.h,v 1.11 2001/10/28 06:26:00 momjian Exp $ + * $Id: pg_largeobject.h,v 1.12 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -59,4 +59,4 @@ extern void LargeObjectCreate(Oid loid); extern void LargeObjectDrop(Oid loid); extern bool LargeObjectExists(Oid loid); -#endif /* PG_LARGEOBJECT_H */ +#endif /* PG_LARGEOBJECT_H */ diff --git a/src/include/catalog/pg_listener.h b/src/include/catalog/pg_listener.h index 1c8f86f0f3..a2f24a13f3 100644 --- a/src/include/catalog/pg_listener.h +++ b/src/include/catalog/pg_listener.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_listener.h,v 1.11 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_listener.h,v 1.12 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -60,4 +60,4 @@ typedef FormData_pg_listener *Form_pg_listener; * ---------------- */ -#endif /* PG_LISTENER_H */ +#endif /* PG_LISTENER_H */ diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h index 7832b92425..2e25e366c6 100644 --- a/src/include/catalog/pg_opclass.h +++ b/src/include/catalog/pg_opclass.h @@ -26,7 +26,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_opclass.h,v 1.42 2001/10/28 06:26:00 momjian Exp $ + * $Id: pg_opclass.h,v 1.43 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -137,4 +137,4 @@ DATA(insert OID = 2004 ( 405 varchar_ops 1043 t 0 )); DATA(insert OID = 2039 ( 403 timestamp_ops 1114 t 0 )); DATA(insert OID = 2040 ( 405 timestamp_ops 1114 t 0 )); -#endif /* PG_OPCLASS_H */ +#endif /* PG_OPCLASS_H */ diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h index 45ed8f0ae0..bff7c6691b 100644 --- a/src/include/catalog/pg_operator.h +++ b/src/include/catalog/pg_operator.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_operator.h,v 1.98 2001/10/28 06:26:00 momjian Exp $ + * $Id: pg_operator.h,v 1.99 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -857,4 +857,4 @@ extern void OperatorCreate(char *operatorName, char *leftSortName, char *rightSortName); -#endif /* PG_OPERATOR_H */ +#endif /* PG_OPERATOR_H */ diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 8250437353..d504c574f8 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_proc.h,v 1.220 2001/10/28 06:26:04 momjian Exp $ + * $Id: pg_proc.h,v 1.221 2001/11/05 17:46:32 momjian Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -2889,4 +2889,4 @@ extern Oid ProcedureCreate(char *procedureName, int32 outin_ratio, List *argList); -#endif /* PG_PROC_H */ +#endif /* PG_PROC_H */ diff --git a/src/include/catalog/pg_relcheck.h b/src/include/catalog/pg_relcheck.h index 86268f578e..b9a7cf166c 100644 --- a/src/include/catalog/pg_relcheck.h +++ b/src/include/catalog/pg_relcheck.h @@ -52,4 +52,4 @@ typedef FormData_pg_relcheck *Form_pg_relcheck; #define Anum_pg_relcheck_rcbin 3 #define Anum_pg_relcheck_rcsrc 4 -#endif /* PG_RELCHECK_H */ +#endif /* PG_RELCHECK_H */ diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h index 7fac72b00f..46b73bc083 100644 --- a/src/include/catalog/pg_rewrite.h +++ b/src/include/catalog/pg_rewrite.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_rewrite.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ + * $Id: pg_rewrite.h,v 1.17 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -64,4 +64,4 @@ typedef FormData_pg_rewrite *Form_pg_rewrite; #define Anum_pg_rewrite_ev_qual 6 #define Anum_pg_rewrite_ev_action 7 -#endif /* PG_REWRITE_H */ +#endif /* PG_REWRITE_H */ diff --git a/src/include/catalog/pg_shadow.h b/src/include/catalog/pg_shadow.h index a0a95d8c3b..00ccaeb85f 100644 --- a/src/include/catalog/pg_shadow.h +++ b/src/include/catalog/pg_shadow.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_shadow.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ + * $Id: pg_shadow.h,v 1.17 2001/11/05 17:46:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -73,4 +73,4 @@ DATA(insert ( "POSTGRES" PGUID t t t t _null_ _null_ )); #define BOOTSTRAP_USESYSID 1 -#endif /* PG_SHADOW_H */ +#endif /* PG_SHADOW_H */ diff --git a/src/include/catalog/pg_statistic.h b/src/include/catalog/pg_statistic.h index 25e56bbdbc..bfe2d8c14a 100644 --- a/src/include/catalog/pg_statistic.h +++ b/src/include/catalog/pg_statistic.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_statistic.h,v 1.14 2001/10/28 06:26:06 momjian Exp $ + * $Id: pg_statistic.h,v 1.15 2001/11/05 17:46:33 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -206,4 +206,4 @@ typedef FormData_pg_statistic *Form_pg_statistic; */ #define STATISTIC_KIND_CORRELATION 3 -#endif /* PG_STATISTIC_H */ +#endif /* PG_STATISTIC_H */ diff --git a/src/include/catalog/pg_trigger.h b/src/include/catalog/pg_trigger.h index 220c32f119..941069fac0 100644 --- a/src/include/catalog/pg_trigger.h +++ b/src/include/catalog/pg_trigger.h @@ -93,4 +93,4 @@ typedef FormData_pg_trigger *Form_pg_trigger; #define TRIGGER_FOR_DELETE(type) (type & TRIGGER_TYPE_DELETE) #define TRIGGER_FOR_UPDATE(type) (type & TRIGGER_TYPE_UPDATE) -#endif /* PG_TRIGGER_H */ +#endif /* PG_TRIGGER_H */ diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index b97eb914ee..83b7d1bcc4 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_type.h,v 1.113 2001/10/25 05:49:58 momjian Exp $ + * $Id: pg_type.h,v 1.114 2001/11/05 17:46:33 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -466,4 +466,4 @@ extern Oid TypeCreate(char *typeName, extern void TypeRename(const char *oldTypeName, const char *newTypeName); extern char *makeArrayTypeName(char *typeName); -#endif /* PG_TYPE_H */ +#endif /* PG_TYPE_H */ diff --git a/src/include/catalog/pg_version.h b/src/include/catalog/pg_version.h index 7c523bfe00..bbbce601de 100644 --- a/src/include/catalog/pg_version.h +++ b/src/include/catalog/pg_version.h @@ -15,7 +15,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_version.h,v 1.13 2001/10/25 05:49:58 momjian Exp $ + * $Id: pg_version.h,v 1.14 2001/11/05 17:46:33 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -61,4 +61,4 @@ typedef FormData_pg_version *Form_pg_version; #define Anum_pg_version_verbaseid 2 #define Anum_pg_version_vertime 3 -#endif /* PG_VERSION_H */ +#endif /* PG_VERSION_H */ diff --git a/src/include/commands/async.h b/src/include/commands/async.h index 3b9fc3c75f..09ac32544f 100644 --- a/src/include/commands/async.h +++ b/src/include/commands/async.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: async.h,v 1.19 2001/10/28 06:26:06 momjian Exp $ + * $Id: async.h,v 1.20 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,4 +36,4 @@ extern void Async_NotifyHandler(SIGNAL_ARGS); extern void EnableNotifyInterrupt(void); extern void DisableNotifyInterrupt(void); -#endif /* ASYNC_H */ +#endif /* ASYNC_H */ diff --git a/src/include/commands/cluster.h b/src/include/commands/cluster.h index e832b880d7..d076007084 100644 --- a/src/include/commands/cluster.h +++ b/src/include/commands/cluster.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $Id: cluster.h,v 1.11 2001/10/28 06:26:06 momjian Exp $ + * $Id: cluster.h,v 1.12 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,4 +25,4 @@ */ extern void cluster(char *oldrelname, char *oldindexname); -#endif /* CLUSTER_H */ +#endif /* CLUSTER_H */ diff --git a/src/include/commands/command.h b/src/include/commands/command.h index ef9aa86ee9..4531b90d7c 100644 --- a/src/include/commands/command.h +++ b/src/include/commands/command.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: command.h,v 1.30 2001/10/28 06:26:06 momjian Exp $ + * $Id: command.h,v 1.31 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -72,4 +72,4 @@ extern void AlterTableOwner(const char *relationName, const char *newOwnerName); */ extern void LockTableCommand(LockStmt *lockstmt); -#endif /* COMMAND_H */ +#endif /* COMMAND_H */ diff --git a/src/include/commands/comment.h b/src/include/commands/comment.h index 371f918b6e..4d83372bdd 100644 --- a/src/include/commands/comment.h +++ b/src/include/commands/comment.h @@ -32,4 +32,4 @@ extern void DeleteComments(Oid oid, Oid classoid); extern void CreateComments(Oid oid, Oid classoid, int32 subid, char *comment); -#endif /* COMMENT_H */ +#endif /* COMMENT_H */ diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h index 19aced3e6a..555c5c4d5c 100644 --- a/src/include/commands/copy.h +++ b/src/include/commands/copy.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: copy.h,v 1.15 2001/10/28 06:26:06 momjian Exp $ + * $Id: copy.h,v 1.16 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,4 +19,4 @@ extern int copy_lineno; void DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe, char *filename, char *delim, char *null_print); -#endif /* COPY_H */ +#endif /* COPY_H */ diff --git a/src/include/commands/creatinh.h b/src/include/commands/creatinh.h index 2b4cf73101..e676fc2593 100644 --- a/src/include/commands/creatinh.h +++ b/src/include/commands/creatinh.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: creatinh.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ + * $Id: creatinh.h,v 1.17 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,4 @@ extern void DefineRelation(CreateStmt *stmt, char relkind); extern void RemoveRelation(char *name); extern void TruncateRelation(char *name); -#endif /* CREATINH_H */ +#endif /* CREATINH_H */ diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h index bb8f2828c9..23c68d3c35 100644 --- a/src/include/commands/dbcommands.h +++ b/src/include/commands/dbcommands.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dbcommands.h,v 1.18 2001/10/28 06:26:06 momjian Exp $ + * $Id: dbcommands.h,v 1.19 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,4 +18,4 @@ extern void createdb(const char *dbname, const char *dbpath, const char *dbtemplate, int encoding); extern void dropdb(const char *dbname); -#endif /* DBCOMMANDS_H */ +#endif /* DBCOMMANDS_H */ diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h index 9b83f2f025..a69da106b4 100644 --- a/src/include/commands/defrem.h +++ b/src/include/commands/defrem.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: defrem.h,v 1.27 2001/10/28 06:26:06 momjian Exp $ + * $Id: defrem.h,v 1.28 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -49,4 +49,4 @@ extern void RemoveOperator(char *operatorName, extern void RemoveType(char *typeName); extern void RemoveAggregate(char *aggName, char *aggType); -#endif /* DEFREM_H */ +#endif /* DEFREM_H */ diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h index f52b75641e..c1686f64cc 100644 --- a/src/include/commands/explain.h +++ b/src/include/commands/explain.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $Id: explain.h,v 1.14 2001/10/28 06:26:06 momjian Exp $ + * $Id: explain.h,v 1.15 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,4 +18,4 @@ extern void ExplainQuery(Query *query, bool verbose, bool analyze, CommandDest dest); -#endif /* EXPLAIN_H */ +#endif /* EXPLAIN_H */ diff --git a/src/include/commands/proclang.h b/src/include/commands/proclang.h index 42276055e6..25cf7ab5ef 100644 --- a/src/include/commands/proclang.h +++ b/src/include/commands/proclang.h @@ -14,4 +14,4 @@ extern void CreateProceduralLanguage(CreatePLangStmt *stmt); extern void DropProceduralLanguage(DropPLangStmt *stmt); -#endif /* PROCLANG_H */ +#endif /* PROCLANG_H */ diff --git a/src/include/commands/rename.h b/src/include/commands/rename.h index 6717c47453..76b5167a83 100644 --- a/src/include/commands/rename.h +++ b/src/include/commands/rename.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rename.h,v 1.12 2001/10/28 06:26:06 momjian Exp $ + * $Id: rename.h,v 1.13 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern void renameatt(char *relname, extern void renamerel(const char *oldrelname, const char *newrelname); -#endif /* RENAME_H */ +#endif /* RENAME_H */ diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h index 4b7a73b377..48c0673cdf 100644 --- a/src/include/commands/sequence.h +++ b/src/include/commands/sequence.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sequence.h,v 1.18 2001/10/28 06:26:06 momjian Exp $ + * $Id: sequence.h,v 1.19 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -90,4 +90,4 @@ extern void seq_redo(XLogRecPtr lsn, XLogRecord *rptr); extern void seq_undo(XLogRecPtr lsn, XLogRecord *rptr); extern void seq_desc(char *buf, uint8 xl_info, char *rec); -#endif /* SEQUENCE_H */ +#endif /* SEQUENCE_H */ diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h index c24fff9d2f..c0399cbf10 100644 --- a/src/include/commands/trigger.h +++ b/src/include/commands/trigger.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: trigger.h,v 1.29 2001/10/28 06:26:06 momjian Exp $ + * $Id: trigger.h,v 1.30 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -161,4 +161,4 @@ extern void DeferredTriggerSetState(ConstraintsSetStmt *stmt); */ extern bool RI_FKey_keyequal_upd(TriggerData *trigdata); -#endif /* TRIGGER_H */ +#endif /* TRIGGER_H */ diff --git a/src/include/commands/user.h b/src/include/commands/user.h index 03e8fc6e26..3a56547a3f 100644 --- a/src/include/commands/user.h +++ b/src/include/commands/user.h @@ -3,7 +3,7 @@ * user.h * * - * $Id: user.h,v 1.15 2001/10/28 06:26:06 momjian Exp $ + * $Id: user.h,v 1.16 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern void DropGroup(DropGroupStmt *stmt); extern Datum update_pg_pwd(PG_FUNCTION_ARGS); -#endif /* USER_H */ +#endif /* USER_H */ diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h index b575f79e99..2317fc58b8 100644 --- a/src/include/commands/vacuum.h +++ b/src/include/commands/vacuum.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: vacuum.h,v 1.42 2001/10/28 06:26:06 momjian Exp $ + * $Id: vacuum.h,v 1.43 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,4 +57,4 @@ extern void lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt); /* in commands/analyze.c */ extern void analyze_rel(Oid relid, VacuumStmt *vacstmt); -#endif /* VACUUM_H */ +#endif /* VACUUM_H */ diff --git a/src/include/commands/variable.h b/src/include/commands/variable.h index 6ab15a43a3..f4f12c9712 100644 --- a/src/include/commands/variable.h +++ b/src/include/commands/variable.h @@ -2,7 +2,7 @@ * Headers for handling of 'SET var TO', 'SHOW var' and 'RESET var' * statements * - * $Id: variable.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ + * $Id: variable.h,v 1.17 2001/11/05 17:46:33 momjian Exp $ * */ #ifndef VARIABLE_H @@ -15,4 +15,4 @@ extern void ResetPGVariable(const char *name); extern void set_default_datestyle(void); extern void set_default_client_encoding(void); -#endif /* VARIABLE_H */ +#endif /* VARIABLE_H */ diff --git a/src/include/commands/version.h b/src/include/commands/version.h index dedd5cfa45..09cda946d3 100644 --- a/src/include/commands/version.h +++ b/src/include/commands/version.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: version.h,v 1.11 2001/10/28 06:26:06 momjian Exp $ + * $Id: version.h,v 1.12 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef VERSION_H #define VERSION_H -#endif /* VERSION_H */ +#endif /* VERSION_H */ diff --git a/src/include/commands/view.h b/src/include/commands/view.h index 74c21b80e5..de6fdcee97 100644 --- a/src/include/commands/view.h +++ b/src/include/commands/view.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: view.h,v 1.12 2001/10/28 06:26:06 momjian Exp $ + * $Id: view.h,v 1.13 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,4 +19,4 @@ extern void DefineView(char *view_name, Query *view_parse); extern void RemoveView(char *view_name); -#endif /* VIEW_H */ +#endif /* VIEW_H */ diff --git a/src/include/executor/execFlatten.h b/src/include/executor/execFlatten.h index 0028beadb0..1795ed1c48 100644 --- a/src/include/executor/execFlatten.h +++ b/src/include/executor/execFlatten.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: execFlatten.h,v 1.15 2001/10/25 05:49:59 momjian Exp $ + * $Id: execFlatten.h,v 1.16 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,4 +24,4 @@ extern Datum ExecEvalIter(Iter *iterNode, ExprContext *econtext, extern void ExecEvalFjoin(TargetEntry *tlist, ExprContext *econtext, bool *isNullVect, ExprDoneCond *fj_isDone); -#endif /* EXECFLATTEN_H */ +#endif /* EXECFLATTEN_H */ diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h index 45e4f76b35..4e5fcc8a20 100644 --- a/src/include/executor/execdebug.h +++ b/src/include/executor/execdebug.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execdebug.h,v 1.18 2001/10/28 06:26:06 momjian Exp $ + * $Id: execdebug.h,v 1.19 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -137,7 +137,7 @@ extern int NIndexTupleInserted; #define IncrProcessed() (void)(0) #define IncrIndexProcessed() (void)(0) #define IncrIndexInserted() (void)(0) -#endif /* EXEC_TUPLECOUNT */ +#endif /* EXEC_TUPLECOUNT */ /* ---------------- * memory context debugging defines @@ -149,7 +149,7 @@ extern int NIndexTupleInserted; #else #define CXT_printf(s) #define CXT1_printf(s, a) -#endif /* EXEC_CONTEXTDEBUG */ +#endif /* EXEC_CONTEXTDEBUG */ /* ---------------- * eutils debugging defines @@ -169,7 +169,7 @@ extern int NIndexTupleInserted; #define EU2_printf(s, a, b) #define EU3_printf(s, a, b, c) #define EU4_printf(s, a, b, c, d) -#endif /* EXEC_UTILSDEBUG */ +#endif /* EXEC_UTILSDEBUG */ /* ---------------- @@ -188,7 +188,7 @@ extern int NIndexTupleInserted; #define NL1_printf(s, a) #define NL4_printf(s, a, b, c, d) #define ENL1_printf(message) -#endif /* EXEC_NESTLOOPDEBUG */ +#endif /* EXEC_NESTLOOPDEBUG */ /* ---------------- * proc node debugging defines @@ -200,7 +200,7 @@ extern int NIndexTupleInserted; #else #define PN_printf(s) #define PN1_printf(s, p) -#endif /* EXEC_PROCDEBUG */ +#endif /* EXEC_PROCDEBUG */ /* ---------------- * exec eval / target list debugging defines @@ -216,7 +216,7 @@ extern int NIndexTupleInserted; #define EV_printf(s) #define EV1_printf(s, a) #define EV5_printf(s, a, b, c, d, e) -#endif /* EXEC_EVALDEBUG */ +#endif /* EXEC_EVALDEBUG */ /* ---------------- * scan debugging defines @@ -230,7 +230,7 @@ extern int NIndexTupleInserted; #define S_nodeDisplay(l) #define S_printf(s) #define S1_printf(s, p) -#endif /* EXEC_SCANDEBUG */ +#endif /* EXEC_SCANDEBUG */ /* ---------------- * sort node debugging defines @@ -244,7 +244,7 @@ extern int NIndexTupleInserted; #define SO_nodeDisplay(l) #define SO_printf(s) #define SO1_printf(s, p) -#endif /* EXEC_SORTDEBUG */ +#endif /* EXEC_SORTDEBUG */ /* ---------------- * merge join debugging defines @@ -281,7 +281,7 @@ extern int NIndexTupleInserted; #define MJ_DEBUG_QUAL(clause, res) #define MJ_DEBUG_MERGE_COMPARE(qual, res) #define MJ_DEBUG_PROC_NODE(slot) -#endif /* EXEC_MERGEJOINDEBUG */ +#endif /* EXEC_MERGEJOINDEBUG */ /* ---------------------------------------------------------------- * DO NOT DEFINE THESE EVER OR YOU WILL BURN! @@ -298,4 +298,4 @@ extern int NIndexTupleInserted; extern long NDirectFileRead; extern long NDirectFileWrite; -#endif /* ExecDebugIncluded */ +#endif /* ExecDebugIncluded */ diff --git a/src/include/executor/execdefs.h b/src/include/executor/execdefs.h index 0a5fb38f18..b6e7195771 100644 --- a/src/include/executor/execdefs.h +++ b/src/include/executor/execdefs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execdefs.h,v 1.10 2001/10/28 06:26:06 momjian Exp $ + * $Id: execdefs.h,v 1.11 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,4 +51,4 @@ #define EXEC_MJ_ENDOUTER 14 #define EXEC_MJ_ENDINNER 15 -#endif /* EXECDEFS_H */ +#endif /* EXECDEFS_H */ diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h index 297de04846..55bf52ed38 100644 --- a/src/include/executor/execdesc.h +++ b/src/include/executor/execdesc.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execdesc.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ + * $Id: execdesc.h,v 1.17 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,4 +37,4 @@ typedef struct QueryDesc extern QueryDesc *CreateQueryDesc(Query *parsetree, Plan *plantree, CommandDest dest); -#endif /* EXECDESC_H */ +#endif /* EXECDESC_H */ diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index c47fec77ae..4e4e07a2c7 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: executor.h,v 1.60 2001/10/28 06:26:06 momjian Exp $ + * $Id: executor.h,v 1.61 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -178,4 +178,4 @@ extern void ExecCloseIndices(ResultRelInfo *resultRelInfo); extern void ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid, EState *estate, bool is_update); -#endif /* EXECUTOR_H */ +#endif /* EXECUTOR_H */ diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h index f436f06e38..99246f1fab 100644 --- a/src/include/executor/functions.h +++ b/src/include/executor/functions.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: functions.h,v 1.17 2001/10/28 06:26:06 momjian Exp $ + * $Id: functions.h,v 1.18 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,4 +18,4 @@ extern Datum fmgr_sql(PG_FUNCTION_ARGS); -#endif /* FUNCTIONS_H */ +#endif /* FUNCTIONS_H */ diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h index d573a5ef47..61948cab05 100644 --- a/src/include/executor/hashjoin.h +++ b/src/include/executor/hashjoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: hashjoin.h,v 1.24 2001/10/28 06:26:06 momjian Exp $ + * $Id: hashjoin.h,v 1.25 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -93,4 +93,4 @@ typedef struct HashTableData typedef HashTableData *HashJoinTable; -#endif /* HASHJOIN_H */ +#endif /* HASHJOIN_H */ diff --git a/src/include/executor/instrument.h b/src/include/executor/instrument.h index dbbc03fa8b..9079c63ad4 100644 --- a/src/include/executor/instrument.h +++ b/src/include/executor/instrument.h @@ -6,7 +6,7 @@ * * Copyright (c) 2001, PostgreSQL Global Development Group * - * $Id: instrument.h,v 1.3 2001/10/28 06:26:06 momjian Exp $ + * $Id: instrument.h,v 1.4 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,4 +36,4 @@ extern void InstrStartNode(Instrumentation *instr); extern void InstrStopNode(Instrumentation *instr, bool returnedTuple); extern void InstrEndLoop(Instrumentation *instr); -#endif /* INSTRUMENT_H */ +#endif /* INSTRUMENT_H */ diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h index e016005f8e..894edfb0c7 100644 --- a/src/include/executor/nodeAgg.h +++ b/src/include/executor/nodeAgg.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeAgg.h,v 1.14 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeAgg.h,v 1.15 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern int ExecCountSlotsAgg(Agg *node); extern void ExecEndAgg(Agg *node); extern void ExecReScanAgg(Agg *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODEAGG_H */ +#endif /* NODEAGG_H */ diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h index 60f0f0a0a8..9a6a0f866b 100644 --- a/src/include/executor/nodeAppend.h +++ b/src/include/executor/nodeAppend.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeAppend.h,v 1.15 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeAppend.h,v 1.16 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern TupleTableSlot *ExecProcAppend(Append *node); extern void ExecEndAppend(Append *node); extern void ExecReScanAppend(Append *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODEAPPEND_H */ +#endif /* NODEAPPEND_H */ diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h index 5ec7de171d..ea51503531 100644 --- a/src/include/executor/nodeGroup.h +++ b/src/include/executor/nodeGroup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeGroup.h,v 1.20 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeGroup.h,v 1.21 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,4 +33,4 @@ extern FmgrInfo *execTuplesMatchPrepare(TupleDesc tupdesc, int numCols, AttrNumber *matchColIdx); -#endif /* NODEGROUP_H */ +#endif /* NODEGROUP_H */ diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index 18d316fd16..d3f3266860 100644 --- a/src/include/executor/nodeHash.h +++ b/src/include/executor/nodeHash.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHash.h,v 1.22 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeHash.h,v 1.23 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,4 +37,4 @@ extern void ExecChooseHashTableSize(double ntuples, int tupwidth, int *physicalbuckets, int *numbatches); -#endif /* NODEHASH_H */ +#endif /* NODEHASH_H */ diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h index 4ebfea0811..a9c4832884 100644 --- a/src/include/executor/nodeHashjoin.h +++ b/src/include/executor/nodeHashjoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHashjoin.h,v 1.21 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeHashjoin.h,v 1.22 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ extern void ExecEndHashJoin(HashJoin *node); extern void ExecHashJoinSaveTuple(HeapTuple heapTuple, BufFile *file); extern void ExecReScanHashJoin(HashJoin *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODEHASHJOIN_H */ +#endif /* NODEHASHJOIN_H */ diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h index 656e1f2ff3..1f4fa151a8 100644 --- a/src/include/executor/nodeIndexscan.h +++ b/src/include/executor/nodeIndexscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeIndexscan.h,v 1.13 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeIndexscan.h,v 1.14 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,4 +26,4 @@ extern bool ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent); extern int ExecCountSlotsIndexScan(IndexScan *node); extern void ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODEINDEXSCAN_H */ +#endif /* NODEINDEXSCAN_H */ diff --git a/src/include/executor/nodeLimit.h b/src/include/executor/nodeLimit.h index ab9224e1a3..49b8a43430 100644 --- a/src/include/executor/nodeLimit.h +++ b/src/include/executor/nodeLimit.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeLimit.h,v 1.4 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeLimit.h,v 1.5 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern int ExecCountSlotsLimit(Limit *node); extern void ExecEndLimit(Limit *node); extern void ExecReScanLimit(Limit *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODELIMIT_H */ +#endif /* NODELIMIT_H */ diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h index 9392d536c9..8ecdabb108 100644 --- a/src/include/executor/nodeMaterial.h +++ b/src/include/executor/nodeMaterial.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMaterial.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeMaterial.h,v 1.17 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,4 +24,4 @@ extern void ExecMaterialMarkPos(Material *node); extern void ExecMaterialRestrPos(Material *node); extern void ExecMaterialReScan(Material *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODEMATERIAL_H */ +#endif /* NODEMATERIAL_H */ diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h index 49ad0804a0..2d1853a48a 100644 --- a/src/include/executor/nodeMergejoin.h +++ b/src/include/executor/nodeMergejoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMergejoin.h,v 1.15 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeMergejoin.h,v 1.16 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern int ExecCountSlotsMergeJoin(MergeJoin *node); extern void ExecEndMergeJoin(MergeJoin *node); extern void ExecReScanMergeJoin(MergeJoin *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODEMERGEJOIN_H; */ +#endif /* NODEMERGEJOIN_H; */ diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h index 9d72a115fa..ce30b028a8 100644 --- a/src/include/executor/nodeNestloop.h +++ b/src/include/executor/nodeNestloop.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeNestloop.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeNestloop.h,v 1.17 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ extern void ExecEndNestLoop(NestLoop *node); extern void ExecReScanNestLoop(NestLoop *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODENESTLOOP_H */ +#endif /* NODENESTLOOP_H */ diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h index ba33e94a30..883b5fd2ff 100644 --- a/src/include/executor/nodeResult.h +++ b/src/include/executor/nodeResult.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeResult.h,v 1.13 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeResult.h,v 1.14 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern int ExecCountSlotsResult(Result *node); extern void ExecEndResult(Result *node); extern void ExecReScanResult(Result *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODERESULT_H */ +#endif /* NODERESULT_H */ diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h index 4994de6a23..08326670bd 100644 --- a/src/include/executor/nodeSeqscan.h +++ b/src/include/executor/nodeSeqscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSeqscan.h,v 1.13 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeSeqscan.h,v 1.14 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,4 +24,4 @@ extern void ExecSeqReScan(SeqScan *node, ExprContext *exprCtxt, Plan *parent); extern void ExecSeqMarkPos(SeqScan *node); extern void ExecSeqRestrPos(SeqScan *node); -#endif /* NODESEQSCAN_H */ +#endif /* NODESEQSCAN_H */ diff --git a/src/include/executor/nodeSetOp.h b/src/include/executor/nodeSetOp.h index 0deb0cecc3..e2dffc10c3 100644 --- a/src/include/executor/nodeSetOp.h +++ b/src/include/executor/nodeSetOp.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSetOp.h,v 1.4 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeSetOp.h,v 1.5 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern int ExecCountSlotsSetOp(SetOp *node); extern void ExecEndSetOp(SetOp *node); extern void ExecReScanSetOp(SetOp *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODESETOP_H */ +#endif /* NODESETOP_H */ diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h index b1a76d69ab..7349a8e8fb 100644 --- a/src/include/executor/nodeSort.h +++ b/src/include/executor/nodeSort.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSort.h,v 1.13 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeSort.h,v 1.14 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,4 +24,4 @@ extern void ExecSortMarkPos(Sort *node); extern void ExecSortRestrPos(Sort *node); extern void ExecReScanSort(Sort *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODESORT_H */ +#endif /* NODESORT_H */ diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h index f7c46c3ca9..a061a42025 100644 --- a/src/include/executor/nodeSubplan.h +++ b/src/include/executor/nodeSubplan.h @@ -16,4 +16,4 @@ extern void ExecReScanSetParamPlan(SubPlan *node, Plan *parent); extern void ExecSetParamPlan(SubPlan *node, ExprContext *econtext); extern void ExecEndSubPlan(SubPlan *node); -#endif /* NODESUBPLAN_H */ +#endif /* NODESUBPLAN_H */ diff --git a/src/include/executor/nodeSubqueryscan.h b/src/include/executor/nodeSubqueryscan.h index aebe249d59..a8978fb680 100644 --- a/src/include/executor/nodeSubqueryscan.h +++ b/src/include/executor/nodeSubqueryscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSubqueryscan.h,v 1.4 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeSubqueryscan.h,v 1.5 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern bool ExecInitSubqueryScan(SubqueryScan *node, EState *estate, Plan *paren extern int ExecCountSlotsSubqueryScan(SubqueryScan *node); extern void ExecSubqueryReScan(SubqueryScan *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODESUBQUERYSCAN_H */ +#endif /* NODESUBQUERYSCAN_H */ diff --git a/src/include/executor/nodeTidscan.h b/src/include/executor/nodeTidscan.h index d24ee7689c..263a967eaa 100644 --- a/src/include/executor/nodeTidscan.h +++ b/src/include/executor/nodeTidscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeTidscan.h,v 1.7 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeTidscan.h,v 1.8 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,4 +24,4 @@ extern bool ExecInitTidScan(TidScan *node, EState *estate, Plan *parent); extern int ExecCountSlotsTidScan(TidScan *node); extern void ExecTidReScan(TidScan *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODETIDSCAN_H */ +#endif /* NODETIDSCAN_H */ diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h index 5e358654e0..1976f0a675 100644 --- a/src/include/executor/nodeUnique.h +++ b/src/include/executor/nodeUnique.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeUnique.h,v 1.13 2001/10/28 06:26:06 momjian Exp $ + * $Id: nodeUnique.h,v 1.14 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern int ExecCountSlotsUnique(Unique *node); extern void ExecEndUnique(Unique *node); extern void ExecReScanUnique(Unique *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODEUNIQUE_H */ +#endif /* NODEUNIQUE_H */ diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index 282063d892..fa2ea2f361 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -2,7 +2,7 @@ * * spi.h * - * $Id: spi.h,v 1.30 2001/10/28 06:26:06 momjian Exp $ + * $Id: spi.h,v 1.31 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -113,4 +113,4 @@ extern void SPI_cursor_close(Portal portal); extern void AtEOXact_SPI(void); -#endif /* SPI_H */ +#endif /* SPI_H */ diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h index a710a3b73f..dd8b187750 100644 --- a/src/include/executor/spi_priv.h +++ b/src/include/executor/spi_priv.h @@ -3,7 +3,7 @@ * spi.c * Server Programming Interface private declarations * - * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.10 2001/10/28 06:26:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.11 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,4 +36,4 @@ typedef struct #define _SPI_CPLAN_PROCXT 1 #define _SPI_CPLAN_TOPCXT 2 -#endif /* SPI_PRIV_H */ +#endif /* SPI_PRIV_H */ diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index d241457d71..18edec6082 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tuptable.h,v 1.20 2001/10/28 06:26:06 momjian Exp $ + * $Id: tuptable.h,v 1.21 2001/11/05 17:46:33 momjian Exp $ * * NOTES * The tuple table interface is getting pretty ugly. @@ -81,4 +81,4 @@ typedef struct TupleTableData typedef TupleTableData *TupleTable; -#endif /* TUPTABLE_H */ +#endif /* TUPTABLE_H */ diff --git a/src/include/fmgr.h b/src/include/fmgr.h index 6e2084ed44..51adf1c5cd 100644 --- a/src/include/fmgr.h +++ b/src/include/fmgr.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fmgr.h,v 1.17 2001/10/28 06:25:59 momjian Exp $ + * $Id: fmgr.h,v 1.18 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -384,4 +384,4 @@ extern void load_file(char *filename); */ extern char *fmgr(Oid procedureId,...); -#endif /* FMGR_H */ +#endif /* FMGR_H */ diff --git a/src/include/lib/dllist.h b/src/include/lib/dllist.h index 01970575e5..4367c65d25 100644 --- a/src/include/lib/dllist.h +++ b/src/include/lib/dllist.h @@ -34,7 +34,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dllist.h,v 1.18 2001/10/28 06:26:07 momjian Exp $ + * $Id: dllist.h,v 1.19 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -82,4 +82,4 @@ extern void DLMoveToFront(Dlelem *e); /* move node to front of its list */ #define DLE_VAL(elem) ((elem)->dle_val) -#endif /* DLLIST_H */ +#endif /* DLLIST_H */ diff --git a/src/include/lib/lispsort.h b/src/include/lib/lispsort.h index 99c7cec308..5215b61a89 100644 --- a/src/include/lib/lispsort.h +++ b/src/include/lib/lispsort.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: lispsort.h,v 1.9 2001/10/28 06:26:07 momjian Exp $ + * $Id: lispsort.h,v 1.10 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef LISPSORT_H #define LISPSORT_H -#endif /* LISPSORT_H */ +#endif /* LISPSORT_H */ diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h index f2935e53e7..165f510428 100644 --- a/src/include/lib/stringinfo.h +++ b/src/include/lib/stringinfo.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: stringinfo.h,v 1.22 2001/10/28 06:26:07 momjian Exp $ + * $Id: stringinfo.h,v 1.23 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -111,4 +111,4 @@ extern void appendStringInfoChar(StringInfo str, char ch); extern void appendBinaryStringInfo(StringInfo str, const char *data, int datalen); -#endif /* STRINGINFO_H */ +#endif /* STRINGINFO_H */ diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h index c679f7dd6f..f521e70617 100644 --- a/src/include/libpq/auth.h +++ b/src/include/libpq/auth.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: auth.h,v 1.19 2001/10/28 06:26:07 momjian Exp $ + * $Id: auth.h,v 1.20 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,4 @@ void ClientAuthentication(Port *port); extern char *pg_krb_server_keyfile; -#endif /* AUTH_H */ +#endif /* AUTH_H */ diff --git a/src/include/libpq/be-fsstubs.h b/src/include/libpq/be-fsstubs.h index 08f2c634ad..af3d9509c5 100644 --- a/src/include/libpq/be-fsstubs.h +++ b/src/include/libpq/be-fsstubs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: be-fsstubs.h,v 1.14 2001/10/28 06:26:07 momjian Exp $ + * $Id: be-fsstubs.h,v 1.15 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,4 +47,4 @@ extern int lo_write(int fd, char *buf, int len); */ extern void lo_commit(bool isCommit); -#endif /* BE_FSSTUBS_H */ +#endif /* BE_FSSTUBS_H */ diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h index 76dabc89bd..6a7b06ce12 100644 --- a/src/include/libpq/crypt.h +++ b/src/include/libpq/crypt.h @@ -6,8 +6,8 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: crypt.h,v 1.17 2001/11/02 18:39:57 tgl Exp $ - * + * $Id: crypt.h,v 1.18 2001/11/05 17:46:33 momjian Exp $ + * *------------------------------------------------------------------------- */ #ifndef PG_CRYPT_H @@ -26,8 +26,8 @@ extern char *crypt_getpwdfilename(void); extern void load_password_cache(void); -extern int md5_crypt_verify(const Port *port, const char *user, - const char *pgpass); +extern int md5_crypt_verify(const Port *port, const char *user, + const char *pgpass); extern bool md5_hash(const void *buff, size_t len, char *hexsum); extern bool CheckMD5Pwd(char *passwd, char *storedpwd, char *seed); extern bool EncryptMD5(const char *passwd, const char *salt, diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index e38889aecb..0d5ddbaf70 100644 --- a/src/include/libpq/hba.h +++ b/src/include/libpq/hba.h @@ -4,7 +4,7 @@ * Interface to hba.c * * - * $Id: hba.h,v 1.30 2001/10/28 06:26:07 momjian Exp $ + * $Id: hba.h,v 1.31 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,7 +41,7 @@ typedef enum UserAuth uaMD5 #ifdef USE_PAM ,uaPAM -#endif /* USE_PAM */ +#endif /* USE_PAM */ } UserAuth; typedef struct Port hbaPort; diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index 13af159433..d715194fe2 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-be.h,v 1.24 2001/10/28 06:26:07 momjian Exp $ + * $Id: libpq-be.h,v 1.25 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -156,4 +156,4 @@ void PacketSendSetup(Packet *pkt, int nbytes, PacketDoneProc iodone, void *arg) int PacketSendFragment(Port *port); void PacketSendError(Packet *pkt, char *errormsg); -#endif /* LIBPQ_BE_H */ +#endif /* LIBPQ_BE_H */ diff --git a/src/include/libpq/libpq-fs.h b/src/include/libpq/libpq-fs.h index 6870ada29a..9de2a8231b 100644 --- a/src/include/libpq/libpq-fs.h +++ b/src/include/libpq/libpq-fs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-fs.h,v 1.14 2001/10/28 06:26:07 momjian Exp $ + * $Id: libpq-fs.h,v 1.15 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,4 @@ #define INV_WRITE 0x00020000 #define INV_READ 0x00040000 -#endif /* LIBPQ_FS_H */ +#endif /* LIBPQ_FS_H */ diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index aa30d2f3a0..0da1568069 100644 --- a/src/include/libpq/libpq.h +++ b/src/include/libpq/libpq.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq.h,v 1.47 2001/10/28 06:26:07 momjian Exp $ + * $Id: libpq.h,v 1.48 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -77,4 +77,4 @@ extern void pqdebug(char *fmt, char *msg); extern void PQtrace(void); extern void PQuntrace(void); -#endif /* LIBPQ_H */ +#endif /* LIBPQ_H */ diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h index 64883424ed..199cb489db 100644 --- a/src/include/libpq/pqcomm.h +++ b/src/include/libpq/pqcomm.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqcomm.h,v 1.60 2001/10/25 05:49:59 momjian Exp $ + * $Id: pqcomm.h,v 1.61 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,7 @@ #include #endif #include -#endif /* not WIN32 */ +#endif /* not WIN32 */ #ifndef HAVE_STRUCT_SOCKADDR_UN @@ -178,4 +178,4 @@ typedef struct CancelRequestPacket */ #define NEGOTIATE_SSL_CODE PG_PROTOCOL(1234,5679) -#endif /* PQCOMM_H */ +#endif /* PQCOMM_H */ diff --git a/src/include/libpq/pqformat.h b/src/include/libpq/pqformat.h index 6505a30d60..8e9a09aabe 100644 --- a/src/include/libpq/pqformat.h +++ b/src/include/libpq/pqformat.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqformat.h,v 1.10 2001/10/28 06:26:07 momjian Exp $ + * $Id: pqformat.h,v 1.11 2001/11/05 17:46:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,4 +29,4 @@ extern int pq_puttextmessage(char msgtype, const char *str); extern int pq_getint(int *result, int b); extern int pq_getstr(StringInfo s); -#endif /* PQFORMAT_H */ +#endif /* PQFORMAT_H */ diff --git a/src/include/libpq/pqsignal.h b/src/include/libpq/pqsignal.h index 065faf8c53..be3396727c 100644 --- a/src/include/libpq/pqsignal.h +++ b/src/include/libpq/pqsignal.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqsignal.h,v 1.18 2001/10/28 06:26:07 momjian Exp $ + * $Id: pqsignal.h,v 1.19 2001/11/05 17:46:33 momjian Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -39,4 +39,4 @@ extern void pqinitmask(void); extern pqsigfunc pqsignal(int signo, pqsigfunc func); -#endif /* PQSIGNAL_H */ +#endif /* PQSIGNAL_H */ diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index 97094c0e00..de24fb8104 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -1,4 +1,4 @@ -/* $Id: pg_wchar.h,v 1.36 2001/10/28 06:26:07 momjian Exp $ */ +/* $Id: pg_wchar.h,v 1.37 2001/11/05 17:46:33 momjian Exp $ */ #ifndef PG_WCHAR_H #define PG_WCHAR_H @@ -264,7 +264,7 @@ typedef struct pg_enconv extern pg_enconv pg_enconv_tbl[]; extern pg_enconv *pg_get_enconv_by_encoding(int encoding); -#endif /* FRONTEND */ +#endif /* FRONTEND */ /* * pg_wchar stuff @@ -345,6 +345,6 @@ extern unsigned short BIG5toCNS(unsigned short, unsigned char *); extern unsigned short CNStoBIG5(unsigned short, unsigned char); char *pg_verifymbstr(const unsigned char *, int); -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ -#endif /* PG_WCHAR_H */ +#endif /* PG_WCHAR_H */ diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index ee8f69f04f..703ca7f015 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: miscadmin.h,v 1.96 2001/10/28 06:25:59 momjian Exp $ + * $Id: miscadmin.h,v 1.97 2001/11/05 17:46:31 momjian Exp $ * * NOTES * some of the information in this file should be moved to @@ -305,4 +305,4 @@ extern void IgnoreSystemIndexes(bool mode); extern bool IsIgnoringSystemIndexes(void); extern bool IsCacheInitialized(void); -#endif /* MISCADMIN_H */ +#endif /* MISCADMIN_H */ diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 63b679da3d..3a044e97ca 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execnodes.h,v 1.65 2001/10/28 06:26:07 momjian Exp $ + * $Id: execnodes.h,v 1.66 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -749,7 +749,7 @@ typedef struct TeeState MemoryContext tee_mcxt; HeapScanDesc tee_leftScanDesc, tee_rightScanDesc; -} TeeState; +} TeeState; #endif -#endif /* EXECNODES_H */ +#endif /* EXECNODES_H */ diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h index 2887440be1..d8f7abc1d8 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: makefuncs.h,v 1.29 2001/10/28 06:26:07 momjian Exp $ + * $Id: makefuncs.h,v 1.30 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,4 +46,4 @@ extern Const *makeNullConst(Oid consttype); extern Attr *makeAttr(char *relname, char *attname); -#endif /* MAKEFUNC_H */ +#endif /* MAKEFUNC_H */ diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h index 7aa88f48ce..dca38a7924 100644 --- a/src/include/nodes/memnodes.h +++ b/src/include/nodes/memnodes.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: memnodes.h,v 1.22 2001/10/25 05:50:04 momjian Exp $ + * $Id: memnodes.h,v 1.23 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -72,4 +72,4 @@ typedef struct MemoryContextData ((context) != NULL && \ (IsA((context), AllocSetContext))) -#endif /* MEMNODES_H */ +#endif /* MEMNODES_H */ diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h index abf380bb60..2a8e64e552 100644 --- a/src/include/nodes/nodeFuncs.h +++ b/src/include/nodes/nodeFuncs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeFuncs.h,v 1.15 2001/10/28 06:26:07 momjian Exp $ + * $Id: nodeFuncs.h,v 1.16 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,4 @@ extern bool var_is_outer(Var *var); extern bool var_is_rel(Var *var); extern Oper *replace_opid(Oper *oper); -#endif /* NODEFUNCS_H */ +#endif /* NODEFUNCS_H */ diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index 234d5afeae..4c05e41769 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodes.h,v 1.95 2001/10/28 06:26:07 momjian Exp $ + * $Id: nodes.h,v 1.96 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -365,4 +365,4 @@ typedef enum JoinType (jointype) == JOIN_FULL || \ (jointype) == JOIN_RIGHT) -#endif /* NODES_H */ +#endif /* NODES_H */ diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h index e15643806a..948fb1868e 100644 --- a/src/include/nodes/params.h +++ b/src/include/nodes/params.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: params.h,v 1.15 2001/10/28 06:26:07 momjian Exp $ + * $Id: params.h,v 1.16 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -100,4 +100,4 @@ typedef struct ParamExecData bool isnull; } ParamExecData; -#endif /* PARAMS_H */ +#endif /* PARAMS_H */ diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 892177c920..46ec13f34c 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parsenodes.h,v 1.150 2001/11/05 05:00:14 tgl Exp $ + * $Id: parsenodes.h,v 1.151 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1355,4 +1355,4 @@ typedef struct SortClause */ typedef SortClause GroupClause; -#endif /* PARSENODES_H */ +#endif /* PARSENODES_H */ diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index 20792b2d40..6b224d6c38 100644 --- a/src/include/nodes/pg_list.h +++ b/src/include/nodes/pg_list.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_list.h,v 1.25 2001/10/28 06:26:07 momjian Exp $ + * $Id: pg_list.h,v 1.26 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -148,4 +148,4 @@ extern void freeList(List *list); /* in copyfuncs.c */ extern List *listCopy(List *list); -#endif /* PG_LIST_H */ +#endif /* PG_LIST_H */ diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index 746732984c..111f87c24d 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: plannodes.h,v 1.52 2001/10/28 06:26:07 momjian Exp $ + * $Id: plannodes.h,v 1.53 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -432,7 +432,7 @@ typedef struct Tee List *rtentries; /* the range table for the plan below the * Tee may be different than the parent * plans */ -} Tee; +} Tee; #endif /* --------------------- @@ -464,4 +464,4 @@ typedef struct SubPlan HeapTuple curTuple; /* copy of most recent tuple from subplan */ } SubPlan; -#endif /* PLANNODES_H */ +#endif /* PLANNODES_H */ diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index a5892738c0..c2aabaffe6 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: primnodes.h,v 1.56 2001/10/28 06:26:07 momjian Exp $ + * $Id: primnodes.h,v 1.57 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -550,4 +550,4 @@ typedef struct FromExpr Node *quals; /* qualifiers on join, if any */ } FromExpr; -#endif /* PRIMNODES_H */ +#endif /* PRIMNODES_H */ diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h index 939587ccee..dbbe81fade 100644 --- a/src/include/nodes/print.h +++ b/src/include/nodes/print.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: print.h,v 1.15 2001/10/28 06:26:07 momjian Exp $ + * $Id: print.h,v 1.16 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,4 +33,4 @@ extern void print_plan_recursive(Plan *p, Query *parsetree, int indentLevel, char *label); extern void print_plan(Plan *p, Query *parsetree); -#endif /* PRINT_H */ +#endif /* PRINT_H */ diff --git a/src/include/nodes/readfuncs.h b/src/include/nodes/readfuncs.h index fbfccd91b2..c7523416a5 100644 --- a/src/include/nodes/readfuncs.h +++ b/src/include/nodes/readfuncs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: readfuncs.h,v 1.13 2001/10/28 06:26:07 momjian Exp $ + * $Id: readfuncs.h,v 1.14 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,4 @@ extern void *nodeRead(bool read_car_only); */ extern Node *parsePlanString(void); -#endif /* READFUNCS_H */ +#endif /* READFUNCS_H */ diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index b3f10b5b2c..c301d39b2a 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: relation.h,v 1.60 2001/10/28 06:26:07 momjian Exp $ + * $Id: relation.h,v 1.61 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -588,4 +588,4 @@ typedef struct Stream Selectivity groupsel; } Stream; -#endif /* RELATION_H */ +#endif /* RELATION_H */ diff --git a/src/include/optimizer/_deadcode/xfunc.h b/src/include/optimizer/_deadcode/xfunc.h index 039528dc29..6c70d21495 100644 --- a/src/include/optimizer/_deadcode/xfunc.h +++ b/src/include/optimizer/_deadcode/xfunc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xfunc.h,v 1.7 2001/10/28 06:26:08 momjian Exp $ + * $Id: xfunc.h,v 1.8 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -80,4 +80,4 @@ extern bool xfunc_copyrel(RelOptInfo *from, RelOptInfo **to); */ extern bool xfunc_do_predmig(Path root); -#endif /* XFUNC_H */ +#endif /* XFUNC_H */ diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index da8429ca09..49272e3e7c 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: clauses.h,v 1.48 2001/10/30 19:58:58 tgl Exp $ + * $Id: clauses.h,v 1.49 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -72,4 +72,4 @@ extern void query_tree_mutator(Query *query, Node *(*mutator) (), IsA(clause, Expr) && \ ((Expr *) (clause))->opType == SUBPLAN_EXPR) -#endif /* CLAUSES_H */ +#endif /* CLAUSES_H */ diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index 46093694b1..7c4c22a595 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: cost.h,v 1.42 2001/10/28 06:26:07 momjian Exp $ + * $Id: cost.h,v 1.43 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -95,4 +95,4 @@ extern Selectivity clause_selectivity(Query *root, Node *clause, int varRelid); -#endif /* COST_H */ +#endif /* COST_H */ diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h index bf834d439e..4d6b4e54f1 100644 --- a/src/include/optimizer/geqo.h +++ b/src/include/optimizer/geqo.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo.h,v 1.26 2001/10/28 06:26:07 momjian Exp $ + * $Id: geqo.h,v 1.27 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -77,4 +77,4 @@ extern RelOptInfo *gimme_tree(Query *root, List *initial_rels, Gene *tour, int num_gene, int rel_count, RelOptInfo *old_rel); -#endif /* GEQO_H */ +#endif /* GEQO_H */ diff --git a/src/include/optimizer/geqo_copy.h b/src/include/optimizer/geqo_copy.h index f9cff6bf66..2814fcb36b 100644 --- a/src/include/optimizer/geqo_copy.h +++ b/src/include/optimizer/geqo_copy.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_copy.h,v 1.11 2001/10/28 06:26:07 momjian Exp $ + * $Id: geqo_copy.h,v 1.12 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,4 +26,4 @@ extern void geqo_copy(Chromosome *chromo1, Chromosome *chromo2, int string_length); -#endif /* GEQO_COPY_H */ +#endif /* GEQO_COPY_H */ diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h index 06194d99ca..a811fd692d 100644 --- a/src/include/optimizer/geqo_gene.h +++ b/src/include/optimizer/geqo_gene.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_gene.h,v 1.12 2001/10/28 06:26:07 momjian Exp $ + * $Id: geqo_gene.h,v 1.13 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,4 +42,4 @@ typedef struct Pool int string_length; } Pool; -#endif /* GEQO_GENE_H */ +#endif /* GEQO_GENE_H */ diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h index d04f4a5d88..6f48900991 100644 --- a/src/include/optimizer/geqo_misc.h +++ b/src/include/optimizer/geqo_misc.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_misc.h,v 1.17 2001/10/28 06:26:07 momjian Exp $ + * $Id: geqo_misc.h,v 1.18 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,4 +33,4 @@ extern void geqo_print_rel(Query *root, RelOptInfo *rel); extern void geqo_print_path(Query *root, Path *path, int indent); extern void geqo_print_joinclauses(Query *root, List *clauses); -#endif /* GEQO_MISC_H */ +#endif /* GEQO_MISC_H */ diff --git a/src/include/optimizer/geqo_mutation.h b/src/include/optimizer/geqo_mutation.h index 6754ea9520..d04826d185 100644 --- a/src/include/optimizer/geqo_mutation.h +++ b/src/include/optimizer/geqo_mutation.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_mutation.h,v 1.11 2001/10/28 06:26:07 momjian Exp $ + * $Id: geqo_mutation.h,v 1.12 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,4 +26,4 @@ extern void geqo_mutation(Gene *tour, int num_gene); -#endif /* GEQO_MUTATION_H */ +#endif /* GEQO_MUTATION_H */ diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h index b2eb4cb241..2d1d8d17a8 100644 --- a/src/include/optimizer/geqo_pool.h +++ b/src/include/optimizer/geqo_pool.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_pool.h,v 1.14 2001/10/28 06:26:07 momjian Exp $ + * $Id: geqo_pool.h,v 1.15 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,4 +38,4 @@ extern void spread_chromo(Chromosome *chromo, Pool *pool); extern void sort_pool(Pool *pool); -#endif /* GEQO_POOL_H */ +#endif /* GEQO_POOL_H */ diff --git a/src/include/optimizer/geqo_random.h b/src/include/optimizer/geqo_random.h index 4c5a1ac8ce..d42b6ff779 100644 --- a/src/include/optimizer/geqo_random.h +++ b/src/include/optimizer/geqo_random.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_random.h,v 1.10 2001/10/28 06:26:07 momjian Exp $ + * $Id: geqo_random.h,v 1.11 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,4 +35,4 @@ #define geqo_randint(upper,lower) \ ( (int) floor( geqo_rand()*(((upper)-(lower))+0.999999) ) + (lower) ) -#endif /* GEQO_RANDOM_H */ +#endif /* GEQO_RANDOM_H */ diff --git a/src/include/optimizer/geqo_recombination.h b/src/include/optimizer/geqo_recombination.h index 3b99c1b432..9692730161 100644 --- a/src/include/optimizer/geqo_recombination.h +++ b/src/include/optimizer/geqo_recombination.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_recombination.h,v 1.10 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo_recombination.h,v 1.11 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -77,4 +77,4 @@ extern void ox1(Gene *mom, Gene *dad, Gene *offspring, int num_gene, City *city_ /* order crossover [OX2] according to Syswerda */ extern void ox2(Gene *mom, Gene *dad, Gene *offspring, int num_gene, City *city_table); -#endif /* GEQO_RECOMBINATION_H */ +#endif /* GEQO_RECOMBINATION_H */ diff --git a/src/include/optimizer/geqo_selection.h b/src/include/optimizer/geqo_selection.h index 9c10cfec9c..d55e156fed 100644 --- a/src/include/optimizer/geqo_selection.h +++ b/src/include/optimizer/geqo_selection.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_selection.h,v 1.11 2001/10/28 06:26:07 momjian Exp $ + * $Id: geqo_selection.h,v 1.12 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,4 @@ extern void geqo_selection(Chromosome *momma, Chromosome *daddy, Pool *pool, double bias); -#endif /* GEQO_SELECTION_H */ +#endif /* GEQO_SELECTION_H */ diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h index f905d38509..49ffc3a7f3 100644 --- a/src/include/optimizer/joininfo.h +++ b/src/include/optimizer/joininfo.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: joininfo.h,v 1.19 2001/10/28 06:26:07 momjian Exp $ + * $Id: joininfo.h,v 1.20 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,4 +18,4 @@ extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids); -#endif /* JOININFO_H */ +#endif /* JOININFO_H */ diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index 0c05bbdaa6..9be3cfde01 100644 --- a/src/include/optimizer/pathnode.h +++ b/src/include/optimizer/pathnode.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pathnode.h,v 1.40 2001/10/28 06:26:07 momjian Exp $ + * $Id: pathnode.h,v 1.41 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -76,4 +76,4 @@ extern RelOptInfo *build_join_rel(Query *root, JoinType jointype, List **restrictlist_ptr); -#endif /* PATHNODE_H */ +#endif /* PATHNODE_H */ diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index c725e2126c..81b8714175 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: paths.h,v 1.58 2001/10/28 06:26:07 momjian Exp $ + * $Id: paths.h,v 1.59 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -131,4 +131,4 @@ extern List *truncate_useless_pathkeys(Query *root, RelOptInfo *rel, List *pathkeys); -#endif /* PATHS_H */ +#endif /* PATHS_H */ diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index 5fda9af760..566cbce6aa 100644 --- a/src/include/optimizer/plancat.h +++ b/src/include/optimizer/plancat.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: plancat.h,v 1.25 2001/10/28 06:26:07 momjian Exp $ + * $Id: plancat.h,v 1.26 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,4 +37,4 @@ extern Selectivity join_selectivity(Query *root, Oid operator, List *args); -#endif /* PLANCAT_H */ +#endif /* PLANCAT_H */ diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index 8c5bbf5806..37209dfd5c 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: planmain.h,v 1.53 2001/10/28 06:26:07 momjian Exp $ + * $Id: planmain.h,v 1.54 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,4 +68,4 @@ extern bool _use_keyset_query_optimizer; extern void transformKeySetQuery(Query *origNode); -#endif /* PLANMAIN_H */ +#endif /* PLANMAIN_H */ diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h index 7db7e5d165..7eebff248a 100644 --- a/src/include/optimizer/planner.h +++ b/src/include/optimizer/planner.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: planner.h,v 1.22 2001/10/28 06:26:07 momjian Exp $ + * $Id: planner.h,v 1.23 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,4 +24,4 @@ extern Plan *subquery_planner(Query *parse, double tuple_fraction); extern Plan *make_sortplan(Query *parse, List *tlist, Plan *plannode, List *sortcls); -#endif /* PLANNER_H */ +#endif /* PLANNER_H */ diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h index e6fa5c437f..b6fe0645a8 100644 --- a/src/include/optimizer/prep.h +++ b/src/include/optimizer/prep.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: prep.h,v 1.30 2001/10/28 06:26:07 momjian Exp $ + * $Id: prep.h,v 1.31 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,4 +43,4 @@ extern Node *adjust_inherited_attrs(Node *node, Index old_rt_index, Oid old_relid, Index new_rt_index, Oid new_relid); -#endif /* PREP_H */ +#endif /* PREP_H */ diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h index 6fb0fb22ee..68569c9e44 100644 --- a/src/include/optimizer/restrictinfo.h +++ b/src/include/optimizer/restrictinfo.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: restrictinfo.h,v 1.13 2001/10/28 06:26:07 momjian Exp $ + * $Id: restrictinfo.h,v 1.14 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,4 @@ extern List *get_actual_clauses(List *restrictinfo_list); extern void get_actual_join_clauses(List *restrictinfo_list, List **joinquals, List **otherquals); -#endif /* RESTRICTINFO_H */ +#endif /* RESTRICTINFO_H */ diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h index 9c56a7592b..0b54f2e3fd 100644 --- a/src/include/optimizer/subselect.h +++ b/src/include/optimizer/subselect.h @@ -18,4 +18,4 @@ extern List *SS_finalize_plan(Plan *plan); extern Node *SS_replace_correlation_vars(Node *expr); extern Node *SS_process_sublinks(Node *expr); -#endif /* SUBSELECT_H */ +#endif /* SUBSELECT_H */ diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h index 44c4965bf6..b14c2429d8 100644 --- a/src/include/optimizer/tlist.h +++ b/src/include/optimizer/tlist.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tlist.h,v 1.30 2001/10/28 06:26:07 momjian Exp $ + * $Id: tlist.h,v 1.31 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,4 +33,4 @@ extern TargetEntry *get_sortgroupclause_tle(SortClause *sortClause, extern Node *get_sortgroupclause_expr(SortClause *sortClause, List *targetList); -#endif /* TLIST_H */ +#endif /* TLIST_H */ diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h index 9d3fdc5e51..c88da074a5 100644 --- a/src/include/optimizer/var.h +++ b/src/include/optimizer/var.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: var.h,v 1.16 2001/10/28 06:26:07 momjian Exp $ + * $Id: var.h,v 1.17 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ extern bool contain_whole_tuple_var(Node *node, int varno, int levelsup); extern bool contain_var_clause(Node *node); extern List *pull_var_clause(Node *node, bool includeUpperVars); -#endif /* VAR_H */ +#endif /* VAR_H */ diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h index 9b21d31f86..09cdde3786 100644 --- a/src/include/parser/analyze.h +++ b/src/include/parser/analyze.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: analyze.h,v 1.17 2001/10/28 06:26:08 momjian Exp $ + * $Id: analyze.h,v 1.18 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern void CheckSelectForUpdate(Query *qry); /* This was exported to allow ADD CONSTRAINT to make use of it */ extern char *makeObjectName(char *name1, char *name2, char *typename); -#endif /* ANALYZE_H */ +#endif /* ANALYZE_H */ diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h index 14829dafc8..a9932ab59a 100644 --- a/src/include/parser/gramparse.h +++ b/src/include/parser/gramparse.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: gramparse.h,v 1.18 2001/10/28 06:26:08 momjian Exp $ + * $Id: gramparse.h,v 1.19 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,4 +31,4 @@ extern char *xlateSqlFunc(char *name); extern char *xlateSqlType(char *name); bool exprIsNullConstant(Node *arg); -#endif /* GRAMPARSE_H */ +#endif /* GRAMPARSE_H */ diff --git a/src/include/parser/keywords.h b/src/include/parser/keywords.h index b9c0abc810..77c754901a 100644 --- a/src/include/parser/keywords.h +++ b/src/include/parser/keywords.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: keywords.h,v 1.11 2001/10/28 06:26:08 momjian Exp $ + * $Id: keywords.h,v 1.12 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ typedef struct ScanKeyword extern ScanKeyword *ScanKeywordLookup(char *text); -#endif /* KEYWORDS_H */ +#endif /* KEYWORDS_H */ diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h index fb6048560b..22d046e48f 100644 --- a/src/include/parser/parse_agg.h +++ b/src/include/parser/parse_agg.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_agg.h,v 1.19 2001/10/28 06:26:08 momjian Exp $ + * $Id: parse_agg.h,v 1.20 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ extern Aggref *ParseAgg(ParseState *pstate, char *aggname, Oid basetype, int precedence); extern void agg_error(char *caller, char *aggname, Oid basetypeID); -#endif /* PARSE_AGG_H */ +#endif /* PARSE_AGG_H */ diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h index ed97f6a857..36820ad4df 100644 --- a/src/include/parser/parse_clause.h +++ b/src/include/parser/parse_clause.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_clause.h,v 1.26 2001/10/28 06:26:08 momjian Exp $ + * $Id: parse_clause.h,v 1.27 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,4 +31,4 @@ extern List *transformDistinctClause(ParseState *pstate, List *distinctlist, extern List *addAllTargetsToSortList(List *sortlist, List *targetlist); extern Index assignSortGroupRef(TargetEntry *tle, List *tlist); -#endif /* PARSE_CLAUSE_H */ +#endif /* PARSE_CLAUSE_H */ diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index e556db33b3..ce9fb7b558 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_coerce.h,v 1.36 2001/10/28 06:26:08 momjian Exp $ + * $Id: parse_coerce.h,v 1.37 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -82,4 +82,4 @@ extern Node *coerce_to_common_type(ParseState *pstate, Node *node, Oid targetTypeId, const char *context); -#endif /* PARSE_COERCE_H */ +#endif /* PARSE_COERCE_H */ diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h index 2367ac9dc9..6c906420de 100644 --- a/src/include/parser/parse_expr.h +++ b/src/include/parser/parse_expr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_expr.h,v 1.24 2001/10/28 06:26:08 momjian Exp $ + * $Id: parse_expr.h,v 1.25 2001/11/05 17:46:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,4 +29,4 @@ extern bool exprIsLengthCoercion(Node *expr, int32 *coercedTypmod); extern void parse_expr_init(void); extern char *TypeNameToInternalName(TypeName *typename); -#endif /* PARSE_EXPR_H */ +#endif /* PARSE_EXPR_H */ diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index 6edf39689d..ff70080f21 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_func.h,v 1.34 2001/10/28 06:26:08 momjian Exp $ + * $Id: parse_func.h,v 1.35 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,7 +36,7 @@ typedef struct _CandidateList { Oid *args; struct _CandidateList *next; -} *CandidateList; +} *CandidateList; /* Result codes for func_get_detail */ typedef enum @@ -64,4 +64,4 @@ extern bool typeInheritsFrom(Oid subclassTypeId, Oid superclassTypeId); extern void func_error(char *caller, char *funcname, int nargs, Oid *argtypes, char *msg); -#endif /* PARSE_FUNC_H */ +#endif /* PARSE_FUNC_H */ diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h index ce8f3007d0..ecf67f8275 100644 --- a/src/include/parser/parse_node.h +++ b/src/include/parser/parse_node.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_node.h,v 1.28 2001/10/28 06:26:08 momjian Exp $ + * $Id: parse_node.h,v 1.29 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,4 +63,4 @@ extern ArrayRef *transformArraySubscripts(ParseState *pstate, Node *assignFrom); extern Const *make_const(Value *value); -#endif /* PARSE_NODE_H */ +#endif /* PARSE_NODE_H */ diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h index 89e2df820b..c8f9abd188 100644 --- a/src/include/parser/parse_oper.h +++ b/src/include/parser/parse_oper.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_oper.h,v 1.17 2001/10/28 06:26:08 momjian Exp $ + * $Id: parse_oper.h,v 1.18 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,4 +42,4 @@ extern Oid any_ordering_op(Oid argtype); extern Oid oprid(Operator op); extern Oid oprfuncid(Operator op); -#endif /* PARSE_OPER_H */ +#endif /* PARSE_OPER_H */ diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index dd8307c778..3bc575f6ac 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_relation.h,v 1.27 2001/10/28 06:26:08 momjian Exp $ + * $Id: parse_relation.h,v 1.28 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -48,4 +48,4 @@ extern int attnameAttNum(Relation rd, char *a); extern Name attnumAttName(Relation rd, int attid); extern Oid attnumTypeId(Relation rd, int attid); -#endif /* PARSE_RELATION_H */ +#endif /* PARSE_RELATION_H */ diff --git a/src/include/parser/parse_target.h b/src/include/parser/parse_target.h index f31f49dbf4..a326da72e4 100644 --- a/src/include/parser/parse_target.h +++ b/src/include/parser/parse_target.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_target.h,v 1.22 2001/10/28 06:26:08 momjian Exp $ + * $Id: parse_target.h,v 1.23 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,4 @@ extern Node *CoerceTargetExpr(ParseState *pstate, Node *expr, extern List *checkInsertTargets(ParseState *pstate, List *cols, List **attrnos); -#endif /* PARSE_TARGET_H */ +#endif /* PARSE_TARGET_H */ diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h index 47b756d6b4..3d46601e98 100644 --- a/src/include/parser/parse_type.h +++ b/src/include/parser/parse_type.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_type.h,v 1.19 2001/10/28 06:26:08 momjian Exp $ + * $Id: parse_type.h,v 1.20 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,4 +38,4 @@ extern void parseTypeString(const char *str, Oid *type_id, int32 *typmod); #define ISCOMPLEX(typeid) (typeidTypeRelid(typeid) != InvalidOid) -#endif /* PARSE_TYPE_H */ +#endif /* PARSE_TYPE_H */ diff --git a/src/include/parser/parser.h b/src/include/parser/parser.h index e0e201cd48..8547a66cc1 100644 --- a/src/include/parser/parser.h +++ b/src/include/parser/parser.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parser.h,v 1.10 2001/10/28 06:26:08 momjian Exp $ + * $Id: parser.h,v 1.11 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,4 +18,4 @@ extern List *parser(char *str, Oid *typev, int nargs); -#endif /* PARSER_H */ +#endif /* PARSER_H */ diff --git a/src/include/parser/parsetree.h b/src/include/parser/parsetree.h index 7392f2e224..2c19c9cc45 100644 --- a/src/include/parser/parsetree.h +++ b/src/include/parser/parsetree.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parsetree.h,v 1.15 2001/10/28 06:26:08 momjian Exp $ + * $Id: parsetree.h,v 1.16 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -52,4 +52,4 @@ */ extern char *get_rte_attribute_name(RangeTblEntry *rte, AttrNumber attnum); -#endif /* PARSETREE_H */ +#endif /* PARSETREE_H */ diff --git a/src/include/parser/scansup.h b/src/include/parser/scansup.h index a82839cdb7..194ecc42f4 100644 --- a/src/include/parser/scansup.h +++ b/src/include/parser/scansup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: scansup.h,v 1.10 2001/10/28 06:26:08 momjian Exp $ + * $Id: scansup.h,v 1.11 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,4 @@ extern char *scanstr(char *s); -#endif /* SCANSUP_H */ +#endif /* SCANSUP_H */ diff --git a/src/include/pgstat.h b/src/include/pgstat.h index 318361ac3a..87dbfa1273 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -5,7 +5,7 @@ * * Copyright (c) 2001, PostgreSQL Global Development Group * - * $Id: pgstat.h,v 1.9 2001/10/25 05:49:54 momjian Exp $ + * $Id: pgstat.h,v 1.10 2001/11/05 17:46:31 momjian Exp $ * ---------- */ #ifndef PGSTAT_H @@ -449,4 +449,4 @@ extern PgStat_StatTabEntry *pgstat_fetch_stat_tabentry(Oid relid); extern PgStat_StatBeEntry *pgstat_fetch_stat_beentry(int beid); extern int pgstat_fetch_stat_numbackends(void); -#endif /* PGSTAT_H */ +#endif /* PGSTAT_H */ diff --git a/src/include/port/darwin/sem.h b/src/include/port/darwin/sem.h index 96df7bd603..70a5030d6e 100644 --- a/src/include/port/darwin/sem.h +++ b/src/include/port/darwin/sem.h @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/include/port/darwin/Attic/sem.h,v 1.4 2001/10/28 06:26:08 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/port/darwin/Attic/sem.h,v 1.5 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -71,4 +71,4 @@ extern "C" } #endif -#endif /* _SYS_SEM_H */ +#endif /* _SYS_SEM_H */ diff --git a/src/include/port/qnx4.h b/src/include/port/qnx4.h index d1a4bc9af9..c4f43aabbe 100644 --- a/src/include/port/qnx4.h +++ b/src/include/port/qnx4.h @@ -14,11 +14,11 @@ #ifndef NAN #ifndef __nan_bytes #define __nan_bytes { 0, 0, 0, 0, 0, 0, 0xf8, 0x7f } -#endif /* __nan_bytes */ +#endif /* __nan_bytes */ extern unsigned char __nan[8]; #define NAN (*(const double *) __nan) -#endif /* NAN */ +#endif /* NAN */ typedef u_short ushort; diff --git a/src/include/port/solaris.h b/src/include/port/solaris.h index ac1e485ba3..cdffb61e90 100644 --- a/src/include/port/solaris.h +++ b/src/include/port/solaris.h @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/include/port/solaris.h,v 1.6 2001/10/28 06:26:08 momjian Exp $ */ +/* $Header: /cvsroot/pgsql/src/include/port/solaris.h,v 1.7 2001/11/05 17:46:35 momjian Exp $ */ #define HAS_TEST_AND_SET typedef unsigned char slock_t; @@ -56,6 +56,6 @@ typedef unsigned char slock_t; /* not GNUC and i386 */ #define NAN (0.0/0.0) -#endif /* GCC. */ +#endif /* GCC. */ -#endif /* not NAN */ +#endif /* not NAN */ diff --git a/src/include/postgres.h b/src/include/postgres.h index 41f141677b..cc647c2d2d 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $Id: postgres.h,v 1.55 2001/10/28 06:25:59 momjian Exp $ + * $Id: postgres.h,v 1.56 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -533,7 +533,7 @@ extern DLLIMPORT bool assert_enabled; #define AssertState(condition) \ Trap(!(condition), BadState) -#endif /* USE_ASSERT_CHECKING */ +#endif /* USE_ASSERT_CHECKING */ /* * LogTrap @@ -588,7 +588,7 @@ __attribute__((format(printf, 1, 2))); #ifdef ASSERT_CHECKING_TEST extern int assertTest(int val); #endif -#endif /* USE_ASSERT_CHECKING */ +#endif /* USE_ASSERT_CHECKING */ /* ---------------------------------------------------------------- * Section 4: genbki macros used by catalog/pg_xxx.h files @@ -609,4 +609,4 @@ extern int assertTest(int val); typedef int4 aclitem; /* PHONY definition for catalog use only */ -#endif /* POSTGRES_H */ +#endif /* POSTGRES_H */ diff --git a/src/include/postgres_fe.h b/src/include/postgres_fe.h index 8480481705..d241891ce3 100644 --- a/src/include/postgres_fe.h +++ b/src/include/postgres_fe.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $Id: postgres_fe.h,v 1.4 2001/10/28 06:25:59 momjian Exp $ + * $Id: postgres_fe.h,v 1.5 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,4 @@ #include "c.h" -#endif /* POSTGRES_FE_H */ +#endif /* POSTGRES_FE_H */ diff --git a/src/include/regex/cclass.h b/src/include/regex/cclass.h index 700c712d8c..8b13c12583 100644 --- a/src/include/regex/cclass.h +++ b/src/include/regex/cclass.h @@ -43,7 +43,7 @@ static struct cclass char *name; char *chars; char *multis; -} cclasses[] = +} cclasses[] = { { @@ -52,7 +52,7 @@ static struct cclass }, { "alpha", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", - "" + "" }, { "blank", " \t", "" @@ -67,31 +67,31 @@ static struct cclass { "graph", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ 0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~", - "" + "" }, { "lower", "abcdefghijklmnopqrstuvwxyz", - "" + "" }, { "print", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ 0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ ", - "" + "" }, { "punct", "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~", - "" + "" }, { "space", "\t\n\v\f\r ", "" }, { "upper", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", - "" + "" }, { "xdigit", "0123456789ABCDEFabcdef", - "" + "" }, { NULL, NULL, "" diff --git a/src/include/regex/cname.h b/src/include/regex/cname.h index 235de80a2d..bff408e4f0 100644 --- a/src/include/regex/cname.h +++ b/src/include/regex/cname.h @@ -42,7 +42,7 @@ static struct cname { char *name; char code; -} cnames[] = +} cnames[] = { { diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h index 180bfe204f..09f966e1bf 100644 --- a/src/include/regex/regex.h +++ b/src/include/regex/regex.h @@ -110,4 +110,4 @@ extern int pg95_regexec(const regex_t *preg, const char *string, regmatch_t *pmatch, int eflags); extern void pg95_regfree(regex_t *preg); -#endif /* !_REGEX_H_ */ +#endif /* !_REGEX_H_ */ diff --git a/src/include/regex/utils.h b/src/include/regex/utils.h index 4a29c21726..282bb791ad 100644 --- a/src/include/regex/utils.h +++ b/src/include/regex/utils.h @@ -61,4 +61,4 @@ typedef unsigned char uch; #endif #endif -#endif /* _REGEX_UTILS_H */ +#endif /* _REGEX_UTILS_H */ diff --git a/src/include/rewrite/prs2lock.h b/src/include/rewrite/prs2lock.h index 983f41f1c9..8606621c6d 100644 --- a/src/include/rewrite/prs2lock.h +++ b/src/include/rewrite/prs2lock.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: prs2lock.h,v 1.14 2001/10/28 06:26:08 momjian Exp $ + * $Id: prs2lock.h,v 1.15 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,4 +43,4 @@ typedef struct RuleLock RewriteRule **rules; } RuleLock; -#endif /* REWRITE_H */ +#endif /* REWRITE_H */ diff --git a/src/include/rewrite/rewriteDefine.h b/src/include/rewrite/rewriteDefine.h index 49d3d1896e..a9f7792a61 100644 --- a/src/include/rewrite/rewriteDefine.h +++ b/src/include/rewrite/rewriteDefine.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteDefine.h,v 1.12 2001/10/28 06:26:08 momjian Exp $ + * $Id: rewriteDefine.h,v 1.13 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,4 @@ extern void DefineQueryRewrite(RuleStmt *args); extern void RenameRewriteRule(char *oldname, char *newname); -#endif /* REWRITEDEFINE_H */ +#endif /* REWRITEDEFINE_H */ diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h index a8210cc4e9..2b6b4680db 100644 --- a/src/include/rewrite/rewriteHandler.h +++ b/src/include/rewrite/rewriteHandler.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteHandler.h,v 1.17 2001/10/28 06:26:08 momjian Exp $ + * $Id: rewriteHandler.h,v 1.18 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,4 +19,4 @@ extern List *QueryRewrite(Query *parsetree); -#endif /* REWRITEHANDLER_H */ +#endif /* REWRITEHANDLER_H */ diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h index 75539b3344..2cdd68abfb 100644 --- a/src/include/rewrite/rewriteManip.h +++ b/src/include/rewrite/rewriteManip.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteManip.h,v 1.29 2001/10/28 06:26:08 momjian Exp $ + * $Id: rewriteManip.h,v 1.30 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,4 +40,4 @@ extern bool checkExprHasSubLink(Node *node); extern Node *ResolveNew(Node *node, int target_varno, int sublevels_up, List *targetlist, int event, int update_varno); -#endif /* REWRITEMANIP_H */ +#endif /* REWRITEMANIP_H */ diff --git a/src/include/rewrite/rewriteRemove.h b/src/include/rewrite/rewriteRemove.h index d6a440912a..672ed7f85d 100644 --- a/src/include/rewrite/rewriteRemove.h +++ b/src/include/rewrite/rewriteRemove.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteRemove.h,v 1.9 2001/10/28 06:26:08 momjian Exp $ + * $Id: rewriteRemove.h,v 1.10 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,4 +18,4 @@ extern char *RewriteGetRuleEventRel(char *rulename); extern void RemoveRewriteRule(char *ruleName); extern void RelationRemoveRules(Oid relid); -#endif /* REWRITEREMOVE_H */ +#endif /* REWRITEREMOVE_H */ diff --git a/src/include/rewrite/rewriteSupport.h b/src/include/rewrite/rewriteSupport.h index b64a20a8dc..6f955d6eea 100644 --- a/src/include/rewrite/rewriteSupport.h +++ b/src/include/rewrite/rewriteSupport.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteSupport.h,v 1.19 2001/10/28 06:26:08 momjian Exp $ + * $Id: rewriteSupport.h,v 1.20 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,4 @@ extern char *MakeRetrieveViewRuleName(const char *view_name); extern void SetRelationRuleStatus(Oid relationId, bool relHasRules, bool relIsBecomingView); -#endif /* REWRITESUPPORT_H */ +#endif /* REWRITESUPPORT_H */ diff --git a/src/include/rusagestub.h b/src/include/rusagestub.h index da8cc6125d..a2a5629b1d 100644 --- a/src/include/rusagestub.h +++ b/src/include/rusagestub.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rusagestub.h,v 1.8 2001/10/28 06:25:59 momjian Exp $ + * $Id: rusagestub.h,v 1.9 2001/11/05 17:46:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,4 +29,4 @@ struct rusage extern int getrusage(int who, struct rusage * rusage); -#endif /* RUSAGESTUB_H */ +#endif /* RUSAGESTUB_H */ diff --git a/src/include/storage/backendid.h b/src/include/storage/backendid.h index 212f4e0f11..f2e272825e 100644 --- a/src/include/storage/backendid.h +++ b/src/include/storage/backendid.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: backendid.h,v 1.11 2001/10/28 06:26:08 momjian Exp $ + * $Id: backendid.h,v 1.12 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,4 +25,4 @@ typedef int BackendId; /* unique currently active backend extern BackendId MyBackendId; /* backend id of this backend */ -#endif /* BACKENDID_H */ +#endif /* BACKENDID_H */ diff --git a/src/include/storage/block.h b/src/include/storage/block.h index d4516f5b7b..1c9cd63a24 100644 --- a/src/include/storage/block.h +++ b/src/include/storage/block.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: block.h,v 1.15 2001/10/28 06:26:08 momjian Exp $ + * $Id: block.h,v 1.16 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -118,4 +118,4 @@ typedef BlockIdData *BlockId; /* block identifier */ (BlockNumber) (((blockId)->bi_hi << 16) | ((uint16) (blockId)->bi_lo)) \ ) -#endif /* BLOCK_H */ +#endif /* BLOCK_H */ diff --git a/src/include/storage/buf.h b/src/include/storage/buf.h index 702a3976d1..9037587b46 100644 --- a/src/include/storage/buf.h +++ b/src/include/storage/buf.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: buf.h,v 1.11 2001/10/28 06:26:08 momjian Exp $ + * $Id: buf.h,v 1.12 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,4 +44,4 @@ typedef int Buffer; */ #undef NO_BUFFERISVALID -#endif /* BUF_H */ +#endif /* BUF_H */ diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h index 46eca54d11..73033c556b 100644 --- a/src/include/storage/buf_internals.h +++ b/src/include/storage/buf_internals.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: buf_internals.h,v 1.53 2001/10/28 06:26:08 momjian Exp $ + * $Id: buf_internals.h,v 1.54 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -145,8 +145,8 @@ typedef struct _bmtrace #define BMT_ALLOCNOTFND 2 #define BMT_DEALLOC 3 -} bmtrace; -#endif /* BMTRACE */ +} bmtrace; +#endif /* BMTRACE */ /* @@ -184,4 +184,4 @@ extern int FlushLocalBuffer(Buffer buffer, bool sync, bool release); extern void LocalBufferSync(void); extern void ResetLocalBufferPool(void); -#endif /* BUFMGR_INTERNALS_H */ +#endif /* BUFMGR_INTERNALS_H */ diff --git a/src/include/storage/buffile.h b/src/include/storage/buffile.h index cf40254bee..48afc3a90f 100644 --- a/src/include/storage/buffile.h +++ b/src/include/storage/buffile.h @@ -18,7 +18,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: buffile.h,v 1.10 2001/10/28 06:26:08 momjian Exp $ + * $Id: buffile.h,v 1.11 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,4 +42,4 @@ extern int BufFileSeek(BufFile *file, int fileno, long offset, int whence); extern void BufFileTell(BufFile *file, int *fileno, long *offset); extern int BufFileSeekBlock(BufFile *file, long blknum); -#endif /* BUFFILE_H */ +#endif /* BUFFILE_H */ diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h index 58b83515f6..6e75f12b3c 100644 --- a/src/include/storage/bufpage.h +++ b/src/include/storage/bufpage.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: bufpage.h,v 1.45 2001/10/28 06:26:08 momjian Exp $ + * $Id: bufpage.h,v 1.46 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -320,4 +320,4 @@ extern Size PageGetFreeSpace(Page page); extern void PageIndexTupleDelete(Page page, OffsetNumber offset); extern void IndexPageCleanup(Buffer buffer); -#endif /* BUFPAGE_H */ +#endif /* BUFPAGE_H */ diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h index 670a7e5aba..7d86f18292 100644 --- a/src/include/storage/fd.h +++ b/src/include/storage/fd.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fd.h,v 1.33 2001/10/28 06:26:08 momjian Exp $ + * $Id: fd.h,v 1.34 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -79,4 +79,4 @@ extern void RemovePgTempFiles(void); extern int pg_fsync(int fd); extern int pg_fdatasync(int fd); -#endif /* FD_H */ +#endif /* FD_H */ diff --git a/src/include/storage/freespace.h b/src/include/storage/freespace.h index d9ba1a796f..6c3a20da3c 100644 --- a/src/include/storage/freespace.h +++ b/src/include/storage/freespace.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: freespace.h,v 1.5 2001/10/28 06:26:08 momjian Exp $ + * $Id: freespace.h,v 1.6 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -48,4 +48,4 @@ extern void FreeSpaceMapForgetDatabase(Oid dbid); extern void DumpFreeSpace(void); #endif -#endif /* FREESPACE_H */ +#endif /* FREESPACE_H */ diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h index 451aede3c4..6a96ea2d12 100644 --- a/src/include/storage/ipc.h +++ b/src/include/storage/ipc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: ipc.h,v 1.53 2001/10/28 06:26:08 momjian Exp $ + * $Id: ipc.h,v 1.54 2001/11/05 17:46:35 momjian Exp $ * * Some files that would normally need to include only sys/ipc.h must * instead include this file because on Ultrix, sys/ipc.h is not designed @@ -21,7 +21,7 @@ #include #ifdef HAVE_SYS_IPC_H #include -#endif /* HAVE_SYS_IPC_H */ +#endif /* HAVE_SYS_IPC_H */ #ifndef HAVE_UNION_SEMUN union semun @@ -90,4 +90,4 @@ extern bool SharedMemoryIsInUse(IpcMemoryKey shmKey, IpcMemoryId shmId); extern void CreateSharedMemoryAndSemaphores(bool makePrivate, int maxBackends); -#endif /* IPC_H */ +#endif /* IPC_H */ diff --git a/src/include/storage/item.h b/src/include/storage/item.h index 1bfcabb1ee..94f680fdef 100644 --- a/src/include/storage/item.h +++ b/src/include/storage/item.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: item.h,v 1.9 2001/10/28 06:26:09 momjian Exp $ + * $Id: item.h,v 1.10 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,4 +16,4 @@ typedef Pointer Item; -#endif /* ITEM_H */ +#endif /* ITEM_H */ diff --git a/src/include/storage/itemid.h b/src/include/storage/itemid.h index fae39dfc7f..33d94d9e15 100644 --- a/src/include/storage/itemid.h +++ b/src/include/storage/itemid.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: itemid.h,v 1.18 2001/10/28 06:26:09 momjian Exp $ + * $Id: itemid.h,v 1.19 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -94,4 +94,4 @@ typedef bits16 ItemIdFlags; (bool) (((itemId)->lp_flags & LP_USED) != 0) \ ) -#endif /* ITEMID_H */ +#endif /* ITEMID_H */ diff --git a/src/include/storage/itempos.h b/src/include/storage/itempos.h index 1b18928a8d..259d80cd0c 100644 --- a/src/include/storage/itempos.h +++ b/src/include/storage/itempos.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: itempos.h,v 1.14 2001/10/28 06:26:09 momjian Exp $ + * $Id: itempos.h,v 1.15 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,7 +23,7 @@ typedef struct ItemSubpositionData ItemId op_lpp; char *op_cp; /* XXX */ uint32 op_len; -} ItemSubpositionData; +} ItemSubpositionData; typedef ItemSubpositionData *ItemSubposition; @@ -42,4 +42,4 @@ typedef ItemSubpositionData *ItemSubposition; #define PSKIP(OBJP, LEN)\ do { (OBJP)->op_cp += (LEN); (OBJP)->op_len -= (LEN); } while (0) -#endif /* ITEMPOS_H */ +#endif /* ITEMPOS_H */ diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h index f9d8e27f3d..39acf770ad 100644 --- a/src/include/storage/itemptr.h +++ b/src/include/storage/itemptr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: itemptr.h,v 1.20 2001/10/28 06:26:09 momjian Exp $ + * $Id: itemptr.h,v 1.21 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -143,4 +143,4 @@ typedef ItemPointerData *ItemPointer; extern bool ItemPointerEquals(ItemPointer pointer1, ItemPointer pointer2); -#endif /* ITEMPTR_H */ +#endif /* ITEMPTR_H */ diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h index 8ea1d34df4..d01364f117 100644 --- a/src/include/storage/large_object.h +++ b/src/include/storage/large_object.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: large_object.h,v 1.23 2001/10/28 06:26:09 momjian Exp $ + * $Id: large_object.h,v 1.24 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -76,4 +76,4 @@ extern int inv_tell(LargeObjectDesc *obj_desc); extern int inv_read(LargeObjectDesc *obj_desc, char *buf, int nbytes); extern int inv_write(LargeObjectDesc *obj_desc, char *buf, int nbytes); -#endif /* LARGE_OBJECT_H */ +#endif /* LARGE_OBJECT_H */ diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h index 4dbecc07df..3b59f56267 100644 --- a/src/include/storage/lmgr.h +++ b/src/include/storage/lmgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lmgr.h,v 1.34 2001/10/28 06:26:09 momjian Exp $ + * $Id: lmgr.h,v 1.35 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,4 +62,4 @@ extern void UnlockPage(Relation relation, BlockNumber blkno, LOCKMODE lockmode); extern void XactLockTableInsert(TransactionId xid); extern void XactLockTableWait(TransactionId xid); -#endif /* LMGR_H */ +#endif /* LMGR_H */ diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index e21d0ff506..6b319b74e3 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lock.h,v 1.58 2001/10/28 06:26:09 momjian Exp $ + * $Id: lock.h,v 1.59 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,7 +38,7 @@ extern bool Trace_locks; extern bool Trace_userlocks; extern int Trace_lock_table; extern bool Debug_deadlocks; -#endif /* LOCK_DEBUG */ +#endif /* LOCK_DEBUG */ typedef int LOCKMASK; @@ -252,4 +252,4 @@ extern void DumpLocks(void); extern void DumpAllLocks(void); #endif -#endif /* LOCK_H */ +#endif /* LOCK_H */ diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h index 02bb9b5b45..4db2d7e2c0 100644 --- a/src/include/storage/lwlock.h +++ b/src/include/storage/lwlock.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lwlock.h,v 1.3 2001/10/28 06:26:09 momjian Exp $ + * $Id: lwlock.h,v 1.4 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,4 +67,4 @@ extern int NumLWLocks(void); extern int LWLockShmemSize(void); extern void CreateLWLocks(void); -#endif /* LWLOCK_H */ +#endif /* LWLOCK_H */ diff --git a/src/include/storage/off.h b/src/include/storage/off.h index 7af9032c8e..f7daa69171 100644 --- a/src/include/storage/off.h +++ b/src/include/storage/off.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: off.h,v 1.12 2001/10/28 06:26:09 momjian Exp $ + * $Id: off.h,v 1.13 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -55,4 +55,4 @@ typedef uint16 OffsetNumber; #define OffsetNumberPrev(offsetNumber) \ ((OffsetNumber) (-1 + (offsetNumber))) -#endif /* OFF_H */ +#endif /* OFF_H */ diff --git a/src/include/storage/page.h b/src/include/storage/page.h index be2ab631f3..73c6a5cdc1 100644 --- a/src/include/storage/page.h +++ b/src/include/storage/page.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: page.h,v 1.10 2001/10/28 06:26:09 momjian Exp $ + * $Id: page.h,v 1.11 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ typedef Pointer Page; */ #define PageIsValid(page) PointerIsValid(page) -#endif /* PAGE_H */ +#endif /* PAGE_H */ diff --git a/src/include/storage/pmsignal.h b/src/include/storage/pmsignal.h index f86c06656e..1536929f59 100644 --- a/src/include/storage/pmsignal.h +++ b/src/include/storage/pmsignal.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: pmsignal.h,v 1.1 2001/11/04 19:55:31 tgl Exp $ + * $Id: pmsignal.h,v 1.2 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,7 @@ typedef enum PMSIGNAL_WAKEN_CHILDREN, /* send a NOTIFY signal to all backends */ NUM_PMSIGNALS /* Must be last value of enum! */ -} PMSignalReason; +} PMSignalReason; /* * prototypes for functions in pmsignal.c @@ -36,4 +36,4 @@ extern void PMSignalInit(void); extern void SendPostmasterSignal(PMSignalReason reason); extern bool CheckPostmasterSignal(PMSignalReason reason); -#endif /* PMSIGNAL_H */ +#endif /* PMSIGNAL_H */ diff --git a/src/include/storage/pos.h b/src/include/storage/pos.h index e42c7fa521..5b2392c921 100644 --- a/src/include/storage/pos.h +++ b/src/include/storage/pos.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pos.h,v 1.12 2001/10/28 06:26:09 momjian Exp $ + * $Id: pos.h,v 1.13 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,4 +62,4 @@ typedef PositionIdData *PositionId; #define PositionIdGetOffsetNumber(positionId) \ ((OffsetNumber) *(positionId)) -#endif /* POS_H */ +#endif /* POS_H */ diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 43be9f043a..cba32ecec2 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: proc.h,v 1.52 2001/10/28 06:26:09 momjian Exp $ + * $Id: proc.h,v 1.53 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -153,4 +153,4 @@ extern void ProcSendSignal(BackendId procId); extern bool enable_sigalrm_interrupt(int delayms); extern bool disable_sigalrm_interrupt(void); -#endif /* PROC_H */ +#endif /* PROC_H */ diff --git a/src/include/storage/relfilenode.h b/src/include/storage/relfilenode.h index c53dea8f39..715dc00f7d 100644 --- a/src/include/storage/relfilenode.h +++ b/src/include/storage/relfilenode.h @@ -19,4 +19,4 @@ typedef struct RelFileNode ((node1).relNode == (node2).relNode && \ (node1).tblNode == (node2).tblNode) -#endif /* RELFILENODE_H */ +#endif /* RELFILENODE_H */ diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h index 37ee5694ac..9d0821c986 100644 --- a/src/include/storage/shmem.h +++ b/src/include/storage/shmem.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: shmem.h,v 1.35 2001/10/28 06:26:09 momjian Exp $ + * $Id: shmem.h,v 1.36 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -96,4 +96,4 @@ extern Pointer SHMQueueNext(SHM_QUEUE *queue, SHM_QUEUE *curElem, Size linkOffset); extern bool SHMQueueEmpty(SHM_QUEUE *queue); -#endif /* SHMEM_H */ +#endif /* SHMEM_H */ diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h index 2e93d4293e..af88e066e2 100644 --- a/src/include/storage/sinval.h +++ b/src/include/storage/sinval.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sinval.h,v 1.24 2001/10/28 06:26:09 momjian Exp $ + * $Id: sinval.h,v 1.25 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -79,4 +79,4 @@ extern int CountActiveBackends(void); /* Use "struct PROC", not PROC, to avoid including proc.h here */ extern struct PROC *BackendIdGetProc(BackendId procId); -#endif /* SINVAL_H */ +#endif /* SINVAL_H */ diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h index aca1224e3b..824e978e95 100644 --- a/src/include/storage/sinvaladt.h +++ b/src/include/storage/sinvaladt.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sinvaladt.h,v 1.29 2001/10/28 06:26:09 momjian Exp $ + * $Id: sinvaladt.h,v 1.30 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -115,4 +115,4 @@ extern int SIGetDataEntry(SISeg *segP, int backendId, SharedInvalidationMessage *data); extern void SIDelExpiredDataEntries(SISeg *segP); -#endif /* SINVALADT_H */ +#endif /* SINVALADT_H */ diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h index 9a10232eba..41edb4e688 100644 --- a/src/include/storage/smgr.h +++ b/src/include/storage/smgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: smgr.h,v 1.33 2001/10/28 06:26:09 momjian Exp $ + * $Id: smgr.h,v 1.34 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -108,4 +108,4 @@ extern Datum smgrin(PG_FUNCTION_ARGS); extern Datum smgreq(PG_FUNCTION_ARGS); extern Datum smgrne(PG_FUNCTION_ARGS); -#endif /* SMGR_H */ +#endif /* SMGR_H */ diff --git a/src/include/storage/spin.h b/src/include/storage/spin.h index 2ef7f6de8a..6ec0552ca6 100644 --- a/src/include/storage/spin.h +++ b/src/include/storage/spin.h @@ -40,7 +40,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: spin.h,v 1.18 2001/10/28 06:26:09 momjian Exp $ + * $Id: spin.h,v 1.19 2001/11/05 17:46:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -74,4 +74,4 @@ extern void CreateSpinlocks(void); -#endif /* SPIN_H */ +#endif /* SPIN_H */ diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h index 9e81da4890..e23eb6bc58 100644 --- a/src/include/tcop/dest.h +++ b/src/include/tcop/dest.h @@ -39,7 +39,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dest.h,v 1.27 2001/10/28 06:26:09 momjian Exp $ + * $Id: dest.h,v 1.28 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -98,4 +98,4 @@ extern void NullCommand(CommandDest dest); extern void ReadyForQuery(CommandDest dest); extern void UpdateCommandInfo(int operation, Oid lastoid, uint32 tuples); -#endif /* DEST_H */ +#endif /* DEST_H */ diff --git a/src/include/tcop/fastpath.h b/src/include/tcop/fastpath.h index 901504bfd8..a64b953c42 100644 --- a/src/include/tcop/fastpath.h +++ b/src/include/tcop/fastpath.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fastpath.h,v 1.11 2001/10/28 06:26:09 momjian Exp $ + * $Id: fastpath.h,v 1.12 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,4 +15,4 @@ extern int HandleFunctionRequest(void); -#endif /* FASTPATH_H */ +#endif /* FASTPATH_H */ diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h index 29bd0f7e17..dbca9de8c6 100644 --- a/src/include/tcop/pquery.h +++ b/src/include/tcop/pquery.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pquery.h,v 1.18 2001/10/28 06:26:09 momjian Exp $ + * $Id: pquery.h,v 1.19 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,4 +24,4 @@ extern EState *CreateExecutorState(void); extern Portal PreparePortal(char *portalName); -#endif /* PQUERY_H */ +#endif /* PQUERY_H */ diff --git a/src/include/tcop/tcopdebug.h b/src/include/tcop/tcopdebug.h index 69e2285db2..efcdaf3e2b 100644 --- a/src/include/tcop/tcopdebug.h +++ b/src/include/tcop/tcopdebug.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tcopdebug.h,v 1.8 2001/10/28 06:26:09 momjian Exp $ + * $Id: tcopdebug.h,v 1.9 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,4 +41,4 @@ * ---------------------------------------------------------------- */ -#endif /* TCOPDEBUG_H */ +#endif /* TCOPDEBUG_H */ diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index 404c88c605..5b5d60e025 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tcopprot.h,v 1.45 2001/10/28 06:26:09 momjian Exp $ + * $Id: tcopprot.h,v 1.46 2001/11/05 17:46:36 momjian Exp $ * * OLD COMMENTS * This file was created so that other c files could get the two @@ -39,7 +39,7 @@ extern Plan *pg_plan_query(Query *querytree); extern void pg_exec_query_string(char *query_string, CommandDest dest, MemoryContext parse_context); -#endif /* BOOTSTRAP_INCLUDE */ +#endif /* BOOTSTRAP_INCLUDE */ extern void die(SIGNAL_ARGS); extern void quickdie(SIGNAL_ARGS); @@ -49,4 +49,4 @@ extern void ResetUsage(void); extern void ShowUsage(void); extern FILE *StatFp; -#endif /* TCOPPROT_H */ +#endif /* TCOPPROT_H */ diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h index 0cc271958f..8e05c424a4 100644 --- a/src/include/tcop/utility.h +++ b/src/include/tcop/utility.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: utility.h,v 1.12 2001/10/28 06:26:09 momjian Exp $ + * $Id: utility.h,v 1.13 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,4 +18,4 @@ extern void ProcessUtility(Node *parsetree, CommandDest dest); -#endif /* UTILITY_H */ +#endif /* UTILITY_H */ diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index 838936e93d..03f30fa1ce 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: acl.h,v 1.38 2001/10/28 06:26:09 momjian Exp $ + * $Id: acl.h,v 1.39 2001/11/05 17:46:36 momjian Exp $ * * NOTES * For backward-compatibility purposes we have to allow there @@ -208,4 +208,4 @@ extern bool pg_func_ownercheck(Oid userid, char *funcname, extern bool pg_aggr_ownercheck(Oid userid, char *aggname, Oid basetypeID); -#endif /* ACL_H */ +#endif /* ACL_H */ diff --git a/src/include/utils/array.h b/src/include/utils/array.h index 83fe685e49..ee0f915529 100644 --- a/src/include/utils/array.h +++ b/src/include/utils/array.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: array.h,v 1.30 2001/10/25 05:50:10 momjian Exp $ + * $Id: array.h,v 1.31 2001/11/05 17:46:36 momjian Exp $ * * NOTES * XXX the data array should be MAXALIGN'd -- currently we only INTALIGN @@ -127,4 +127,4 @@ extern void mda_get_prod(int n, int *range, int *prod); extern void mda_get_offset_values(int n, int *dist, int *prod, int *span); extern int mda_next_tuple(int n, int *curr, int *span); -#endif /* ARRAY_H */ +#endif /* ARRAY_H */ diff --git a/src/include/utils/ascii.h b/src/include/utils/ascii.h index 01777c761b..068cf61a6c 100644 --- a/src/include/utils/ascii.h +++ b/src/include/utils/ascii.h @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------- * ascii.h * - * $Id: ascii.h,v 1.7 2001/10/28 06:26:09 momjian Exp $ + * $Id: ascii.h,v 1.8 2001/11/05 17:46:36 momjian Exp $ * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group * @@ -22,6 +22,6 @@ extern Datum to_ascii_default(PG_FUNCTION_ARGS); extern char *pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *desc, int enc); -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ -#endif /* _ASCII_H_ */ +#endif /* _ASCII_H_ */ diff --git a/src/include/utils/bit.h b/src/include/utils/bit.h index 0d88ef9639..a5ece247ac 100644 --- a/src/include/utils/bit.h +++ b/src/include/utils/bit.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: bit.h,v 1.11 2001/10/28 06:26:09 momjian Exp $ + * $Id: bit.h,v 1.12 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,4 +35,4 @@ extern void BitArrayClearBit(BitArray bitArray, BitIndex bitIndex); */ extern bool BitArrayBitIsSet(BitArray bitArray, BitIndex bitIndex); -#endif /* BIT_H */ +#endif /* BIT_H */ diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index fdcc877538..e3bc621784 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.170 2001/10/28 06:26:09 momjian Exp $ + * $Id: builtins.h,v 1.171 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -608,4 +608,4 @@ extern int32 type_maximum_size(Oid type_oid, int32 typemod); extern Datum quote_ident(PG_FUNCTION_ARGS); extern Datum quote_literal(PG_FUNCTION_ARGS); -#endif /* BUILTINS_H */ +#endif /* BUILTINS_H */ diff --git a/src/include/utils/cash.h b/src/include/utils/cash.h index 07897fb0a5..034a79ac54 100644 --- a/src/include/utils/cash.h +++ b/src/include/utils/cash.h @@ -46,4 +46,4 @@ extern Datum cashsmaller(PG_FUNCTION_ARGS); extern Datum cash_words(PG_FUNCTION_ARGS); -#endif /* CASH_H */ +#endif /* CASH_H */ diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h index 00e4e5afe8..de5957441a 100644 --- a/src/include/utils/catcache.h +++ b/src/include/utils/catcache.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catcache.h,v 1.36 2001/10/28 06:26:09 momjian Exp $ + * $Id: catcache.h,v 1.37 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -103,4 +103,4 @@ extern void PrepareToInvalidateCacheTuple(Relation relation, HeapTuple tuple, void (*function) (int, Index, ItemPointer, Oid)); -#endif /* CATCACHE_H */ +#endif /* CATCACHE_H */ diff --git a/src/include/utils/date.h b/src/include/utils/date.h index dc83746acf..ca911c0f7f 100644 --- a/src/include/utils/date.h +++ b/src/include/utils/date.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: date.h,v 1.16 2001/10/28 06:26:09 momjian Exp $ + * $Id: date.h,v 1.17 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -124,4 +124,4 @@ extern Datum timetz_izone(PG_FUNCTION_ARGS); extern Datum timetz_pl_interval(PG_FUNCTION_ARGS); extern Datum timetz_mi_interval(PG_FUNCTION_ARGS); -#endif /* DATE_H */ +#endif /* DATE_H */ diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h index 31d43636dc..980c21eff6 100644 --- a/src/include/utils/datetime.h +++ b/src/include/utils/datetime.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: datetime.h,v 1.25 2001/10/28 06:26:09 momjian Exp $ + * $Id: datetime.h,v 1.26 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -190,7 +190,7 @@ typedef struct char *token; #else char token[TOKMAXLEN]; -#endif /* _AIX */ +#endif /* _AIX */ char type; char value; /* this may be unsigned, alas */ } datetkn; @@ -282,4 +282,4 @@ extern void ClearDateCache(bool); extern int j2day(int jd); -#endif /* DATETIME_H */ +#endif /* DATETIME_H */ diff --git a/src/include/utils/datum.h b/src/include/utils/datum.h index f67c3ae7a6..b7b1ce970c 100644 --- a/src/include/utils/datum.h +++ b/src/include/utils/datum.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: datum.h,v 1.15 2001/10/28 06:26:09 momjian Exp $ + * $Id: datum.h,v 1.16 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,4 +46,4 @@ extern void datumFree(Datum value, bool typByVal, int typLen); extern bool datumIsEqual(Datum value1, Datum value2, bool typByVal, int typLen); -#endif /* DATUM_H */ +#endif /* DATUM_H */ diff --git a/src/include/utils/dynahash.h b/src/include/utils/dynahash.h index 7c1ec1ae98..e6b0e73b91 100644 --- a/src/include/utils/dynahash.h +++ b/src/include/utils/dynahash.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dynahash.h,v 1.10 2001/10/28 06:26:09 momjian Exp $ + * $Id: dynahash.h,v 1.11 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,4 +16,4 @@ extern int my_log2(long num); -#endif /* DYNAHASH_H */ +#endif /* DYNAHASH_H */ diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h index 7bf248229a..c3c137e218 100644 --- a/src/include/utils/dynamic_loader.h +++ b/src/include/utils/dynamic_loader.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dynamic_loader.h,v 1.19 2001/10/28 06:26:09 momjian Exp $ + * $Id: dynamic_loader.h,v 1.20 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern PGFunction pg_dlsym(void *handle, char *funcname); extern void pg_dlclose(void *handle); extern char *pg_dlerror(void); -#endif /* DYNAMIC_LOADER_H */ +#endif /* DYNAMIC_LOADER_H */ diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index 9f537932b7..9c3b1f828c 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: elog.h,v 1.29 2001/10/28 06:26:09 momjian Exp $ + * $Id: elog.h,v 1.30 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,4 +41,4 @@ __attribute__((format(printf, 2, 3))); extern int DebugFileOpen(void); -#endif /* ELOG_H */ +#endif /* ELOG_H */ diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h index b4d841e301..72a09e4874 100644 --- a/src/include/utils/exc.h +++ b/src/include/utils/exc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: exc.h,v 1.21 2001/10/28 06:26:09 momjian Exp $ + * $Id: exc.h,v 1.22 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -85,4 +85,4 @@ extern void ExcRaise(Exception *excP, extern void ExcAbort(const Exception *excP, ExcDetail detail, ExcData data, ExcMessage message); -#endif /* EXC_H */ +#endif /* EXC_H */ diff --git a/src/include/utils/excid.h b/src/include/utils/excid.h index 8259b7a888..8ae5e703d6 100644 --- a/src/include/utils/excid.h +++ b/src/include/utils/excid.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: excid.h,v 1.12 2001/10/28 06:26:09 momjian Exp $ + * $Id: excid.h,v 1.13 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,4 @@ extern DLLIMPORT Exception SemanticError; /* XXX inconsistent naming * style */ extern DLLIMPORT Exception SystemError; /* XXX inconsistent naming style */ -#endif /* EXCID_H */ +#endif /* EXCID_H */ diff --git a/src/include/utils/fcache.h b/src/include/utils/fcache.h index e46eb90fe3..563812c871 100644 --- a/src/include/utils/fcache.h +++ b/src/include/utils/fcache.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fcache.h,v 1.19 2001/10/28 06:26:09 momjian Exp $ + * $Id: fcache.h,v 1.20 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,4 +67,4 @@ typedef struct FunctionCache extern FunctionCachePtr init_fcache(Oid foid, int nargs, MemoryContext fcacheCxt); -#endif /* FCACHE_H */ +#endif /* FCACHE_H */ diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h index e0c7852d39..17c327115f 100644 --- a/src/include/utils/fmgrtab.h +++ b/src/include/utils/fmgrtab.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fmgrtab.h,v 1.18 2001/10/28 06:26:09 momjian Exp $ + * $Id: fmgrtab.h,v 1.19 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,4 +37,4 @@ extern const FmgrBuiltin fmgr_builtins[]; extern const int fmgr_nbuiltins; /* number of entries in table */ -#endif /* FMGRTAB_H */ +#endif /* FMGRTAB_H */ diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h index 52171db152..4e9eb00008 100644 --- a/src/include/utils/geo_decls.h +++ b/src/include/utils/geo_decls.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geo_decls.h,v 1.36 2001/10/28 06:26:09 momjian Exp $ + * $Id: geo_decls.h,v 1.37 2001/11/05 17:46:36 momjian Exp $ * * NOTE * These routines do *not* use the float types from adt/. @@ -398,4 +398,4 @@ extern Datum positionjoinsel(PG_FUNCTION_ARGS); extern Datum contsel(PG_FUNCTION_ARGS); extern Datum contjoinsel(PG_FUNCTION_ARGS); -#endif /* GEO_DECLS_H */ +#endif /* GEO_DECLS_H */ diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index c75eda18c9..c4e9a44a3e 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -4,7 +4,7 @@ * External declarations pertaining to backend/utils/misc/guc.c and * backend/utils/misc/guc-file.l * - * $Id: guc.h,v 1.12 2001/10/28 06:26:09 momjian Exp $ + * $Id: guc.h,v 1.13 2001/11/05 17:46:36 momjian Exp $ */ #ifndef GUC_H #define GUC_H @@ -73,4 +73,4 @@ extern bool Show_btree_build_stats; extern bool SQL_inheritance; extern bool Australian_timezones; -#endif /* GUC_H */ +#endif /* GUC_H */ diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h index b8cbab4363..126bd71d91 100644 --- a/src/include/utils/hsearch.h +++ b/src/include/utils/hsearch.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: hsearch.h,v 1.24 2001/10/28 06:26:09 momjian Exp $ + * $Id: hsearch.h,v 1.25 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -167,4 +167,4 @@ extern long hash_select_dirsize(long num_entries); extern long string_hash(void *key, int keysize); extern long tag_hash(void *key, int keysize); -#endif /* HSEARCH_H */ +#endif /* HSEARCH_H */ diff --git a/src/include/utils/inet.h b/src/include/utils/inet.h index 9d0b990def..fc21258f76 100644 --- a/src/include/utils/inet.h +++ b/src/include/utils/inet.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: inet.h,v 1.11 2001/10/25 05:50:10 momjian Exp $ + * $Id: inet.h,v 1.12 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,4 +67,4 @@ typedef struct macaddr #define PG_GETARG_MACADDR_P(n) DatumGetMacaddrP(PG_GETARG_DATUM(n)) #define PG_RETURN_MACADDR_P(x) return MacaddrPGetDatum(x) -#endif /* INET_H */ +#endif /* INET_H */ diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h index 252a9ece7a..e2db00da38 100644 --- a/src/include/utils/int8.h +++ b/src/include/utils/int8.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: int8.h,v 1.30 2001/10/28 06:26:09 momjian Exp $ + * $Id: int8.h,v 1.31 2001/11/05 17:46:36 momjian Exp $ * * NOTES * These data types are supported on all 64-bit architectures, and may @@ -107,4 +107,4 @@ extern Datum dtoi8(PG_FUNCTION_ARGS); extern Datum int8_text(PG_FUNCTION_ARGS); extern Datum text_int8(PG_FUNCTION_ARGS); -#endif /* INT8_H */ +#endif /* INT8_H */ diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h index e025cc216f..25fb73d570 100644 --- a/src/include/utils/inval.h +++ b/src/include/utils/inval.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: inval.h,v 1.22 2001/10/28 06:26:09 momjian Exp $ + * $Id: inval.h,v 1.23 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,4 @@ extern void RelationInvalidateHeapTuple(Relation relation, HeapTuple tuple); extern void RelationMark4RollbackHeapTuple(Relation relation, HeapTuple tuple); -#endif /* INVAL_H */ +#endif /* INVAL_H */ diff --git a/src/include/utils/logtape.h b/src/include/utils/logtape.h index 721a065dd3..9b32953262 100644 --- a/src/include/utils/logtape.h +++ b/src/include/utils/logtape.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: logtape.h,v 1.6 2001/10/28 06:26:09 momjian Exp $ + * $Id: logtape.h,v 1.7 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,4 +39,4 @@ extern bool LogicalTapeSeek(LogicalTapeSet *lts, int tapenum, extern void LogicalTapeTell(LogicalTapeSet *lts, int tapenum, long *blocknum, int *offset); -#endif /* LOGTAPE_H */ +#endif /* LOGTAPE_H */ diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index ad5409ff08..97de455946 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lsyscache.h,v 1.38 2001/10/28 06:26:09 momjian Exp $ + * $Id: lsyscache.h,v 1.39 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,4 +57,4 @@ extern int32 get_usesysid(const char *username); #define TypeIsToastable(typid) (get_typstorage(typid) != 'p') -#endif /* LSYSCACHE_H */ +#endif /* LSYSCACHE_H */ diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h index 263a297830..db8a3e6c1e 100644 --- a/src/include/utils/memutils.h +++ b/src/include/utils/memutils.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: memutils.h,v 1.44 2001/10/25 05:50:10 momjian Exp $ + * $Id: memutils.h,v 1.45 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -116,4 +116,4 @@ extern MemoryContext AllocSetContextCreate(MemoryContext parent, #define ALLOCSET_DEFAULT_INITSIZE (8 * 1024) #define ALLOCSET_DEFAULT_MAXSIZE (8 * 1024 * 1024) -#endif /* MEMUTILS_H */ +#endif /* MEMUTILS_H */ diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h index 3f2ed80dd3..9ad2ff78e0 100644 --- a/src/include/utils/nabstime.h +++ b/src/include/utils/nabstime.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nabstime.h,v 1.34 2001/10/28 06:26:09 momjian Exp $ + * $Id: nabstime.h,v 1.35 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -160,4 +160,4 @@ extern AbsoluteTime GetCurrentAbsoluteTime(void); extern AbsoluteTime GetCurrentAbsoluteTimeUsec(int *usec); extern void abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char **tzn); -#endif /* NABSTIME_H */ +#endif /* NABSTIME_H */ diff --git a/src/include/utils/numeric.h b/src/include/utils/numeric.h index eda8d18d07..f6050dfc65 100644 --- a/src/include/utils/numeric.h +++ b/src/include/utils/numeric.h @@ -5,7 +5,7 @@ * * 1998 Jan Wieck * - * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.14 2001/10/28 06:26:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.15 2001/11/05 17:46:36 momjian Exp $ * * ---------- */ @@ -82,4 +82,4 @@ typedef NumericData *Numeric; #define PG_GETARG_NUMERIC_COPY(n) DatumGetNumericCopy(PG_GETARG_DATUM(n)) #define PG_RETURN_NUMERIC(x) return NumericGetDatum(x) -#endif /* _PG_NUMERIC_H_ */ +#endif /* _PG_NUMERIC_H_ */ diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index 8ba9132a44..d8cf653fd2 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -21,7 +21,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: palloc.h,v 1.17 2001/10/25 05:50:10 momjian Exp $ + * $Id: palloc.h,v 1.18 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,4 +63,4 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); #define pstrdup(str) MemoryContextStrdup(CurrentMemoryContext, (str)) -#endif /* PALLOC_H */ +#endif /* PALLOC_H */ diff --git a/src/include/utils/pg_crc.h b/src/include/utils/pg_crc.h index a1e1da7340..68c699cd74 100644 --- a/src/include/utils/pg_crc.h +++ b/src/include/utils/pg_crc.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_crc.h,v 1.5 2001/10/28 06:26:09 momjian Exp $ + * $Id: pg_crc.h,v 1.6 2001/11/05 17:46:36 momjian Exp $ */ #ifndef PG_CRC_H #define PG_CRC_H @@ -116,6 +116,6 @@ do { \ /* Constant table for CRC calculation */ extern const uint64 crc_table[]; -#endif /* INT64_IS_BUSTED */ +#endif /* INT64_IS_BUSTED */ -#endif /* PG_CRC_H */ +#endif /* PG_CRC_H */ diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h index d3d16d9780..03330682b7 100644 --- a/src/include/utils/pg_locale.h +++ b/src/include/utils/pg_locale.h @@ -4,7 +4,7 @@ * The PostgreSQL locale utils. * * - * $Id: pg_locale.h,v 1.10 2001/10/28 06:26:09 momjian Exp $ + * $Id: pg_locale.h,v 1.11 2001/11/05 17:46:36 momjian Exp $ * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group * @@ -51,6 +51,6 @@ extern void PGLC_free_categories(PG_LocaleCategories *lc); *------ */ extern struct lconv *PGLC_localeconv(void); -#endif /* USE_LOCALE */ +#endif /* USE_LOCALE */ -#endif /* _PG_LOCALE_ */ +#endif /* _PG_LOCALE_ */ diff --git a/src/include/utils/pg_lzcompress.h b/src/include/utils/pg_lzcompress.h index bc6dd8c3e0..862790cfb7 100644 --- a/src/include/utils/pg_lzcompress.h +++ b/src/include/utils/pg_lzcompress.h @@ -1,7 +1,7 @@ /* ---------- * pg_lzcompress.h - * - * $Header: /cvsroot/pgsql/src/include/utils/pg_lzcompress.h,v 1.7 2001/10/28 06:26:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/utils/pg_lzcompress.h,v 1.8 2001/11/05 17:46:36 momjian Exp $ * * Definitions for the builtin LZ compressor * ---------- @@ -228,4 +228,4 @@ int pglz_decompress(PGLZ_Header *source, char *dest); extern int pglz_get_next_decomp_char_from_lzdata(PGLZ_DecompState *dstate); extern int pglz_get_next_decomp_char_from_plain(PGLZ_DecompState *dstate); -#endif /* _PG_LZCOMPRESS_H_ */ +#endif /* _PG_LZCOMPRESS_H_ */ diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index 770b27f3f3..395409ad20 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.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: portal.h,v 1.30 2001/10/25 05:50:10 momjian Exp $ + * $Id: portal.h,v 1.31 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,4 +67,4 @@ extern void PortalSetQuery(Portal portal, QueryDesc *queryDesc, TupleDesc attinfo, EState *state, void (*cleanup) (Portal portal)); -#endif /* PORTAL_H */ +#endif /* PORTAL_H */ diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h index 8b12856e33..0dfed5fe27 100644 --- a/src/include/utils/ps_status.h +++ b/src/include/utils/ps_status.h @@ -4,7 +4,7 @@ * * Declarations for backend/utils/misc/ps_status.c * - * $Id: ps_status.h,v 1.22 2001/10/28 06:26:09 momjian Exp $ + * $Id: ps_status.h,v 1.23 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,4 @@ extern void set_ps_display(const char *activity); extern const char *get_ps_display(void); -#endif /* PS_STATUS_H */ +#endif /* PS_STATUS_H */ diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index 1e450d5e73..1bfcaa83de 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rel.h,v 1.54 2001/10/28 06:26:09 momjian Exp $ + * $Id: rel.h,v 1.55 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -280,4 +280,4 @@ typedef Relation *RelationPtr; /* added to prevent circular dependency. bjm 1999/11/15 */ extern char *get_temp_rel_by_physicalname(const char *relname); -#endif /* REL_H */ +#endif /* REL_H */ diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h index 6906520107..cd26563615 100644 --- a/src/include/utils/relcache.h +++ b/src/include/utils/relcache.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: relcache.h,v 1.28 2001/10/28 06:26:09 momjian Exp $ + * $Id: relcache.h,v 1.29 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -73,4 +73,4 @@ extern void DestroyDummyCaches(void); #define RELCACHE_INIT_FILENAME "pg_internal.init" -#endif /* RELCACHE_H */ +#endif /* RELCACHE_H */ diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h index 9e7d5ac5da..da5d4d0828 100644 --- a/src/include/utils/selfuncs.h +++ b/src/include/utils/selfuncs.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: selfuncs.h,v 1.3 2001/10/28 06:26:09 momjian Exp $ + * $Id: selfuncs.h,v 1.4 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -74,4 +74,4 @@ extern Datum rtcostestimate(PG_FUNCTION_ARGS); extern Datum hashcostestimate(PG_FUNCTION_ARGS); extern Datum gistcostestimate(PG_FUNCTION_ARGS); -#endif /* SELFUNCS_H */ +#endif /* SELFUNCS_H */ diff --git a/src/include/utils/sets.h b/src/include/utils/sets.h index 07c827c03b..cf4ebd2b15 100644 --- a/src/include/utils/sets.h +++ b/src/include/utils/sets.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sets.h,v 1.11 2001/10/28 06:26:09 momjian Exp $ + * $Id: sets.h,v 1.12 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,4 +24,4 @@ extern Oid SetDefine(char *querystr, char *typename); extern Datum seteval(PG_FUNCTION_ARGS); -#endif /* SETS_H */ +#endif /* SETS_H */ diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h index 2ec1986e67..5e7b2d864f 100644 --- a/src/include/utils/syscache.h +++ b/src/include/utils/syscache.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: syscache.h,v 1.35 2001/10/28 06:26:09 momjian Exp $ + * $Id: syscache.h,v 1.36 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -73,4 +73,4 @@ extern Oid GetSysCacheOid(int cacheId, extern Datum SysCacheGetAttr(int cacheId, HeapTuple tup, AttrNumber attributeNumber, bool *isNull); -#endif /* SYSCACHE_H */ +#endif /* SYSCACHE_H */ diff --git a/src/include/utils/temprel.h b/src/include/utils/temprel.h index fa3ed41cf3..a8a6a00568 100644 --- a/src/include/utils/temprel.h +++ b/src/include/utils/temprel.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: temprel.h,v 1.19 2001/10/28 06:26:10 momjian Exp $ + * $Id: temprel.h,v 1.20 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,4 +30,4 @@ extern char *get_temp_rel_by_physicalname(const char *relname); #define is_temp_rel_name(relname) (get_temp_rel_by_username(relname) != NULL) -#endif /* TEMPREL_H */ +#endif /* TEMPREL_H */ diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h index 3ac252b8ca..3ea20f3ea2 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: timestamp.h,v 1.23 2001/10/28 06:26:10 momjian Exp $ + * $Id: timestamp.h,v 1.24 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -181,4 +181,4 @@ extern void GetEpochTime(struct tm * tm); extern void isoweek2date(int woy, int *year, int *mon, int *mday); extern int date2isoweek(int year, int mon, int mday); -#endif /* TIMESTAMP_H */ +#endif /* TIMESTAMP_H */ diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h index 5a6c832fdd..070ee9cda1 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tqual.h,v 1.36 2001/10/28 06:26:10 momjian Exp $ + * $Id: tqual.h,v 1.37 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -111,4 +111,4 @@ extern Snapshot GetSnapshotData(bool serializable); extern void SetQuerySnapshot(void); extern void FreeXactSnapshot(void); -#endif /* TQUAL_H */ +#endif /* TQUAL_H */ diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h index f6baea7412..1989e144bd 100644 --- a/src/include/utils/tuplesort.h +++ b/src/include/utils/tuplesort.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tuplesort.h,v 1.10 2001/10/28 06:26:10 momjian Exp $ + * $Id: tuplesort.h,v 1.11 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -102,4 +102,4 @@ extern int32 ApplySortFunction(FmgrInfo *sortFunction, SortFunctionKind kind, Datum datum1, bool isNull1, Datum datum2, bool isNull2); -#endif /* TUPLESORT_H */ +#endif /* TUPLESORT_H */ diff --git a/src/include/utils/tuplestore.h b/src/include/utils/tuplestore.h index 1e253d178b..88f33e0da3 100644 --- a/src/include/utils/tuplestore.h +++ b/src/include/utils/tuplestore.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tuplestore.h,v 1.5 2001/10/28 06:26:10 momjian Exp $ + * $Id: tuplestore.h,v 1.6 2001/11/05 17:46:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,4 +57,4 @@ extern void tuplestore_rescan(Tuplestorestate *state); extern void tuplestore_markpos(Tuplestorestate *state); extern void tuplestore_restorepos(Tuplestorestate *state); -#endif /* TUPLESTORE_H */ +#endif /* TUPLESTORE_H */ diff --git a/src/interfaces/ecpg/include/ecpgerrno.h b/src/interfaces/ecpg/include/ecpgerrno.h index 49e6269d8a..5723e12621 100644 --- a/src/interfaces/ecpg/include/ecpgerrno.h +++ b/src/interfaces/ecpg/include/ecpgerrno.h @@ -62,4 +62,4 @@ /* NOTICE: BlankPortalAssignName: portal * already exists */ #define ECPG_NOTICE_PORTAL_EXISTS -605 -#endif /* !_ECPG_ERROR_H */ +#endif /* !_ECPG_ERROR_H */ diff --git a/src/interfaces/ecpg/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h index acb022aa1b..7cd5d581a9 100644 --- a/src/interfaces/ecpg/include/ecpglib.h +++ b/src/interfaces/ecpg/include/ecpglib.h @@ -9,26 +9,26 @@ #ifndef __cplusplus #ifndef bool #define bool char -#endif /* ndef bool */ +#endif /* ndef bool */ #ifndef true #define true ((bool) 1) -#endif /* ndef true */ +#endif /* ndef true */ #ifndef false #define false ((bool) 0) -#endif /* ndef false */ -#endif /* not C++ */ +#endif /* ndef false */ +#endif /* not C++ */ #else /* __BEOS__ */ #include -#endif /* __BEOS__ */ +#endif /* __BEOS__ */ #ifndef TRUE #define TRUE 1 -#endif /* TRUE */ +#endif /* TRUE */ #ifndef FALSE #define FALSE 0 -#endif /* FALSE */ +#endif /* FALSE */ #ifdef __cplusplus extern "C" diff --git a/src/interfaces/ecpg/include/sqlca.h b/src/interfaces/ecpg/include/sqlca.h index 68e0f00839..e3abdf7878 100644 --- a/src/interfaces/ecpg/include/sqlca.h +++ b/src/interfaces/ecpg/include/sqlca.h @@ -6,8 +6,8 @@ #define DLLIMPORT __declspec (dllimport) #else #define DLLIMPORT -#endif /* __CYGWIN__ */ -#endif /* DLLIMPORT */ +#endif /* __CYGWIN__ */ +#endif /* DLLIMPORT */ #define SQLERRMC_LEN 70 diff --git a/src/interfaces/ecpg/lib/data.c b/src/interfaces/ecpg/lib/data.c index 6bfa8bfe75..0d4ec712b5 100644 --- a/src/interfaces/ecpg/lib/data.c +++ b/src/interfaces/ecpg/lib/data.c @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/data.c,v 1.17 2001/10/05 17:37:07 meskes Exp $ */ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/data.c,v 1.18 2001/11/05 17:46:37 momjian Exp $ */ #include "postgres_fe.h" @@ -70,7 +70,7 @@ get_data(const PGresult *results, int act_tuple, int act_field, int lineno, case ECPGt_unsigned_long_long: ((unsigned long long int *) ind)[act_tuple] = -PQgetisnull(results, act_tuple, act_field); break; -#endif /* HAVE_LONG_LONG_INT_64 */ +#endif /* HAVE_LONG_LONG_INT_64 */ case ECPGt_NO_INDICATOR: if (PQgetisnull(results, act_tuple, act_field)) { @@ -176,7 +176,7 @@ get_data(const PGresult *results, int act_tuple, int act_field, int lineno, ((long long int *) var)[act_tuple] = (long long) 0; break; -#endif /* HAVE_STRTOLL */ +#endif /* HAVE_STRTOLL */ #ifdef HAVE_STRTOULL case ECPGt_unsigned_long_long: if (pval) @@ -193,8 +193,8 @@ get_data(const PGresult *results, int act_tuple, int act_field, int lineno, ((unsigned long long int *) var)[act_tuple] = (long long) 0; break; -#endif /* HAVE_STRTOULL */ -#endif /* HAVE_LONG_LONG_INT_64 */ +#endif /* HAVE_STRTOULL */ +#endif /* HAVE_LONG_LONG_INT_64 */ case ECPGt_float: case ECPGt_double: diff --git a/src/interfaces/ecpg/lib/descriptor.c b/src/interfaces/ecpg/lib/descriptor.c index af30723266..95e65d603e 100644 --- a/src/interfaces/ecpg/lib/descriptor.c +++ b/src/interfaces/ecpg/lib/descriptor.c @@ -1,6 +1,6 @@ /* dynamic SQL support routines * - * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/descriptor.c,v 1.17 2001/10/25 05:50:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/descriptor.c,v 1.18 2001/11/05 17:46:37 momjian Exp $ */ #include "postgres_fe.h" @@ -86,7 +86,7 @@ get_int_item(int lineno, void *var, enum ECPGttype vartype, int value) case ECPGt_unsigned_long_long: *(unsigned long long int *) var = (unsigned long long int) value; break; -#endif /* HAVE_LONG_LONG_INT_64 */ +#endif /* HAVE_LONG_LONG_INT_64 */ case ECPGt_float: *(float *) var = (float) value; break; diff --git a/src/interfaces/ecpg/lib/execute.c b/src/interfaces/ecpg/lib/execute.c index a979b55447..57fd5c7767 100644 --- a/src/interfaces/ecpg/lib/execute.c +++ b/src/interfaces/ecpg/lib/execute.c @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.30 2001/10/28 06:26:11 momjian Exp $ */ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.31 2001/11/05 17:46:37 momjian Exp $ */ /* * The aim is to get a simpler inteface to the database routines. @@ -76,7 +76,7 @@ static struct auto_mem { void *pointer; struct auto_mem *next; -} *auto_allocs = NULL; +} *auto_allocs = NULL; static void add_mem(void *ptr, int lineno) @@ -503,7 +503,7 @@ ECPGstore_input(const struct statement * stmt, const struct variable * var, if (*(long long int *) var->ind_value < (long long) 0) *tobeinserted_p = "null"; break; -#endif /* HAVE_LONG_LONG_INT_64 */ +#endif /* HAVE_LONG_LONG_INT_64 */ default: break; } @@ -673,7 +673,7 @@ ECPGstore_input(const struct statement * stmt, const struct variable * var, *tobeinserted_p = mallocedval; *malloced_p = true; break; -#endif /* HAVE_LONG_LONG_INT_64 */ +#endif /* HAVE_LONG_LONG_INT_64 */ case ECPGt_float: if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno))) return false; diff --git a/src/interfaces/ecpg/lib/pg_type.h b/src/interfaces/ecpg/lib/pg_type.h index cd2c5273f4..5ebe0faed1 100644 --- a/src/interfaces/ecpg/lib/pg_type.h +++ b/src/interfaces/ecpg/lib/pg_type.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_type.h,v 1.4 2001/10/28 06:26:11 momjian Exp $ + * $Id: pg_type.h,v 1.5 2001/11/05 17:46:37 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -69,4 +69,4 @@ #define VARBITOID 1562 #define NUMERICOID 1700 -#endif /* PG_TYPE_H */ +#endif /* PG_TYPE_H */ diff --git a/src/interfaces/ecpg/lib/prepare.c b/src/interfaces/ecpg/lib/prepare.c index e6898b0be0..e096076879 100644 --- a/src/interfaces/ecpg/lib/prepare.c +++ b/src/interfaces/ecpg/lib/prepare.c @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/prepare.c,v 1.9 2001/10/28 06:26:11 momjian Exp $ */ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/prepare.c,v 1.10 2001/11/05 17:46:37 momjian Exp $ */ #include "postgres_fe.h" @@ -15,7 +15,7 @@ static struct prepared_statement char *name; struct statement *stmt; struct prepared_statement *next; -} *prep_stmts = NULL; +} *prep_stmts = NULL; static bool isvarchar(unsigned char c) diff --git a/src/interfaces/libpgtcl/libpgtcl.h b/src/interfaces/libpgtcl/libpgtcl.h index 5b72c80c19..b19dac0a86 100644 --- a/src/interfaces/libpgtcl/libpgtcl.h +++ b/src/interfaces/libpgtcl/libpgtcl.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpgtcl.h,v 1.13 2001/10/28 06:26:11 momjian Exp $ + * $Id: libpgtcl.h,v 1.14 2001/11/05 17:46:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,4 @@ extern int Pgtcl_Init(Tcl_Interp *interp); extern int Pgtcl_SafeInit(Tcl_Interp *interp); -#endif /* LIBPGTCL_H */ +#endif /* LIBPGTCL_H */ diff --git a/src/interfaces/libpgtcl/pgtclCmds.c b/src/interfaces/libpgtcl/pgtclCmds.c index f3b4cf95f5..acd40895c7 100644 --- a/src/interfaces/libpgtcl/pgtclCmds.c +++ b/src/interfaces/libpgtcl/pgtclCmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.58 2001/10/25 05:50:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.59 2001/11/05 17:46:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -223,7 +223,7 @@ tcl_value(char *value) #endif return value; } -#endif /* TCL_ARRAYS */ +#endif /* TCL_ARRAYS */ /********************************** diff --git a/src/interfaces/libpgtcl/pgtclCmds.h b/src/interfaces/libpgtcl/pgtclCmds.h index 9c53d82a7e..2f994d048d 100644 --- a/src/interfaces/libpgtcl/pgtclCmds.h +++ b/src/interfaces/libpgtcl/pgtclCmds.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pgtclCmds.h,v 1.24 2001/10/28 06:26:11 momjian Exp $ + * $Id: pgtclCmds.h,v 1.25 2001/11/05 17:46:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -48,7 +48,7 @@ typedef struct Pg_TclNotifies_s * got round to deleting the Pg_TclNotifies structure. */ Tcl_HashTable notify_hash; /* Active pg_listen requests */ -} Pg_TclNotifies; +} Pg_TclNotifies; typedef struct Pg_ConnectionId_s { @@ -70,7 +70,7 @@ typedef struct Pg_ConnectionId_s #else int notifier_socket; /* PQsocket on which notifier is listening */ #endif -} Pg_ConnectionId; +} Pg_ConnectionId; /* Values of res_copyStatus */ #define RES_COPY_NONE 0 @@ -129,4 +129,4 @@ extern int Pg_lo_export( extern int Pg_listen( ClientData cData, Tcl_Interp *interp, int argc, char *argv[]); -#endif /* PGTCLCMDS_H */ +#endif /* PGTCLCMDS_H */ diff --git a/src/interfaces/libpgtcl/pgtclId.c b/src/interfaces/libpgtcl/pgtclId.c index 06c3f3e18e..febe04f391 100644 --- a/src/interfaces/libpgtcl/pgtclId.c +++ b/src/interfaces/libpgtcl/pgtclId.c @@ -13,7 +13,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclId.c,v 1.28 2001/10/25 05:50:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclId.c,v 1.29 2001/11/05 17:46:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -497,7 +497,7 @@ typedef struct Tcl_Event header; /* Standard Tcl event info */ PGnotify info; /* Notify name from SQL server */ Pg_ConnectionId *connid; /* Connection for server */ -} NotifyEvent; +} NotifyEvent; /* Dispatch a NotifyEvent that has reached the front of the event queue */ diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c index 8cfc1d940f..f5f1ab6804 100644 --- a/src/interfaces/libpq/fe-auth.c +++ b/src/interfaces/libpq/fe-auth.c @@ -10,7 +10,7 @@ * exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes). * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.62 2001/10/25 05:50:13 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.63 2001/11/05 17:46:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -86,17 +86,17 @@ static const struct authsvc authsvcs[] = { #ifdef KRB4 {"krb4", STARTUP_KRB4_MSG, 1}, {"kerberos", STARTUP_KRB4_MSG, 1}, -#endif /* KRB4 */ +#endif /* KRB4 */ #ifdef KRB5 {"krb5", STARTUP_KRB5_MSG, 1}, {"kerberos", STARTUP_KRB5_MSG, 1}, -#endif /* KRB5 */ +#endif /* KRB5 */ {UNAUTHNAME, STARTUP_MSG, #if defined(KRB4) || defined(KRB5) 0 #else /* !(KRB4 || KRB5) */ 1 -#endif /* !(KRB4 || KRB5) */ +#endif /* !(KRB4 || KRB5) */ }, {"password", STARTUP_PASSWORD_MSG, 0} }; @@ -231,7 +231,7 @@ pg_krb4_sendauth(char *PQerrormsg, int sock, } return STATUS_OK; } -#endif /* KRB4 */ +#endif /* KRB4 */ #ifdef KRB5 /* @@ -431,7 +431,7 @@ pg_krb5_sendauth(char *PQerrormsg, int sock, return ret; } -#endif /* KRB5 */ +#endif /* KRB5 */ static int pg_local_sendauth(char *PQerrormsg, PGconn *conn) diff --git a/src/interfaces/libpq/fe-auth.h b/src/interfaces/libpq/fe-auth.h index 979ac078b5..8036158e07 100644 --- a/src/interfaces/libpq/fe-auth.h +++ b/src/interfaces/libpq/fe-auth.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fe-auth.h,v 1.14 2001/10/28 06:26:12 momjian Exp $ + * $Id: fe-auth.h,v 1.15 2001/11/05 17:46:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,7 +31,7 @@ #define DEFAULT_CLIENT_AUTHSVC UNAUTHNAME #else /* KRB4 || KRB5 */ #define DEFAULT_CLIENT_AUTHSVC "kerberos" -#endif /* KRB4 || KRB5 */ +#endif /* KRB4 || KRB5 */ extern int fe_sendauth(AuthRequest areq, PGconn *conn, const char *hostname, const char *password, char *PQerrormsg); @@ -42,4 +42,4 @@ extern char *fe_getauthname(char *PQerrormsg); #define PG_KRB4_VERSION "PGVER4.1" /* at most KRB_SENDAUTH_VLEN chars */ #define PG_KRB5_VERSION "PGVER5.1" -#endif /* FE_AUTH_H */ +#endif /* FE_AUTH_H */ diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index fa000f3959..b6d40303d7 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.179 2001/10/28 06:26:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.180 2001/11/05 17:46:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -147,7 +147,7 @@ static const struct EnvironmentOptions { const char *envName, *pgName; -} EnvironmentOptions[] = +} EnvironmentOptions[] = { /* common user-interface settings */ @@ -672,7 +672,7 @@ update_db_info(PGconn *conn) return 0; } -#endif /* NOT_USED */ +#endif /* NOT_USED */ /* ---------- @@ -1822,7 +1822,7 @@ PQsetenv(PGconn *conn) flag = PQsetenvPoll(conn); } } -#endif /* NOT_USED */ +#endif /* NOT_USED */ /* diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index 2257cbd47b..66c142ce17 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -25,7 +25,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.59 2001/10/28 06:26:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.60 2001/11/05 17:46:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -830,7 +830,7 @@ PQenv2encoding(void) { return 0; } -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ #ifdef ENABLE_NLS @@ -847,7 +847,7 @@ libpq_gettext(const char *msgid) return dgettext("libpq", msgid); } -#endif /* ENABLE_NLS */ +#endif /* ENABLE_NLS */ #ifdef WIN32 /* diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index 3681737774..074aebf419 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-fe.h,v 1.78 2001/11/02 20:51:27 tgl Exp $ + * $Id: libpq-fe.h,v 1.79 2001/11/05 17:46:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,68 +35,68 @@ extern "C" /* Application-visible enum types */ -typedef enum -{ - /* - * Although you may decide to change this list in some way, values - * which become unused should never be removed, nor should - * constants be redefined - that would break compatibility with - * existing code. - */ - CONNECTION_OK, - CONNECTION_BAD, - /* Non-blocking mode only below here */ - - /* - * The existence of these should never be relied upon - they - * should only be used for user feedback or similar purposes. - */ - CONNECTION_STARTED, /* Waiting for connection to be made. */ - CONNECTION_MADE, /* Connection OK; waiting to send. */ - CONNECTION_AWAITING_RESPONSE, /* Waiting for a response from the - * postmaster. */ - CONNECTION_AUTH_OK, /* Received authentication; waiting for - * backend startup. */ - CONNECTION_SETENV /* Negotiating environment. */ -} ConnStatusType; - -typedef enum -{ - PGRES_POLLING_FAILED = 0, - PGRES_POLLING_READING, /* These two indicate that one may */ - PGRES_POLLING_WRITING, /* use select before polling again. */ - PGRES_POLLING_OK, - PGRES_POLLING_ACTIVE /* Can call poll function immediately. */ -} PostgresPollingStatusType; - -typedef enum -{ - PGRES_EMPTY_QUERY = 0, - PGRES_COMMAND_OK, /* a query command that doesn't return - * anything was executed properly by the - * backend */ - PGRES_TUPLES_OK, /* a query command that returns tuples was - * executed properly by the backend, - * PGresult contains the result tuples */ - PGRES_COPY_OUT, /* Copy Out data transfer in progress */ - PGRES_COPY_IN, /* Copy In data transfer in progress */ - PGRES_BAD_RESPONSE, /* an unexpected response was recv'd from - * the backend */ - PGRES_NONFATAL_ERROR, - PGRES_FATAL_ERROR -} ExecStatusType; + typedef enum + { + /* + * Although you may decide to change this list in some way, values + * which become unused should never be removed, nor should + * constants be redefined - that would break compatibility with + * existing code. + */ + CONNECTION_OK, + CONNECTION_BAD, + /* Non-blocking mode only below here */ + + /* + * The existence of these should never be relied upon - they + * should only be used for user feedback or similar purposes. + */ + CONNECTION_STARTED, /* Waiting for connection to be made. */ + CONNECTION_MADE, /* Connection OK; waiting to send. */ + CONNECTION_AWAITING_RESPONSE, /* Waiting for a response from the + * postmaster. */ + CONNECTION_AUTH_OK, /* Received authentication; waiting for + * backend startup. */ + CONNECTION_SETENV /* Negotiating environment. */ + } ConnStatusType; + + typedef enum + { + PGRES_POLLING_FAILED = 0, + PGRES_POLLING_READING, /* These two indicate that one may */ + PGRES_POLLING_WRITING, /* use select before polling again. */ + PGRES_POLLING_OK, + PGRES_POLLING_ACTIVE /* Can call poll function immediately. */ + } PostgresPollingStatusType; + + typedef enum + { + PGRES_EMPTY_QUERY = 0, + PGRES_COMMAND_OK, /* a query command that doesn't return + * anything was executed properly by the + * backend */ + PGRES_TUPLES_OK, /* a query command that returns tuples was + * executed properly by the backend, + * PGresult contains the result tuples */ + PGRES_COPY_OUT, /* Copy Out data transfer in progress */ + PGRES_COPY_IN, /* Copy In data transfer in progress */ + PGRES_BAD_RESPONSE, /* an unexpected response was recv'd from + * the backend */ + PGRES_NONFATAL_ERROR, + PGRES_FATAL_ERROR + } ExecStatusType; /* PGconn encapsulates a connection to the backend. * The contents of this struct are not supposed to be known to applications. */ -typedef struct pg_conn PGconn; + typedef struct pg_conn PGconn; /* PGresult encapsulates the result of a query (or more precisely, of a single * SQL command --- a query string given to PQsendQuery can contain multiple * commands and thus return multiple PGresult objects). * The contents of this struct are not supposed to be known to applications. */ -typedef struct pg_result PGresult; + typedef struct pg_result PGresult; /* PGnotify represents the occurrence of a NOTIFY message. * Ideally this would be an opaque typedef, but it's so simple that it's @@ -104,35 +104,35 @@ typedef struct pg_result PGresult; * NOTE: in Postgres 6.4 and later, the be_pid is the notifying backend's, * whereas in earlier versions it was always your own backend's PID. */ -typedef struct pgNotify -{ - char relname[NAMEDATALEN]; /* name of relation - * containing data */ - int be_pid; /* process id of backend */ -} PGnotify; + typedef struct pgNotify + { + char relname[NAMEDATALEN]; /* name of relation + * containing data */ + int be_pid; /* process id of backend */ + } PGnotify; /* PQnoticeProcessor is the function type for the notice-message callback. */ -typedef void (*PQnoticeProcessor) (void *arg, const char *message); + typedef void (*PQnoticeProcessor) (void *arg, const char *message); /* Print options for PQprint() */ -typedef char pqbool; + typedef char pqbool; -typedef struct _PQprintOpt -{ - pqbool header; /* print output field headings and row - * count */ - pqbool align; /* fill align the fields */ - pqbool standard; /* old brain dead format */ - pqbool html3; /* output html tables */ - pqbool expanded; /* expand tables */ - pqbool pager; /* use pager for output if needed */ - char *fieldSep; /* field separator */ - char *tableOpt; /* insert to HTML */ - char *caption; /* HTML
*/ - char **fieldName; /* null terminated array of repalcement - * field names */ -} PQprintOpt; + typedef struct _PQprintOpt + { + pqbool header; /* print output field headings and row + * count */ + pqbool align; /* fill align the fields */ + pqbool standard; /* old brain dead format */ + pqbool html3; /* output html tables */ + pqbool expanded; /* expand tables */ + pqbool pager; /* use pager for output if needed */ + char *fieldSep; /* field separator */ + char *tableOpt; /* insert to HTML */ + char *caption; /* HTML
*/ + char **fieldName; /* null terminated array of repalcement + * field names */ + } PQprintOpt; /* ---------------- * Structure for the conninfo parameter definitions returned by PQconndefaults @@ -142,35 +142,35 @@ typedef struct _PQprintOpt * will release both the val strings and the PQconninfoOption array itself. * ---------------- */ -typedef struct _PQconninfoOption -{ - char *keyword; /* The keyword of the option */ - char *envvar; /* Fallback environment variable name */ - char *compiled; /* Fallback compiled in default value */ - char *val; /* Option's current value, or NULL */ - char *label; /* Label for field in connect dialog */ - char *dispchar; /* Character to display for this field in - * a connect dialog. Values are: "" - * Display entered value as is "*" - * Password field - hide value "D" Debug - * option - don't show by default */ - int dispsize; /* Field size in characters for dialog */ -} PQconninfoOption; + typedef struct _PQconninfoOption + { + char *keyword; /* The keyword of the option */ + char *envvar; /* Fallback environment variable name */ + char *compiled; /* Fallback compiled in default value */ + char *val; /* Option's current value, or NULL */ + char *label; /* Label for field in connect dialog */ + char *dispchar; /* Character to display for this field in + * a connect dialog. Values are: "" + * Display entered value as is "*" + * Password field - hide value "D" Debug + * option - don't show by default */ + int dispsize; /* Field size in characters for dialog */ + } PQconninfoOption; /* ---------------- * PQArgBlock -- structure for PQfn() arguments * ---------------- */ -typedef struct -{ - int len; - int isint; - union + typedef struct { - int *ptr; /* can't use void (dec compiler barfs) */ - int integer; - } u; -} PQArgBlock; + int len; + int isint; + union + { + int *ptr; /* can't use void (dec compiler barfs) */ + int integer; + } u; + } PQArgBlock; /* ---------------- * Exported functions of libpq @@ -181,197 +181,198 @@ typedef struct /* make a new client connection to the backend */ /* Asynchronous (non-blocking) */ -extern PGconn *PQconnectStart(const char *conninfo); -extern PostgresPollingStatusType PQconnectPoll(PGconn *conn); + extern PGconn *PQconnectStart(const char *conninfo); + extern PostgresPollingStatusType PQconnectPoll(PGconn *conn); /* Synchronous (blocking) */ -extern PGconn *PQconnectdb(const char *conninfo); -extern PGconn *PQsetdbLogin(const char *pghost, const char *pgport, - const char *pgoptions, const char *pgtty, - const char *dbName, - const char *login, const char *pwd); + extern PGconn *PQconnectdb(const char *conninfo); + extern PGconn *PQsetdbLogin(const char *pghost, const char *pgport, + const char *pgoptions, const char *pgtty, + const char *dbName, + const char *login, const char *pwd); #define PQsetdb(M_PGHOST,M_PGPORT,M_PGOPT,M_PGTTY,M_DBNAME) \ PQsetdbLogin(M_PGHOST, M_PGPORT, M_PGOPT, M_PGTTY, M_DBNAME, NULL, NULL) /* close the current connection and free the PGconn data structure */ -extern void PQfinish(PGconn *conn); + extern void PQfinish(PGconn *conn); /* get info about connection options known to PQconnectdb */ -extern PQconninfoOption *PQconndefaults(void); + extern PQconninfoOption *PQconndefaults(void); /* free the data structure returned by PQconndefaults() */ -extern void PQconninfoFree(PQconninfoOption *connOptions); + extern void PQconninfoFree(PQconninfoOption *connOptions); /* * close the current connection and restablish a new one with the same * parameters */ /* Asynchronous (non-blocking) */ -extern int PQresetStart(PGconn *conn); -extern PostgresPollingStatusType PQresetPoll(PGconn *conn); + extern int PQresetStart(PGconn *conn); + extern PostgresPollingStatusType PQresetPoll(PGconn *conn); /* Synchronous (blocking) */ -extern void PQreset(PGconn *conn); + extern void PQreset(PGconn *conn); /* issue a cancel request */ -extern int PQrequestCancel(PGconn *conn); + extern int PQrequestCancel(PGconn *conn); /* Accessor functions for PGconn objects */ -extern char *PQdb(const PGconn *conn); -extern char *PQuser(const PGconn *conn); -extern char *PQpass(const PGconn *conn); -extern char *PQhost(const PGconn *conn); -extern char *PQport(const PGconn *conn); -extern char *PQtty(const PGconn *conn); -extern char *PQoptions(const PGconn *conn); -extern ConnStatusType PQstatus(const PGconn *conn); -extern char *PQerrorMessage(const PGconn *conn); -extern int PQsocket(const PGconn *conn); -extern int PQbackendPID(const PGconn *conn); -extern int PQclientEncoding(const PGconn *conn); -extern int PQsetClientEncoding(PGconn *conn, const char *encoding); + extern char *PQdb(const PGconn *conn); + extern char *PQuser(const PGconn *conn); + extern char *PQpass(const PGconn *conn); + extern char *PQhost(const PGconn *conn); + extern char *PQport(const PGconn *conn); + extern char *PQtty(const PGconn *conn); + extern char *PQoptions(const PGconn *conn); + extern ConnStatusType PQstatus(const PGconn *conn); + extern char *PQerrorMessage(const PGconn *conn); + extern int PQsocket(const PGconn *conn); + extern int PQbackendPID(const PGconn *conn); + extern int PQclientEncoding(const PGconn *conn); + extern int PQsetClientEncoding(PGconn *conn, const char *encoding); #ifdef USE_SSL /* Get the SSL structure associated with a connection */ -extern SSL *PQgetssl(PGconn *conn); + extern SSL *PQgetssl(PGconn *conn); #endif /* Enable/disable tracing */ -extern void PQtrace(PGconn *conn, FILE *debug_port); -extern void PQuntrace(PGconn *conn); + extern void PQtrace(PGconn *conn, FILE *debug_port); + extern void PQuntrace(PGconn *conn); /* Override default notice processor */ -extern PQnoticeProcessor PQsetNoticeProcessor(PGconn *conn, - PQnoticeProcessor proc, - void *arg); + extern PQnoticeProcessor PQsetNoticeProcessor(PGconn *conn, + PQnoticeProcessor proc, + void *arg); /* === in fe-exec.c === */ /* Quoting strings before inclusion in queries. */ -extern size_t PQescapeString(char *to, const char *from, size_t length); -extern unsigned char *PQescapeBytea(unsigned char *bintext, size_t binlen, - size_t *bytealen); + extern size_t PQescapeString(char *to, const char *from, size_t length); + extern unsigned char *PQescapeBytea(unsigned char *bintext, size_t binlen, + size_t *bytealen); /* Simple synchronous query */ -extern PGresult *PQexec(PGconn *conn, const char *query); -extern PGnotify *PQnotifies(PGconn *conn); -extern void PQfreeNotify(PGnotify *notify); + extern PGresult *PQexec(PGconn *conn, const char *query); + extern PGnotify *PQnotifies(PGconn *conn); + extern void PQfreeNotify(PGnotify *notify); /* Interface for multiple-result or asynchronous queries */ -extern int PQsendQuery(PGconn *conn, const char *query); -extern PGresult *PQgetResult(PGconn *conn); + extern int PQsendQuery(PGconn *conn, const char *query); + extern PGresult *PQgetResult(PGconn *conn); /* Routines for managing an asychronous query */ -extern int PQisBusy(PGconn *conn); -extern int PQconsumeInput(PGconn *conn); + extern int PQisBusy(PGconn *conn); + extern int PQconsumeInput(PGconn *conn); /* Routines for copy in/out */ -extern int PQgetline(PGconn *conn, char *string, int length); -extern int PQputline(PGconn *conn, const char *string); -extern int PQgetlineAsync(PGconn *conn, char *buffer, int bufsize); -extern int PQputnbytes(PGconn *conn, const char *buffer, int nbytes); -extern int PQendcopy(PGconn *conn); + extern int PQgetline(PGconn *conn, char *string, int length); + extern int PQputline(PGconn *conn, const char *string); + extern int PQgetlineAsync(PGconn *conn, char *buffer, int bufsize); + extern int PQputnbytes(PGconn *conn, const char *buffer, int nbytes); + extern int PQendcopy(PGconn *conn); /* Set blocking/nonblocking connection to the backend */ -extern int PQsetnonblocking(PGconn *conn, int arg); -extern int PQisnonblocking(const PGconn *conn); + extern int PQsetnonblocking(PGconn *conn, int arg); + extern int PQisnonblocking(const PGconn *conn); /* Force the write buffer to be written (or at least try) */ -extern int PQflush(PGconn *conn); + extern int PQflush(PGconn *conn); /* * "Fast path" interface --- not really recommended for application * use */ -extern PGresult *PQfn(PGconn *conn, - int fnid, - int *result_buf, - int *result_len, - int result_is_int, - const PQArgBlock *args, - int nargs); + extern PGresult *PQfn(PGconn *conn, + int fnid, + int *result_buf, + int *result_len, + int result_is_int, + const PQArgBlock *args, + int nargs); /* Accessor functions for PGresult objects */ -extern ExecStatusType PQresultStatus(const PGresult *res); -extern char *PQresStatus(ExecStatusType status); -extern char *PQresultErrorMessage(const PGresult *res); -extern int PQntuples(const PGresult *res); -extern int PQnfields(const PGresult *res); -extern int PQbinaryTuples(const PGresult *res); -extern char *PQfname(const PGresult *res, int field_num); -extern int PQfnumber(const PGresult *res, const char *field_name); -extern Oid PQftype(const PGresult *res, int field_num); -extern int PQfsize(const PGresult *res, int field_num); -extern int PQfmod(const PGresult *res, int field_num); -extern char *PQcmdStatus(PGresult *res); -extern char *PQoidStatus(const PGresult *res); /* old and ugly */ -extern Oid PQoidValue(const PGresult *res); /* new and improved */ -extern char *PQcmdTuples(PGresult *res); -extern char *PQgetvalue(const PGresult *res, int tup_num, int field_num); -extern int PQgetlength(const PGresult *res, int tup_num, int field_num); -extern int PQgetisnull(const PGresult *res, int tup_num, int field_num); + extern ExecStatusType PQresultStatus(const PGresult *res); + extern char *PQresStatus(ExecStatusType status); + extern char *PQresultErrorMessage(const PGresult *res); + extern int PQntuples(const PGresult *res); + extern int PQnfields(const PGresult *res); + extern int PQbinaryTuples(const PGresult *res); + extern char *PQfname(const PGresult *res, int field_num); + extern int PQfnumber(const PGresult *res, const char *field_name); + extern Oid PQftype(const PGresult *res, int field_num); + extern int PQfsize(const PGresult *res, int field_num); + extern int PQfmod(const PGresult *res, int field_num); + extern char *PQcmdStatus(PGresult *res); + extern char *PQoidStatus(const PGresult *res); /* old and ugly */ + extern Oid PQoidValue(const PGresult *res); /* new and improved */ + extern char *PQcmdTuples(PGresult *res); + extern char *PQgetvalue(const PGresult *res, int tup_num, int field_num); + extern int PQgetlength(const PGresult *res, int tup_num, int field_num); + extern int PQgetisnull(const PGresult *res, int tup_num, int field_num); /* Delete a PGresult */ -extern void PQclear(PGresult *res); + extern void PQclear(PGresult *res); /* * Make an empty PGresult with given status (some apps find this * useful). If conn is not NULL and status indicates an error, the * conn's errorMessage is copied. */ -extern PGresult *PQmakeEmptyPGresult(PGconn *conn, ExecStatusType status); + extern PGresult *PQmakeEmptyPGresult(PGconn *conn, ExecStatusType status); /* === in fe-print.c === */ -extern void PQprint(FILE *fout, /* output stream */ - const PGresult *res, - const PQprintOpt *ps); /* option structure */ + extern void PQprint(FILE *fout, /* output stream */ + const PGresult *res, + const PQprintOpt *ps); /* option structure */ /* * really old printing routines */ -extern void PQdisplayTuples(const PGresult *res, - FILE *fp, /* where to send the output */ - int fillAlign, /* pad the fields with - * spaces */ - const char *fieldSep, /* field separator */ - int printHeader, /* display headers? */ - int quiet); - -extern void PQprintTuples(const PGresult *res, - FILE *fout, /* output stream */ - int printAttName, /* print attribute names */ - int terseOutput, /* delimiter bars */ - int width); /* width of column, if - * 0, use variable width */ + extern void PQdisplayTuples(const PGresult *res, + FILE *fp, /* where to send the + * output */ + int fillAlign, /* pad the fields with + * spaces */ + const char *fieldSep, /* field separator */ + int printHeader, /* display headers? */ + int quiet); + + extern void PQprintTuples(const PGresult *res, + FILE *fout, /* output stream */ + int printAttName, /* print attribute names */ + int terseOutput, /* delimiter bars */ + int width); /* width of column, if + * 0, use variable width */ /* === in fe-lobj.c === */ /* Large-object access routines */ -extern int lo_open(PGconn *conn, Oid lobjId, int mode); -extern int lo_close(PGconn *conn, int fd); -extern int lo_read(PGconn *conn, int fd, char *buf, size_t len); -extern int lo_write(PGconn *conn, int fd, char *buf, size_t len); -extern int lo_lseek(PGconn *conn, int fd, int offset, int whence); -extern Oid lo_creat(PGconn *conn, int mode); -extern int lo_tell(PGconn *conn, int fd); -extern int lo_unlink(PGconn *conn, Oid lobjId); -extern Oid lo_import(PGconn *conn, const char *filename); -extern int lo_export(PGconn *conn, Oid lobjId, const char *filename); + extern int lo_open(PGconn *conn, Oid lobjId, int mode); + extern int lo_close(PGconn *conn, int fd); + extern int lo_read(PGconn *conn, int fd, char *buf, size_t len); + extern int lo_write(PGconn *conn, int fd, char *buf, size_t len); + extern int lo_lseek(PGconn *conn, int fd, int offset, int whence); + extern Oid lo_creat(PGconn *conn, int mode); + extern int lo_tell(PGconn *conn, int fd); + extern int lo_unlink(PGconn *conn, Oid lobjId); + extern Oid lo_import(PGconn *conn, const char *filename); + extern int lo_export(PGconn *conn, Oid lobjId, const char *filename); /* === in fe-misc.c === */ /* Determine length of multibyte encoded char at *s */ -extern int PQmblen(const unsigned char *s, int encoding); + extern int PQmblen(const unsigned char *s, int encoding); /* Get encoding id from environment variable PGCLIENTENCODING */ -extern int PQenv2encoding(void); + extern int PQenv2encoding(void); #ifdef __cplusplus } #endif -#endif /* LIBPQ_FE_H */ +#endif /* LIBPQ_FE_H */ diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index 7001740d75..e4efc5e2e3 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-int.h,v 1.43 2001/11/02 20:51:27 tgl Exp $ + * $Id: libpq-int.h,v 1.44 2001/11/05 17:46:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -83,7 +83,7 @@ typedef struct pgresAttDesc Oid typid; /* type id */ int typlen; /* type size */ int atttypmod; /* type-specific modifier info */ -} PGresAttDesc; +} PGresAttDesc; /* Data for a single attribute of a single tuple */ @@ -108,7 +108,7 @@ typedef struct pgresAttValue int len; /* length in bytes of the value */ char *value; /* actual value, plus terminating zero * byte */ -} PGresAttValue; +} PGresAttValue; struct pg_result { @@ -165,7 +165,7 @@ typedef enum PGASYNC_READY, /* result ready for PQgetResult */ PGASYNC_COPY_IN, /* Copy In data transfer in progress */ PGASYNC_COPY_OUT /* Copy Out data transfer in progress */ -} PGAsyncStatusType; +} PGAsyncStatusType; /* PGSetenvStatusType defines the state of the PQSetenv state machine */ typedef enum @@ -176,7 +176,7 @@ typedef enum SETENV_STATE_ENCODINGS_SEND, /* About to send an "encodings" query */ SETENV_STATE_ENCODINGS_WAIT, /* Waiting for query to complete */ SETENV_STATE_IDLE -} PGSetenvStatusType; +} PGSetenvStatusType; /* large-object-access data ... allocated only if large-object code is used. */ typedef struct pgLobjfuncs @@ -189,7 +189,7 @@ typedef struct pgLobjfuncs Oid fn_lo_tell; /* OID of backend function lo_tell */ Oid fn_lo_read; /* OID of backend function LOread */ Oid fn_lo_write; /* OID of backend function LOwrite */ -} PGlobjfuncs; +} PGlobjfuncs; /* PGconn stores all the state data associated with a single connection * to a backend. @@ -365,4 +365,4 @@ __attribute__((format_arg(1))); #define SOCK_STRERROR strerror #endif -#endif /* LIBPQ_INT_H */ +#endif /* LIBPQ_INT_H */ diff --git a/src/interfaces/libpq/pqexpbuffer.h b/src/interfaces/libpq/pqexpbuffer.h index 1435b502b7..4ffc63eb8e 100644 --- a/src/interfaces/libpq/pqexpbuffer.h +++ b/src/interfaces/libpq/pqexpbuffer.h @@ -18,7 +18,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqexpbuffer.h,v 1.9 2001/10/28 06:26:12 momjian Exp $ + * $Id: pqexpbuffer.h,v 1.10 2001/11/05 17:46:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -161,4 +161,4 @@ extern void appendPQExpBufferChar(PQExpBuffer str, char ch); extern void appendBinaryPQExpBuffer(PQExpBuffer str, const char *data, size_t datalen); -#endif /* PQEXPBUFFER_H */ +#endif /* PQEXPBUFFER_H */ diff --git a/src/interfaces/libpq/pqsignal.c b/src/interfaces/libpq/pqsignal.c index 526601fd28..224778f443 100644 --- a/src/interfaces/libpq/pqsignal.c +++ b/src/interfaces/libpq/pqsignal.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/pqsignal.c,v 1.13 2001/01/24 19:43:31 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/pqsignal.c,v 1.14 2001/11/05 17:46:38 momjian Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -39,5 +39,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/interfaces/libpq/pqsignal.h b/src/interfaces/libpq/pqsignal.h index d36165b4f7..b4ca6402c0 100644 --- a/src/interfaces/libpq/pqsignal.h +++ b/src/interfaces/libpq/pqsignal.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqsignal.h,v 1.12 2001/10/28 06:26:12 momjian Exp $ + * $Id: pqsignal.h,v 1.13 2001/11/05 17:46:38 momjian Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -24,4 +24,4 @@ typedef void (*pqsigfunc) (int); extern pqsigfunc pqsignal(int signo, pqsigfunc func); -#endif /* PQSIGNAL_H */ +#endif /* PQSIGNAL_H */ diff --git a/src/interfaces/odbc/bind.h b/src/interfaces/odbc/bind.h index 363abb059b..34b9e1d399 100644 --- a/src/interfaces/odbc/bind.h +++ b/src/interfaces/odbc/bind.h @@ -22,7 +22,7 @@ struct BindInfoClass_ char *buffer; /* pointer to the buffer */ Int4 *used; /* used space in the buffer (for strings * not counting the '\0') */ - char *ttlbuf; /* to save the large result */ + char *ttlbuf; /* to save the large result */ Int4 ttlbuflen; /* the buffer length */ Int2 returntype; /* kind of conversion to be applied when * returning (SQL_C_DEFAULT, diff --git a/src/interfaces/odbc/connection.c b/src/interfaces/odbc/connection.c index c5aac61c4a..a8abb12d12 100644 --- a/src/interfaces/odbc/connection.c +++ b/src/interfaces/odbc/connection.c @@ -251,7 +251,7 @@ CC_Constructor() memset(&rv->connInfo, 0, sizeof(ConnInfo)); #ifdef DRIVER_CURSOR_IMPLEMENT rv->connInfo.updatable_cursors = 1; -#endif /* DRIVER_CURSOR_IMPLEMENT */ +#endif /* DRIVER_CURSOR_IMPLEMENT */ memcpy(&(rv->connInfo.drivers), &globals, sizeof(globals)); rv->sock = SOCK_Constructor(rv); if (!rv->sock) @@ -282,7 +282,7 @@ CC_Constructor() #ifdef MULTIBYTE rv->client_encoding = NULL; rv->server_encoding = NULL; -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ /* Initialize statement options to defaults */ @@ -313,7 +313,7 @@ CC_Destructor(ConnectionClass *self) free(self->client_encoding); if (self->server_encoding) free(self->server_encoding); -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ /* Free up statement holders */ if (self->stmts) { @@ -525,7 +525,7 @@ CC_connect(ConnectionClass *self, char do_password) #ifdef MULTIBYTE char *encoding; -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ mylog("%s: entering...\n", func); diff --git a/src/interfaces/odbc/connection.h b/src/interfaces/odbc/connection.h index f2c21604b1..a80c31b921 100644 --- a/src/interfaces/odbc/connection.h +++ b/src/interfaces/odbc/connection.h @@ -269,7 +269,7 @@ struct ConnectionClass_ #ifdef MULTIBYTE char *client_encoding; char *server_encoding; -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ }; diff --git a/src/interfaces/odbc/convert.c b/src/interfaces/odbc/convert.c index f284b16df9..59dab209f7 100644 --- a/src/interfaces/odbc/convert.c +++ b/src/interfaces/odbc/convert.c @@ -39,9 +39,9 @@ #include "pgapifunc.h" #ifdef __CYGWIN__ -#define TIMEZONE_GLOBAL _timezone +#define TIMEZONE_GLOBAL _timezone #elif defined(WIN32) || defined(HAVE_INT_TIMEZONE) -#define TIMEZONE_GLOBAL timezone +#define TIMEZONE_GLOBAL timezone #endif /* @@ -141,17 +141,20 @@ static char *conv_to_octal(unsigned char val); -/* +/* * TIMESTAMP <-----> SIMPLE_TIME * precision support since 7.2. * time zone support is unavailable(the stuff is unreliable) */ -static BOOL timestamp2stime(const char * str, SIMPLE_TIME *st, BOOL *bZone, int *zone) +static BOOL +timestamp2stime(const char *str, SIMPLE_TIME *st, BOOL *bZone, int *zone) { - char rest[64], *ptr; - int scnt, i; + char rest[64], + *ptr; + int scnt, + i; long timediff; - BOOL withZone = *bZone; + BOOL withZone = *bZone; *bZone = FALSE; *zone = 0; @@ -194,7 +197,7 @@ static BOOL timestamp2stime(const char * str, SIMPLE_TIME *st, BOOL *bZone, int st->fr = atoi(&rest[1]); break; default: - return TRUE; + return TRUE; } if (!withZone || !*bZone || st->y < 1970) return TRUE; @@ -205,11 +208,12 @@ static BOOL timestamp2stime(const char * str, SIMPLE_TIME *st, BOOL *bZone, int return TRUE; } timediff = TIMEZONE_GLOBAL + (*zone) * 3600; - if (!daylight && timediff == 0) /* the same timezone */ + if (!daylight && timediff == 0) /* the same timezone */ return TRUE; else { - struct tm tm, *tm2; + struct tm tm, + *tm2; time_t time0; *bZone = FALSE; @@ -225,7 +229,7 @@ static BOOL timestamp2stime(const char * str, SIMPLE_TIME *st, BOOL *bZone, int return TRUE; if (tm.tm_isdst > 0) timediff -= 3600; - if (timediff == 0) /* the same time zone */ + if (timediff == 0) /* the same time zone */ return TRUE; time0 -= timediff; if (time0 >= 0 && (tm2 = localtime(&time0)) != NULL) @@ -233,20 +237,22 @@ static BOOL timestamp2stime(const char * str, SIMPLE_TIME *st, BOOL *bZone, int st->y = tm2->tm_year + 1900; st->m = tm2->tm_mon + 1; st->d = tm2->tm_mday; - st->hh= tm2->tm_hour; - st->mm= tm2->tm_min; - st->ss= tm2->tm_sec; + st->hh = tm2->tm_hour; + st->mm = tm2->tm_min; + st->ss = tm2->tm_sec; *bZone = TRUE; } } -#endif /* WIN32 */ - return TRUE; +#endif /* WIN32 */ + return TRUE; } -static BOOL stime2timestamp(const SIMPLE_TIME *st, char * str, BOOL bZone, BOOL precision) +static BOOL +stime2timestamp(const SIMPLE_TIME *st, char *str, BOOL bZone, BOOL precision) { - char precstr[16], zonestr[16]; - int i; + char precstr[16], + zonestr[16]; + int i; precstr[0] = '\0'; if (precision && st->fr) @@ -263,13 +269,13 @@ static BOOL stime2timestamp(const SIMPLE_TIME *st, char * str, BOOL bZone, BOOL #if defined(WIN32) || defined(HAVE_INT_TIMEZONE) if (bZone && tzname[0] && tzname[0][0] && st->y >= 1970) { - long zoneint; + long zoneint; struct tm tm; time_t time0; zoneint = TIMEZONE_GLOBAL; - if (daylight && st->y >=1900) - { + if (daylight && st->y >= 1900) + { tm.tm_year = st->y - 1900; tm.tm_mon = st->m - 1; tm.tm_mday = st->d; @@ -282,13 +288,13 @@ static BOOL stime2timestamp(const SIMPLE_TIME *st, char * str, BOOL bZone, BOOL zoneint -= 3600; } if (zoneint > 0) - sprintf(zonestr, "-%02d", (int)zoneint / 3600); + sprintf(zonestr, "-%02d", (int) zoneint / 3600); else - sprintf(zonestr, "+%02d", -(int)zoneint / 3600); + sprintf(zonestr, "+%02d", -(int) zoneint / 3600); } -#endif /* WIN32 */ +#endif /* WIN32 */ sprintf(str, "%.4d-%.2d-%.2d %.2d:%.2d:%.2d%s%s", st->y, st->m, st->d, st->hh, st->mm, st->ss, precstr, zonestr); - return TRUE; + return TRUE; } /* This is called by SQLFetch() */ @@ -323,14 +329,15 @@ copy_and_convert_field(StatementClass *stmt, Int4 field_type, void *value, Int2 const char *neut_str = value; char midtemp[2][32]; int mtemp_cnt = 0; - static BindInfoClass sbic; - BindInfoClass *pbic; + static BindInfoClass sbic; + BindInfoClass *pbic; if (stmt->current_col >= 0) { pbic = &stmt->bindings[stmt->current_col]; if (pbic->data_left == -2) - pbic->data_left = (cbValueMax > 0) ? 0 : -1; /* This seems to be * needed for ADO ? */ + pbic->data_left = (cbValueMax > 0) ? 0 : -1; /* This seems to be * + * needed for ADO ? */ if (pbic->data_left == 0) { if (pbic->ttlbuf != NULL) @@ -339,8 +346,8 @@ copy_and_convert_field(StatementClass *stmt, Int4 field_type, void *value, Int2 pbic->ttlbuf = NULL; pbic->ttlbuflen = 0; } - pbic->data_left = -2; /* needed by ADO ? */ - return COPY_NO_DATA_FOUND; + pbic->data_left = -2; /* needed by ADO ? */ + return COPY_NO_DATA_FOUND; } } /*--------- @@ -416,10 +423,14 @@ copy_and_convert_field(StatementClass *stmt, Int4 field_type, void *value, Int2 st.fr = 0; if (strnicmp(value, "invalid", 7) != 0) { - BOOL bZone = (field_type != PG_TYPE_TIMESTAMP_NO_TMZONE && PG_VERSION_GE(SC_get_conn(stmt), 7.2)); - int zone; - /*sscanf(value, "%4d-%2d-%2d %2d:%2d:%2d", &st.y, &st.m, &st.d, &st.hh, &st.mm, &st.ss);*/ - bZone = FALSE; /* time zone stuff is unreliable */ + BOOL bZone = (field_type != PG_TYPE_TIMESTAMP_NO_TMZONE && PG_VERSION_GE(SC_get_conn(stmt), 7.2)); + int zone; + + /* + * sscanf(value, "%4d-%2d-%2d %2d:%2d:%2d", &st.y, &st.m, + * &st.d, &st.hh, &st.mm, &st.ss); + */ + bZone = FALSE; /* time zone stuff is unreliable */ timestamp2stime(value, &st, &bZone, &zone); } else @@ -710,7 +721,7 @@ copy_and_convert_field(StatementClass *stmt, Int4 field_type, void *value, Int2 { case SQL_C_DATE: #if (ODBCVER >= 0x0300) - case SQL_C_TYPE_DATE: /* 91 */ + case SQL_C_TYPE_DATE: /* 91 */ #endif len = 6; { @@ -728,7 +739,7 @@ copy_and_convert_field(StatementClass *stmt, Int4 field_type, void *value, Int2 case SQL_C_TIME: #if (ODBCVER >= 0x0300) - case SQL_C_TYPE_TIME: /* 92 */ + case SQL_C_TYPE_TIME: /* 92 */ #endif len = 6; { @@ -746,7 +757,7 @@ copy_and_convert_field(StatementClass *stmt, Int4 field_type, void *value, Int2 case SQL_C_TIMESTAMP: #if (ODBCVER >= 0x0300) - case SQL_C_TYPE_TIMESTAMP: /* 93 */ + case SQL_C_TYPE_TIMESTAMP: /* 93 */ #endif len = 16; { @@ -923,7 +934,7 @@ copy_and_convert_field(StatementClass *stmt, Int4 field_type, void *value, Int2 if (pcbValue) *(SDWORD *) ((char *) pcbValue + pcbValueOffset) = len; - if (result == COPY_OK && stmt->current_col >=0) + if (result == COPY_OK && stmt->current_col >= 0) stmt->bindings[stmt->current_col].data_left = 0; return result; @@ -1180,7 +1191,7 @@ copy_statement_with_parameters(StatementClass *stmt) #ifdef DRIVER_CURSOR_IMPLEMENT BOOL search_from_pos = FALSE; -#endif /* DRIVER_CURSOR_IMPLEMENT */ +#endif /* DRIVER_CURSOR_IMPLEMENT */ if (ci->disallow_premature) prepare_dummy_cursor = stmt->pre_executing; @@ -1217,7 +1228,7 @@ copy_statement_with_parameters(StatementClass *stmt) else search_from_pos = TRUE; } -#endif /* DRIVER_CURSOR_IMPLEMENT */ +#endif /* DRIVER_CURSOR_IMPLEMENT */ /* If the application hasn't set a cursor name, then generate one */ if (stmt->cursor_name[0] == '\0') @@ -1346,7 +1357,7 @@ copy_statement_with_parameters(StatementClass *stmt) if (multibyte_strchr(&old_statement[opos], '(')) #else if (strchr(&old_statement[opos], '(')) -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ proc_no_param = FALSE; continue; } @@ -1417,7 +1428,7 @@ copy_statement_with_parameters(StatementClass *stmt) npos -= 5; CVT_APPEND_STR(", CTID, OID from"); } -#endif /* DRIVER_CURSOR_IMPLEMENT */ +#endif /* DRIVER_CURSOR_IMPLEMENT */ } if (token_len == 3) { @@ -1591,7 +1602,7 @@ copy_statement_with_parameters(StatementClass *stmt) case SQL_C_DATE: #if (ODBCVER >= 0x0300) - case SQL_C_TYPE_DATE: /* 91 */ + case SQL_C_TYPE_DATE: /* 91 */ #endif { DATE_STRUCT *ds = (DATE_STRUCT *) buffer; @@ -1605,7 +1616,7 @@ copy_statement_with_parameters(StatementClass *stmt) case SQL_C_TIME: #if (ODBCVER >= 0x0300) - case SQL_C_TYPE_TIME: /* 92 */ + case SQL_C_TYPE_TIME: /* 92 */ #endif { TIME_STRUCT *ts = (TIME_STRUCT *) buffer; @@ -1619,7 +1630,7 @@ copy_statement_with_parameters(StatementClass *stmt) case SQL_C_TIMESTAMP: #if (ODBCVER >= 0x0300) - case SQL_C_TYPE_TIMESTAMP: /* 93 */ + case SQL_C_TYPE_TIMESTAMP: /* 93 */ #endif { TIMESTAMP_STRUCT *tss = (TIMESTAMP_STRUCT *) buffer; @@ -1682,7 +1693,7 @@ copy_statement_with_parameters(StatementClass *stmt) case SQL_DATE: #if (ODBCVER >= 0x0300) - case SQL_TYPE_DATE: /* 91 */ + case SQL_TYPE_DATE: /* 91 */ #endif if (buf) { /* copy char data to time */ @@ -1697,7 +1708,7 @@ copy_statement_with_parameters(StatementClass *stmt) case SQL_TIME: #if (ODBCVER >= 0x0300) - case SQL_TYPE_TIME: /* 92 */ + case SQL_TYPE_TIME: /* 92 */ #endif if (buf) { /* copy char data to time */ @@ -1712,7 +1723,7 @@ copy_statement_with_parameters(StatementClass *stmt) case SQL_TIMESTAMP: #if (ODBCVER >= 0x0300) - case SQL_TYPE_TIMESTAMP: /* 93 */ + case SQL_TYPE_TIMESTAMP: /* 93 */ #endif if (buf) @@ -1721,8 +1732,10 @@ copy_statement_with_parameters(StatementClass *stmt) parse_datetime(cbuf, &st); } - /* sprintf(tmp, "'%.4d-%.2d-%.2d %.2d:%.2d:%.2d'", - st.y, st.m, st.d, st.hh, st.mm, st.ss);*/ + /* + * sprintf(tmp, "'%.4d-%.2d-%.2d %.2d:%.2d:%.2d'", st.y, + * st.m, st.d, st.hh, st.mm, st.ss); + */ tmp[0] = '\''; /* Time zone stuff is unreliable */ stime2timestamp(&st, tmp + 1, FALSE, PG_VERSION_GE(conn, 7.2)); @@ -1916,7 +1929,7 @@ copy_statement_with_parameters(StatementClass *stmt) #ifdef DRIVER_CURSOR_IMPLEMENT if (search_from_pos) stmt->options.scroll_concurrency = SQL_CONCUR_READ_ONLY; -#endif /* DRIVER_CURSOR_IMPLEMENT */ +#endif /* DRIVER_CURSOR_IMPLEMENT */ if (prepare_dummy_cursor && SC_is_pre_executable(stmt)) { char fetchstr[128]; @@ -2414,10 +2427,12 @@ static const char *hextbl = "0123456789ABCDEF"; static int pg_bin2hex(UCHAR *src, UCHAR *dst, int length) { - UCHAR chr, *src_wk, *dst_wk; - BOOL backwards; - int i; - + UCHAR chr, + *src_wk, + *dst_wk; + BOOL backwards; + int i; + backwards = FALSE; if (dst < src) { @@ -2447,6 +2462,7 @@ pg_bin2hex(UCHAR *src, UCHAR *dst, int length) dst[2 * length] = '\0'; return length; } + /*------- * 1. get oid (from 'value') * 2. open the large object @@ -2474,7 +2490,7 @@ convert_lo(StatementClass *stmt, const void *value, Int2 fCType, PTR rgbValue, BindInfoClass *bindInfo = NULL; ConnectionClass *conn = SC_get_conn(stmt); ConnInfo *ci = &(conn->connInfo); - int factor = (fCType == SQL_C_CHAR ? 2 : 1); + int factor = (fCType == SQL_C_CHAR ? 2 : 1); /* If using SQLGetData, then current_col will be set */ if (stmt->current_col >= 0) diff --git a/src/interfaces/odbc/convert.h b/src/interfaces/odbc/convert.h index 2257fb2779..565ce6bf19 100644 --- a/src/interfaces/odbc/convert.h +++ b/src/interfaces/odbc/convert.h @@ -28,7 +28,7 @@ typedef struct int mm; int ss; int fr; -} SIMPLE_TIME; +} SIMPLE_TIME; int copy_and_convert_field_bindinfo(StatementClass *stmt, Int4 field_type, void *value, int col); int copy_and_convert_field(StatementClass *stmt, Int4 field_type, void *value, Int2 fCType, diff --git a/src/interfaces/odbc/dlg_specific.c b/src/interfaces/odbc/dlg_specific.c index d26482161a..b757a93316 100644 --- a/src/interfaces/odbc/dlg_specific.c +++ b/src/interfaces/odbc/dlg_specific.c @@ -445,11 +445,11 @@ updateCommons(const ConnInfo *ci) { sprintf(tmp, "%d", comval->unique_index); SQLWritePrivateProfileString(sectionName, INI_UNIQUEINDEX, tmp, - fileName); + fileName); - sprintf(tmp, "%d", comval->onlyread); - SQLWritePrivateProfileString(sectionName, INI_READONLY, tmp, - fileName); + sprintf(tmp, "%d", comval->onlyread); + SQLWritePrivateProfileString(sectionName, INI_READONLY, tmp, + fileName); } sprintf(tmp, "%d", comval->use_declarefetch); @@ -497,7 +497,7 @@ updateCommons(const ConnInfo *ci) * comval->conn_settings, fileName); */ } -#endif /* WIN32 */ +#endif /* WIN32 */ void diff --git a/src/interfaces/odbc/dlg_specific.h b/src/interfaces/odbc/dlg_specific.h index 3d9985794d..b3192123d0 100644 --- a/src/interfaces/odbc/dlg_specific.h +++ b/src/interfaces/odbc/dlg_specific.h @@ -134,7 +134,7 @@ int CALLBACK ds_optionsProc(HWND hdlg, WORD wMsg, WPARAM wParam, LPARAM lParam); -#endif /* WIN32 */ +#endif /* WIN32 */ void updateGlobals(void); void writeDSNinfo(const ConnInfo *ci); diff --git a/src/interfaces/odbc/drvconn.c b/src/interfaces/odbc/drvconn.c index bdcf6af7f0..e369525ca0 100644 --- a/src/interfaces/odbc/drvconn.c +++ b/src/interfaces/odbc/drvconn.c @@ -338,7 +338,7 @@ dconn_FDriverConnectProc( return FALSE; } -#endif /* WIN32 */ +#endif /* WIN32 */ void @@ -354,7 +354,7 @@ dconn_get_connect_attributes(const UCHAR FAR * connect_string, ConnInfo *ci) memset(ci, 0, sizeof(ConnInfo)); #ifdef DRIVER_CURSOR_IMPLEMENT ci->updatable_cursors = 1; -#endif /* DRIVER_CURSOR_IMPLEMENT */ +#endif /* DRIVER_CURSOR_IMPLEMENT */ our_connect_string = strdup(connect_string); strtok_arg = our_connect_string; diff --git a/src/interfaces/odbc/environ.c b/src/interfaces/odbc/environ.c index 9bb9615dea..304d31d33e 100644 --- a/src/interfaces/odbc/environ.c +++ b/src/interfaces/odbc/environ.c @@ -517,7 +517,7 @@ EN_Destructor(EnvironmentClass *self) mylog("exit EN_Destructor: rv = %d\n", rv); #ifdef _MEMORY_DEBUG_ debug_memory_inouecheck(); -#endif /* _MEMORY_DEBUG_ */ +#endif /* _MEMORY_DEBUG_ */ return rv; } diff --git a/src/interfaces/odbc/gpps.c b/src/interfaces/odbc/gpps.c index 3d578c9d77..ee73a23eb4 100644 --- a/src/interfaces/odbc/gpps.c +++ b/src/interfaces/odbc/gpps.c @@ -449,6 +449,6 @@ if (!keyFound) return aReturnLength > 0 ? aReturnLength - 1 : 0; } -#endif /* NOT_USED */ +#endif /* NOT_USED */ -#endif /* not WIN32 */ +#endif /* not WIN32 */ diff --git a/src/interfaces/odbc/info.c b/src/interfaces/odbc/info.c index 23291b5554..c77b3c5e89 100644 --- a/src/interfaces/odbc/info.c +++ b/src/interfaces/odbc/info.c @@ -2839,7 +2839,7 @@ getClientColumnName(ConnectionClass *conn, const char *serverTableName, char *se } return ret; } -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ RETCODE SQL_API PGAPI_ForeignKeys( @@ -2888,7 +2888,7 @@ PGAPI_ForeignKeys( pkt_alloced, fkt_alloced; ConnectionClass *conn; -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ int i, j, k, @@ -2950,7 +2950,7 @@ PGAPI_ForeignKeys( QR_set_field_info(stmt->result, 13, "TRIGGER_NAME", PG_TYPE_TEXT, MAX_INFO_STRING); #if (ODBCVER >= 0x0300) QR_set_field_info(stmt->result, 14, "DEFERRABILITY", PG_TYPE_INT2, 2); -#endif /* ODBCVER >= 0x0300 */ +#endif /* ODBCVER >= 0x0300 */ /* * also, things need to think that this statement is finished so the @@ -2985,7 +2985,7 @@ PGAPI_ForeignKeys( pkey_text = fkey_text = pkt_text = fkt_text = NULL; pkey_alloced = fkey_alloced = pkt_alloced = fkt_alloced = FALSE; conn = SC_get_conn(stmt); -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ /* * Case #2 -- Get the foreign keys in the specified table (fktab) that @@ -3151,7 +3151,7 @@ PGAPI_ForeignKeys( pkt_text = getClientTableName(conn, pk_table, &pkt_alloced); #else pkt_text = pk_table; -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ /* If there is a pk table specified, then check it. */ if (pk_table_needed[0] != '\0') { @@ -3192,7 +3192,7 @@ PGAPI_ForeignKeys( pkey_text = getClientColumnName(conn, pk_table, pkey_ptr, &pkey_alloced); #else pkey_text = pkey_ptr; -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ mylog("%s: pkey_ptr='%s', pkey='%s'\n", func, pkey_text, pkey); if (strcmp(pkey_text, pkey)) { @@ -3202,7 +3202,7 @@ PGAPI_ForeignKeys( #ifdef MULTIBYTE if (pkey_alloced) free(pkey_text); -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ /* Get to next primary key */ for (k = 0; k < 2; k++) pkey_ptr += strlen(pkey_ptr) + 1; @@ -3245,7 +3245,7 @@ PGAPI_ForeignKeys( defer_type = SQL_INITIALLY_IMMEDIATE; else defer_type = SQL_NOT_DEFERRABLE; -#endif /* ODBCVER >= 0x0300 */ +#endif /* ODBCVER >= 0x0300 */ /* Get to first primary key */ pkey_ptr = trig_args; @@ -3262,7 +3262,7 @@ PGAPI_ForeignKeys( #else pkey_text = pkey_ptr; fkey_text = fkey_ptr; -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ mylog("%s: pk_table = '%s', pkey_ptr = '%s'\n", func, pkt_text, pkey_text); set_tuplefield_null(&row->tuple[0]); set_tuplefield_string(&row->tuple[1], ""); @@ -3284,7 +3284,7 @@ PGAPI_ForeignKeys( set_tuplefield_string(&row->tuple[13], trig_args); #if (ODBCVER >= 0x0300) set_tuplefield_int2(&row->tuple[14], defer_type); -#endif /* ODBCVER >= 0x0300 */ +#endif /* ODBCVER >= 0x0300 */ QR_add_tuple(stmt->result, row); #ifdef MULTIBYTE @@ -3294,7 +3294,7 @@ PGAPI_ForeignKeys( if (pkey_alloced) free(pkey_text); pkey_alloced = FALSE; -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ /* next primary/foreign key */ for (i = 0; i < 2; i++) { @@ -3306,7 +3306,7 @@ PGAPI_ForeignKeys( if (pkt_alloced) free(pkt_text); pkt_alloced = FALSE; -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ result = PGAPI_Fetch(htbl_stmt); } @@ -3475,7 +3475,7 @@ PGAPI_ForeignKeys( defer_type = SQL_INITIALLY_IMMEDIATE; else defer_type = SQL_NOT_DEFERRABLE; -#endif /* ODBCVER >= 0x0300 */ +#endif /* ODBCVER >= 0x0300 */ mylog("Foreign Key Case#1: trig_nargs = %d, num_keys = %d\n", trig_nargs, num_keys); @@ -3492,7 +3492,7 @@ PGAPI_ForeignKeys( fkt_text = getClientTableName(conn, fk_table, &fkt_alloced); #else fkt_text = fk_table; -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ /* Get to first foreign key */ fkey_ptr = trig_args; @@ -3507,7 +3507,7 @@ PGAPI_ForeignKeys( #else pkey_text = pkey_ptr; fkey_text = fkey_ptr; -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ mylog("pkey_ptr = '%s', fk_table = '%s', fkey_ptr = '%s'\n", pkey_text, fkt_text, fkey_text); row = (TupleNode *) malloc(sizeof(TupleNode) + (result_cols - 1) *sizeof(TupleField)); @@ -3538,7 +3538,7 @@ PGAPI_ForeignKeys( #if (ODBCVER >= 0x0300) mylog("defer_type = '%s'", defer_type); set_tuplefield_int2(&row->tuple[14], defer_type); -#endif /* ODBCVER >= 0x0300 */ +#endif /* ODBCVER >= 0x0300 */ QR_add_tuple(stmt->result, row); #ifdef MULTIBYTE @@ -3548,7 +3548,7 @@ PGAPI_ForeignKeys( if (fkey_alloced) free(fkey_text); fkey_alloced = FALSE; -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ /* next primary/foreign key */ for (j = 0; j < 2; j++) @@ -3561,7 +3561,7 @@ PGAPI_ForeignKeys( if (fkt_alloced) free(fkt_text); fkt_alloced = FALSE; -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ result = PGAPI_Fetch(htbl_stmt); } } @@ -3582,7 +3582,7 @@ PGAPI_ForeignKeys( free(fkt_text); if (fkey_alloced) free(fkey_text); -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ PGAPI_FreeStmt(htbl_stmt, SQL_DROP); diff --git a/src/interfaces/odbc/iodbc.h b/src/interfaces/odbc/iodbc.h index 9d826b3e45..f8e7d248b1 100644 --- a/src/interfaces/odbc/iodbc.h +++ b/src/interfaces/odbc/iodbc.h @@ -33,7 +33,7 @@ typedef WORD WPARAM; typedef DWORD LPARAM; typedef void *HWND; typedef int BOOL; -#endif /* _UNIX_ */ +#endif /* _UNIX_ */ #if defined(WIN32) || defined(WIN32_SYSTEM) @@ -57,7 +57,7 @@ typedef int BOOL; #define STRLEN(str) ((str)? _fstrlen((char FAR*)(str)):0) #define STREQ(a, b) (_fstrcmp((char FAR*)(a), (char FAR*)(b) == 0) #endif -#endif /* WIN32 */ +#endif /* WIN32 */ #define SYSERR (-1) diff --git a/src/interfaces/odbc/isql.h b/src/interfaces/odbc/isql.h index 8aa0d18be6..67f27d536e 100644 --- a/src/interfaces/odbc/isql.h +++ b/src/interfaces/odbc/isql.h @@ -234,10 +234,10 @@ extern "C" SDWORD FAR * pcbValue); RETCODE SQL_API SQLDataSources(HENV henv, - UWORD Direction, UCHAR FAR *ServerName, - WORD BufferLength1, WORD *NameLength1, - UCHAR FAR *Description, WORD BufferLength2, - WORD *NameLength2); + UWORD Direction, UCHAR FAR * ServerName, + WORD BufferLength1, WORD *NameLength1, + UCHAR FAR * Description, WORD BufferLength2, + WORD *NameLength2); #ifdef __cplusplus } diff --git a/src/interfaces/odbc/isqlext.h b/src/interfaces/odbc/isqlext.h index bb5292e864..758d1bd734 100644 --- a/src/interfaces/odbc/isqlext.h +++ b/src/interfaces/odbc/isqlext.h @@ -378,7 +378,7 @@ typedef struct SQLUINTEGER dwLowWord; SQLINTEGER dwHighWord; } SQLBIGINT; -#endif /* GCC */ +#endif /* GCC */ typedef struct tagDATE_STRUCT { diff --git a/src/interfaces/odbc/odbcapi30.c b/src/interfaces/odbc/odbcapi30.c index 9de10a9109..8ad1dba7e6 100644 --- a/src/interfaces/odbc/odbcapi30.c +++ b/src/interfaces/odbc/odbcapi30.c @@ -344,7 +344,7 @@ SQLGetStmtAttr(HSTMT StatementHandle, len = 4; break; case SQL_ATTR_AUTO_IPD: /* 10001 */ - /* case SQL_ATTR_ROW_BIND_TYPE: ** == SQL_BIND_TYPE(ODBC2.0) */ + /* case SQL_ATTR_ROW_BIND_TYPE: ** == SQL_BIND_TYPE(ODBC2.0) */ case SQL_ATTR_PARAMSET_SIZE: /* 22 */ case SQL_ATTR_PARAM_STATUS_PTR: /* 20 */ case SQL_ATTR_PARAMS_PROCESSED_PTR: /* 21 */ @@ -484,7 +484,7 @@ SQLSetStmtAttr(HSTMT StatementHandle, case SQL_ATTR_APP_ROW_DESC: /* 10010 */ case SQL_ATTR_APP_PARAM_DESC: /* 10011 */ case SQL_ATTR_AUTO_IPD: /* 10001 */ - /* case SQL_ATTR_ROW_BIND_TYPE: ** == SQL_BIND_TYPE(ODBC2.0) */ + /* case SQL_ATTR_ROW_BIND_TYPE: ** == SQL_BIND_TYPE(ODBC2.0) */ case SQL_ATTR_IMP_ROW_DESC: /* 10012 */ case SQL_ATTR_IMP_PARAM_DESC: /* 10013 */ case SQL_ATTR_METADATA_ID: /* 10014 */ diff --git a/src/interfaces/odbc/parse.c b/src/interfaces/odbc/parse.c index 27d1e95af2..e73cb82a32 100644 --- a/src/interfaces/odbc/parse.c +++ b/src/interfaces/odbc/parse.c @@ -615,7 +615,7 @@ parse_statement(StatementClass *stmt) if ((unsigned char) *ptr >= 0x80) ptr++; else -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ *ptr = tolower((unsigned char) *ptr); } } diff --git a/src/interfaces/odbc/pgapifunc.h b/src/interfaces/odbc/pgapifunc.h index dadabe1fac..2ebf20371a 100644 --- a/src/interfaces/odbc/pgapifunc.h +++ b/src/interfaces/odbc/pgapifunc.h @@ -241,4 +241,4 @@ RETCODE SQL_API PGAPI_SetScrollOptions( SDWORD crowKeyset, UWORD crowRowset); -#endif /* define_PG_API_FUNC_H__ */ +#endif /* define_PG_API_FUNC_H__ */ diff --git a/src/interfaces/odbc/pgtypes.c b/src/interfaces/odbc/pgtypes.c index 0a7bd35b6e..1388650a65 100644 --- a/src/interfaces/odbc/pgtypes.c +++ b/src/interfaces/odbc/pgtypes.c @@ -539,7 +539,7 @@ getCharPrecision(StatementClass *stmt, Int4 type, int col, int handle_unknown_si static Int2 getTimestampScale(StatementClass *stmt, Int4 type, int col) { - ConnectionClass *conn = SC_get_conn (stmt); + ConnectionClass *conn = SC_get_conn(stmt); Int4 atttypmod; QResultClass *result; ColumnInfoClass *flds; @@ -563,11 +563,11 @@ getTimestampScale(StatementClass *stmt, Int4 type, int col) flds = result->fields; if (flds) atttypmod = flds->atttypmod[col]; -mylog("atttypmod1=%d\n", atttypmod); + mylog("atttypmod1=%d\n", atttypmod); } - else + else atttypmod = QR_get_atttypmod(result, col); -mylog("atttypmod2=%d\n", atttypmod); + mylog("atttypmod2=%d\n", atttypmod); return (atttypmod > -1 ? atttypmod : 0); } @@ -575,7 +575,8 @@ mylog("atttypmod2=%d\n", atttypmod); static Int4 getTimestampPrecision(StatementClass *stmt, Int4 type, int col) { - Int4 fixed, scale; + Int4 fixed, + scale; mylog("getTimestampPrecision: type=%d, col=%d\n", type, col); @@ -594,8 +595,8 @@ getTimestampPrecision(StatementClass *stmt, Int4 type, int col) fixed = 22; break; } - scale = getTimestampScale(stmt, type, col); - return (scale > 0) ? fixed + 1 + scale : fixed; + scale = getTimestampScale(stmt, type, col); + return (scale > 0) ? fixed + 1 + scale : fixed; } /* @@ -760,7 +761,7 @@ pgtype_length(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_ #else /* CR -> CR/LF */ return 2 * pgtype_precision(stmt, type, col, handle_unknown_size_as); -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ default: return pgtype_precision(stmt, type, col, handle_unknown_size_as); } diff --git a/src/interfaces/odbc/pgtypes.h b/src/interfaces/odbc/pgtypes.h index 0e6a1cc897..1d276432ce 100644 --- a/src/interfaces/odbc/pgtypes.h +++ b/src/interfaces/odbc/pgtypes.h @@ -58,9 +58,9 @@ #define PG_TYPE_VARCHAR 1043 #define PG_TYPE_DATE 1082 #define PG_TYPE_TIME 1083 -#define PG_TYPE_TIMESTAMP_NO_TMZONE 1114 /* since 7.2 */ +#define PG_TYPE_TIMESTAMP_NO_TMZONE 1114 /* since 7.2 */ #define PG_TYPE_DATETIME 1184 -#define PG_TYPE_TIME_WITH_TMZONE 1266 /* since 7.1 */ +#define PG_TYPE_TIME_WITH_TMZONE 1266 /* since 7.1 */ #define PG_TYPE_TIMESTAMP 1296 /* deprecated since 7.0 */ #define PG_TYPE_NUMERIC 1700 diff --git a/src/interfaces/odbc/psqlodbc.c b/src/interfaces/odbc/psqlodbc.c index 841360da34..cc8d8b7bfb 100644 --- a/src/interfaces/odbc/psqlodbc.c +++ b/src/interfaces/odbc/psqlodbc.c @@ -114,8 +114,8 @@ _fini(void) { return TRUE; } -#endif /* not __GNUC__ */ -#endif /* not WIN32 */ +#endif /* not __GNUC__ */ +#endif /* not WIN32 */ /* diff --git a/src/interfaces/odbc/psqlodbc.h b/src/interfaces/odbc/psqlodbc.h index 34972f21cb..5317be3243 100644 --- a/src/interfaces/odbc/psqlodbc.h +++ b/src/interfaces/odbc/psqlodbc.h @@ -5,7 +5,7 @@ * * Comments: See "notice.txt" for copyright and license information. * - * $Id: psqlodbc.h,v 1.55 2001/11/05 10:35:14 inoue Exp $ + * $Id: psqlodbc.h,v 1.56 2001/11/05 17:46:38 momjian Exp $ * */ @@ -21,9 +21,9 @@ #include /* for FILE* pointers: see GLOBAL_VALUES */ /* Must come before sql.h */ -#ifndef ODBCVER +#ifndef ODBCVER #define ODBCVER 0x0250 -#endif /* ODBCVER_REP */ +#endif /* ODBCVER_REP */ #if defined(WIN32) || defined(WITH_UNIXODBC) || defined(WITH_IODBC) @@ -83,7 +83,7 @@ typedef UInt4 Oid; #else #define DRIVER_ODBC_VER "02.50" #define DBMS_NAME "PostgreSQL" -#endif /* ODBCVER */ +#endif /* ODBCVER */ #define POSTGRESDRIVERVERSION "07.01.0009" @@ -92,10 +92,10 @@ typedef UInt4 Oid; #define DRIVER_FILE_NAME "PSQLODBC30.DLL" #else #define DRIVER_FILE_NAME "PSQLODBC.DLL" -#endif /* ODBCVER */ +#endif /* ODBCVER */ #else #define DRIVER_FILE_NAME "libpsqlodbc.so" -#endif /* WIN32 */ +#endif /* WIN32 */ /* Limits */ #ifdef WIN32 @@ -209,14 +209,14 @@ typedef struct StatementOptions_ UInt4 *rowsFetched; UInt2 *rowStatusArray; void *bookmark_ptr; - UInt2 *row_operation_ptr; - UInt4 *row_offset_ptr; - UInt4 paramset_size; - UInt4 param_bind_type; - UInt4 *param_processed_ptr; - UInt2 *param_status_ptr; - UInt2 *param_operation_ptr; - UInt4 *param_offset_ptr; + UInt2 *row_operation_ptr; + UInt4 *row_offset_ptr; + UInt4 paramset_size; + UInt4 param_bind_type; + UInt4 *param_processed_ptr; + UInt2 *param_status_ptr; + UInt2 *param_operation_ptr; + UInt4 *param_offset_ptr; } StatementOptions; /* Used to pass extra query info to send_query */ @@ -263,6 +263,6 @@ void debug_memory_check(void); #define realloc debug_realloc #define strdup debug_strdup #define free debug_free -#endif /* _MEMORY_DEBUG_ */ +#endif /* _MEMORY_DEBUG_ */ #endif diff --git a/src/interfaces/odbc/resource.h b/src/interfaces/odbc/resource.h index b60d0dfd4b..b8bbd4fcfc 100644 --- a/src/interfaces/odbc/resource.h +++ b/src/interfaces/odbc/resource.h @@ -61,6 +61,6 @@ #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1062 #define _APS_NEXT_SYMED_VALUE 101 -#endif /* */ +#endif /* */ -#endif /* */ +#endif /* */ diff --git a/src/interfaces/odbc/results.c b/src/interfaces/odbc/results.c index 7d9ce4c92f..a5cee564f7 100644 --- a/src/interfaces/odbc/results.c +++ b/src/interfaces/odbc/results.c @@ -1165,7 +1165,7 @@ PGAPI_ExtendedFetch( /* this should be refined */ else if (result > 10 && result < 20) *(rgfRowStatus + i) = result - 10; -#endif /* DRIVER_CURSOR_IMPLEMENT */ +#endif /* DRIVER_CURSOR_IMPLEMENT */ else *(rgfRowStatus + i) = SQL_ROW_SUCCESS; } @@ -1721,7 +1721,7 @@ SC_pos_add(StatementClass *stmt, /* * Stuff for updatable cursors end. */ -#endif /* DRIVER_CURSOR_IMPLEMENT */ +#endif /* DRIVER_CURSOR_IMPLEMENT */ /* * This positions the cursor within a rowset, that was positioned using SQLExtendedFetch. @@ -1752,7 +1752,7 @@ PGAPI_SetPos( if (stmt->options.scroll_concurrency != SQL_CONCUR_READ_ONLY) ; else -#endif /* DRIVER_CURSOR_IMPLEMENT */ +#endif /* DRIVER_CURSOR_IMPLEMENT */ if (fOption != SQL_POSITION && fOption != SQL_REFRESH) { stmt->errornumber = STMT_NOT_IMPLEMENTED_ERROR; @@ -1798,7 +1798,7 @@ PGAPI_SetPos( case SQL_ADD: return SC_pos_add(stmt, irow); } -#endif /* DRIVER_CURSOR_IMPLEMENT */ +#endif /* DRIVER_CURSOR_IMPLEMENT */ /* Reset for SQLGetData */ for (i = 0; i < num_cols; i++) bindings[i].data_left = -1; @@ -1812,7 +1812,7 @@ PGAPI_SetPos( #ifdef DRIVER_CURSOR_IMPLEMENT if (stmt->options.cursor_type == SQL_CURSOR_KEYSET_DRIVEN) SC_pos_reload(stmt, irow, (UWORD *) 0); -#endif /* DRIVER_CURSOR_IMPLEMENT */ +#endif /* DRIVER_CURSOR_IMPLEMENT */ stmt->currTuple = stmt->rowset_start + irow - 1; stmt->bind_row = irow; SC_fetch(stmt); diff --git a/src/interfaces/odbc/setup.c b/src/interfaces/odbc/setup.c index 9db803a834..6bcc01bd89 100644 --- a/src/interfaces/odbc/setup.c +++ b/src/interfaces/odbc/setup.c @@ -50,7 +50,7 @@ typedef struct tagSETUPDLG BOOL fNewDSN; /* New data source flag */ BOOL fDefault; /* Default data source flag */ -} SETUPDLG, FAR * LPSETUPDLG; +} SETUPDLG, FAR * LPSETUPDLG; diff --git a/src/interfaces/odbc/statement.c b/src/interfaces/odbc/statement.c index 0e816514a8..bfdb8a2fc0 100644 --- a/src/interfaces/odbc/statement.c +++ b/src/interfaces/odbc/statement.c @@ -35,7 +35,7 @@ static struct { int type; char *s; -} Statement_Type[] = +} Statement_Type[] = { { @@ -215,7 +215,7 @@ InitializeStatementOptions(StatementOptions *opt) opt->retrieve_data = SQL_RD_ON; opt->use_bookmarks = SQL_UB_OFF; opt->paramset_size = 1; - opt->param_bind_type = 0; /*default is column-wise binding */ + opt->param_bind_type = 0; /* default is column-wise binding */ } @@ -324,7 +324,8 @@ SC_Destructor(StatementClass *self) /* about that here. */ if (self->bindings) { - int lf; + int lf; + for (lf = 0; lf < self->bindings_allocated; lf++) { if (self->bindings[lf].ttlbuf != NULL) @@ -711,7 +712,7 @@ SC_fetch(StatementClass *self) #ifdef DRIVER_CURSOR_IMPLEMENT int updret; -#endif /* DRIVER_CURSOR_IMPLEMENT */ +#endif /* DRIVER_CURSOR_IMPLEMENT */ Int2 num_cols, lf; Oid type; @@ -791,13 +792,13 @@ SC_fetch(StatementClass *self) updret = SQL_ROW_DELETED; num_cols -= 2; } -#endif /* DRIVER_CURSOR_IMPLEMENT */ +#endif /* DRIVER_CURSOR_IMPLEMENT */ if (self->options.retrieve_data == SQL_RD_OFF) /* data isn't required */ #ifdef DRIVER_CURSOR_IMPLEMENT return updret ? updret + 10 : SQL_SUCCESS; #else return SQL_SUCCESS; -#endif /* DRIVER_CURSOR_IMPLEMENT */ +#endif /* DRIVER_CURSOR_IMPLEMENT */ for (lf = 0; lf < num_cols; lf++) { mylog("fetch: cols=%d, lf=%d, self = %u, self->bindings = %u, buffer[] = %u\n", num_cols, lf, self, self->bindings, self->bindings[lf].buffer); @@ -881,7 +882,7 @@ SC_fetch(StatementClass *self) #ifdef DRIVER_CURSOR_IMPLEMENT if (updret) result = updret + 10; -#endif /* DRIVER_CURSOR_IMPLEMENT */ +#endif /* DRIVER_CURSOR_IMPLEMENT */ return result; } diff --git a/src/interfaces/perl5/ppport.h b/src/interfaces/perl5/ppport.h index e39b9f52a0..8a788ad5a6 100644 --- a/src/interfaces/perl5/ppport.h +++ b/src/interfaces/perl5/ppport.h @@ -284,6 +284,6 @@ SV *sv; PL_curcop->cop_line = oldline; } #endif -#endif /* newCONSTSUB */ +#endif /* newCONSTSUB */ -#endif /* _P_P_PORTABILITY_H_ */ +#endif /* _P_P_PORTABILITY_H_ */ diff --git a/src/interfaces/python/pgmodule.c b/src/interfaces/python/pgmodule.c index e0849651a3..93e4d508d8 100644 --- a/src/interfaces/python/pgmodule.c +++ b/src/interfaces/python/pgmodule.c @@ -72,15 +72,15 @@ const char *__movename[5] = #ifndef NO_DIRECT #define DIRECT_ACCESS 1 /* enables direct access functions */ -#endif /* NO_DIRECT */ +#endif /* NO_DIRECT */ #ifndef NO_LARGE #define LARGE_OBJECTS 1 /* enables large objects support */ -#endif /* NO_LARGE */ +#endif /* NO_LARGE */ #ifndef NO_DEF_VAR #define DEFAULT_VARS 1 /* enables default variables use */ -#endif /* NO_DEF_VAR */ +#endif /* NO_DEF_VAR */ #ifdef MS_WIN32 #define NO_SNPRINTF 1 @@ -99,7 +99,7 @@ static PyObject *pg_default_tty; /* default debug tty */ static PyObject *pg_default_port; /* default connection port */ static PyObject *pg_default_user; /* default username */ static PyObject *pg_default_passwd; /* default password */ -#endif /* DEFAULT_VARS */ +#endif /* DEFAULT_VARS */ DL_EXPORT(void) init_pg(void); int *get_type_array(PGresult *result, int nfields); @@ -115,7 +115,7 @@ typedef struct int valid; /* validity flag */ PGconn *cnx; /* PostGres connection handle */ PGresult *last_result; /* last result content */ -} pgobject; +} pgobject; staticforward PyTypeObject PgType; @@ -144,7 +144,7 @@ typedef struct int result_type; /* type of previous result */ long current_pos; /* current position in last result */ long num_rows; /* number of (affected) rows */ -} pgqueryobject; +} pgqueryobject; staticforward PyTypeObject PgQueryType; @@ -163,7 +163,7 @@ typedef struct int current_row; /* current selected row */ int max_row; /* number of rows in the result */ int num_fields; /* number of fields in each row */ -} pgsourceobject; +} pgsourceobject; staticforward PyTypeObject PgSourceType; @@ -179,12 +179,12 @@ typedef struct pgobject * pgcnx; /* parent connection object */ Oid lo_oid; /* large object oid */ int lo_fd; /* large object fd */ -} pglargeobject; +} pglargeobject; staticforward PyTypeObject PglargeType; #define is_pglargeobject(v) ((v)->ob_type == &PglargeType) -#endif /* LARGE_OBJECTS */ +#endif /* LARGE_OBJECTS */ /* --------------------------------------------------------------------- */ /* INTERNAL FUNCTIONS */ @@ -235,7 +235,7 @@ check_lo_obj(pglargeobject * self, int level) return 1; } -#endif /* LARGE_OBJECTS */ +#endif /* LARGE_OBJECTS */ /* checks source object validity */ static int @@ -1450,7 +1450,7 @@ staticforward PyTypeObject PglargeType = { 0, /* tp_as_mapping */ 0, /* tp_hash */ }; -#endif /* LARGE_OBJECTS */ +#endif /* LARGE_OBJECTS */ /* --------------------------------------------------------------------- */ @@ -1511,7 +1511,7 @@ pgconnect(pgobject * self, PyObject * args, PyObject * dict) if ((!pgpasswd) && (pg_default_passwd != Py_None)) pgpasswd = PyString_AsString(pg_default_passwd); -#endif /* DEFAULT_VARS */ +#endif /* DEFAULT_VARS */ if ((npgobj = (pgobject *) pgobject_New()) == NULL) return NULL; @@ -2335,7 +2335,7 @@ pg_endcopy(pgobject * self, PyObject * args) Py_INCREF(Py_None); return Py_None; } -#endif /* DIRECT_ACCESS */ +#endif /* DIRECT_ACCESS */ static PyObject * @@ -2623,13 +2623,13 @@ static struct PyMethodDef pgobj_methods[] = { {"putline", (PyCFunction) pg_putline, 1, pg_putline__doc__}, {"getline", (PyCFunction) pg_getline, 1, pg_getline__doc__}, {"endcopy", (PyCFunction) pg_endcopy, 1, pg_endcopy__doc__}, -#endif /* DIRECT_ACCESS */ +#endif /* DIRECT_ACCESS */ #ifdef LARGE_OBJECTS {"locreate", (PyCFunction) pg_locreate, 1, pg_locreate__doc__}, {"getlo", (PyCFunction) pg_getlo, 1, pg_getlo__doc__}, {"loimport", (PyCFunction) pg_loimport, 1, pg_loimport__doc__}, -#endif /* LARGE_OBJECTS */ +#endif /* LARGE_OBJECTS */ {NULL, NULL} /* sentinel */ }; @@ -3119,7 +3119,7 @@ pgsetdefport(PyObject * self, PyObject * args) return old; } -#endif /* DEFAULT_VARS */ +#endif /* DEFAULT_VARS */ /* List of functions defined in the module */ @@ -3140,7 +3140,7 @@ static struct PyMethodDef pg_methods[] = { {"get_defuser", pggetdefuser, 1, getdefuser__doc__}, {"set_defuser", pgsetdefuser, 1, setdefuser__doc__}, {"set_defpasswd", pgsetdefpasswd, 1, setdefpasswd__doc__}, -#endif /* DEFAULT_VARS */ +#endif /* DEFAULT_VARS */ {NULL, NULL} /* sentinel */ }; @@ -3187,7 +3187,7 @@ init_pg(void) PyDict_SetItemString(dict, "SEEK_SET", PyInt_FromLong(SEEK_SET)); PyDict_SetItemString(dict, "SEEK_CUR", PyInt_FromLong(SEEK_CUR)); PyDict_SetItemString(dict, "SEEK_END", PyInt_FromLong(SEEK_END)); -#endif /* LARGE_OBJECTS */ +#endif /* LARGE_OBJECTS */ #ifdef DEFAULT_VARS /* prepares default values */ @@ -3205,7 +3205,7 @@ init_pg(void) pg_default_user = Py_None; Py_INCREF(Py_None); pg_default_passwd = Py_None; -#endif /* DEFAULT_VARS */ +#endif /* DEFAULT_VARS */ /* Check for errors */ if (PyErr_Occurred()) diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index a5ae6ff7fd..99af921307 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -33,7 +33,7 @@ * ENHANCEMENTS, OR MODIFICATIONS. * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/pl/plperl/plperl.c,v 1.25 2001/10/25 05:50:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/pl/plperl/plperl.c,v 1.26 2001/11/05 17:46:39 momjian Exp $ * **********************************************************************/ @@ -99,7 +99,7 @@ typedef struct plperl_proc_desc Oid arg_out_elem[FUNC_MAX_ARGS]; int arg_is_rel[FUNC_MAX_ARGS]; SV *reference; -} plperl_proc_desc; +} plperl_proc_desc; /********************************************************************** diff --git a/src/pl/plperl/ppport.h b/src/pl/plperl/ppport.h index e39b9f52a0..8a788ad5a6 100644 --- a/src/pl/plperl/ppport.h +++ b/src/pl/plperl/ppport.h @@ -284,6 +284,6 @@ SV *sv; PL_curcop->cop_line = oldline; } #endif -#endif /* newCONSTSUB */ +#endif /* newCONSTSUB */ -#endif /* _P_P_PORTABILITY_H_ */ +#endif /* _P_P_PORTABILITY_H_ */ diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h index 3d228fa755..8065764ed5 100644 --- a/src/pl/plpgsql/src/plpgsql.h +++ b/src/pl/plpgsql/src/plpgsql.h @@ -3,7 +3,7 @@ * procedural language * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.21 2001/10/28 06:26:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.22 2001/11/05 17:46:39 momjian Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -133,7 +133,7 @@ typedef struct int alloc; int used; char *value; -} PLpgSQL_dstring; +} PLpgSQL_dstring; typedef struct @@ -145,14 +145,14 @@ typedef struct int16 typlen; bool typbyval; int32 atttypmod; -} PLpgSQL_type; +} PLpgSQL_type; typedef struct { /* Generic datum array item */ int dtype; int dno; -} PLpgSQL_datum; +} PLpgSQL_datum; typedef struct @@ -166,7 +166,7 @@ typedef struct Oid *plan_argtypes; int nparams; int params[1]; -} PLpgSQL_expr; +} PLpgSQL_expr; typedef struct @@ -186,7 +186,7 @@ typedef struct Datum value; bool isnull; bool freeval; -} PLpgSQL_var; +} PLpgSQL_var; typedef struct @@ -200,7 +200,7 @@ typedef struct int nfields; char **fieldnames; int *varnos; -} PLpgSQL_row; +} PLpgSQL_row; typedef struct @@ -214,7 +214,7 @@ typedef struct TupleDesc tupdesc; bool freetup; bool freetupdesc; -} PLpgSQL_rec; +} PLpgSQL_rec; typedef struct @@ -223,7 +223,7 @@ typedef struct int rfno; char *fieldname; int recno; -} PLpgSQL_recfield; +} PLpgSQL_recfield; typedef struct @@ -231,7 +231,7 @@ typedef struct int dtype; int dno; PLpgSQL_expr *argnum; -} PLpgSQL_trigarg; +} PLpgSQL_trigarg; typedef struct @@ -239,7 +239,7 @@ typedef struct int itemtype; int itemno; char name[1]; -} PLpgSQL_nsitem; +} PLpgSQL_nsitem; typedef struct PLpgSQL_ns @@ -248,7 +248,7 @@ typedef struct PLpgSQL_ns int items_used; PLpgSQL_nsitem **items; struct PLpgSQL_ns *upper; -} PLpgSQL_ns; +} PLpgSQL_ns; typedef struct @@ -256,14 +256,14 @@ typedef struct int stmts_alloc; int stmts_used; struct PLpgSQL_stmt **stmts; -} PLpgSQL_stmts; +} PLpgSQL_stmts; typedef struct { /* Generic execution node */ int cmd_type; int lineno; -} PLpgSQL_stmt; +} PLpgSQL_stmt; typedef struct @@ -274,7 +274,7 @@ typedef struct PLpgSQL_stmts *body; int n_initvars; int *initvarnos; -} PLpgSQL_stmt_block; +} PLpgSQL_stmt_block; typedef struct @@ -283,14 +283,14 @@ typedef struct int lineno; int varno; PLpgSQL_expr *expr; -} PLpgSQL_stmt_assign; +} PLpgSQL_stmt_assign; typedef struct { /* Get Diagnostics item */ int item; /* id for diagnostic value desired */ int target; /* where to assign it */ -} PLpgSQL_diag_item; +} PLpgSQL_diag_item; typedef struct { /* Get Diagnostics statement */ @@ -298,7 +298,7 @@ typedef struct int lineno; int ndtitems; PLpgSQL_diag_item *dtitems; -} PLpgSQL_stmt_getdiag; +} PLpgSQL_stmt_getdiag; typedef struct @@ -308,7 +308,7 @@ typedef struct PLpgSQL_expr *cond; PLpgSQL_stmts *true_body; PLpgSQL_stmts *false_body; -} PLpgSQL_stmt_if; +} PLpgSQL_stmt_if; typedef struct @@ -317,7 +317,7 @@ typedef struct int lineno; char *label; PLpgSQL_stmts *body; -} PLpgSQL_stmt_loop; +} PLpgSQL_stmt_loop; typedef struct @@ -327,7 +327,7 @@ typedef struct char *label; PLpgSQL_expr *cond; PLpgSQL_stmts *body; -} PLpgSQL_stmt_while; +} PLpgSQL_stmt_while; typedef struct @@ -340,7 +340,7 @@ typedef struct PLpgSQL_expr *upper; int reverse; PLpgSQL_stmts *body; -} PLpgSQL_stmt_fori; +} PLpgSQL_stmt_fori; typedef struct @@ -352,7 +352,7 @@ typedef struct PLpgSQL_row *row; PLpgSQL_expr *query; PLpgSQL_stmts *body; -} PLpgSQL_stmt_fors; +} PLpgSQL_stmt_fors; typedef struct @@ -364,7 +364,7 @@ typedef struct PLpgSQL_row *row; PLpgSQL_expr *query; PLpgSQL_stmts *body; -} PLpgSQL_stmt_dynfors; +} PLpgSQL_stmt_dynfors; typedef struct @@ -374,7 +374,7 @@ typedef struct PLpgSQL_rec *rec; PLpgSQL_row *row; PLpgSQL_expr *query; -} PLpgSQL_stmt_select; +} PLpgSQL_stmt_select; typedef struct @@ -386,7 +386,7 @@ typedef struct PLpgSQL_expr *argquery; PLpgSQL_expr *query; PLpgSQL_expr *dynquery; -} PLpgSQL_stmt_open; +} PLpgSQL_stmt_open; typedef struct @@ -396,7 +396,7 @@ typedef struct PLpgSQL_rec *rec; PLpgSQL_row *row; int curvar; -} PLpgSQL_stmt_fetch; +} PLpgSQL_stmt_fetch; typedef struct @@ -404,7 +404,7 @@ typedef struct int cmd_type; int lineno; int curvar; -} PLpgSQL_stmt_close; +} PLpgSQL_stmt_close; typedef struct @@ -413,7 +413,7 @@ typedef struct int lineno; char *label; PLpgSQL_expr *cond; -} PLpgSQL_stmt_exit; +} PLpgSQL_stmt_exit; typedef struct @@ -423,7 +423,7 @@ typedef struct bool retistuple; PLpgSQL_expr *expr; int retrecno; -} PLpgSQL_stmt_return; +} PLpgSQL_stmt_return; typedef struct @@ -434,7 +434,7 @@ typedef struct char *message; int nparams; int *params; -} PLpgSQL_stmt_raise; +} PLpgSQL_stmt_raise; typedef struct @@ -442,7 +442,7 @@ typedef struct int cmd_type; int lineno; PLpgSQL_expr *sqlstmt; -} PLpgSQL_stmt_execsql; +} PLpgSQL_stmt_execsql; typedef struct @@ -450,7 +450,7 @@ typedef struct int cmd_type; int lineno; PLpgSQL_expr *query; -} PLpgSQL_stmt_dynexecute; +} PLpgSQL_stmt_dynexecute; typedef struct PLpgSQL_function @@ -487,7 +487,7 @@ typedef struct PLpgSQL_function PLpgSQL_stmt_block *action; struct PLpgSQL_function *next; /* for chaining list of functions */ -} PLpgSQL_function; +} PLpgSQL_function; typedef struct @@ -512,7 +512,7 @@ typedef struct uint32 eval_processed; Oid eval_lastoid; ExprContext *eval_econtext; -} PLpgSQL_execstate; +} PLpgSQL_execstate; /********************************************************************** @@ -612,4 +612,4 @@ extern int plpgsql_yylex(void); extern void plpgsql_push_back_token(int token); extern void plpgsql_setinput(char *s, int functype); -#endif /* PLPGSQL_H */ +#endif /* PLPGSQL_H */ diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c index b8f0335cf3..b749d8d5b5 100644 --- a/src/pl/plpython/plpython.c +++ b/src/pl/plpython/plpython.c @@ -29,7 +29,7 @@ * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.11 2001/10/28 06:26:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.12 2001/11/05 17:46:39 momjian Exp $ * ********************************************************************* */ @@ -76,19 +76,19 @@ typedef struct PLyDatumToOb FmgrInfo typfunc; Oid typelem; bool typbyval; -} PLyDatumToOb; +} PLyDatumToOb; typedef struct PLyTupleToOb { PLyDatumToOb *atts; int natts; -} PLyTupleToOb; +} PLyTupleToOb; typedef union PLyTypeInput { PLyDatumToOb d; PLyTupleToOb r; -} PLyTypeInput; +} PLyTypeInput; /* convert PyObject to a Postgresql Datum or tuple. * output from Python @@ -98,19 +98,19 @@ typedef struct PLyObToDatum FmgrInfo typfunc; Oid typelem; bool typbyval; -} PLyObToDatum; +} PLyObToDatum; typedef struct PLyObToTuple { PLyObToDatum *atts; int natts; -} PLyObToTuple; +} PLyObToTuple; typedef union PLyTypeOutput { PLyObToDatum d; PLyObToTuple r; -} PLyTypeOutput; +} PLyTypeOutput; /* all we need to move Postgresql data to Python objects, * and vis versa @@ -120,7 +120,7 @@ typedef struct PLyTypeInfo PLyTypeInput in; PLyTypeOutput out; int is_rel; -} PLyTypeInfo; +} PLyTypeInfo; /* cached procedure data @@ -141,7 +141,7 @@ typedef struct PLyProcedure PyObject *globals; /* data saved across calls, global score */ PyObject *me; /* PyCObject containing pointer to this * PLyProcedure */ -} PLyProcedure; +} PLyProcedure; /* Python objects. @@ -154,7 +154,7 @@ typedef struct PLyPlanObject Oid *types; Datum *values; PLyTypeInfo *args; -} PLyPlanObject; +} PLyPlanObject; typedef struct PLyResultObject { @@ -163,7 +163,7 @@ typedef struct PLyResultObject PyObject *nrows; /* number of rows returned by query */ PyObject *rows; /* data rows, or None if no data returned */ PyObject *status; /* query status, SPI_OK_*, or SPI_ERR_* */ -} PLyResultObject; +} PLyResultObject; /* function declarations diff --git a/src/pl/plpython/plpython.h b/src/pl/plpython/plpython.h index 35e962f3b7..e62d036c83 100644 --- a/src/pl/plpython/plpython.h +++ b/src/pl/plpython/plpython.h @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/pl/plpython/Attic/plpython.h,v 1.4 2001/10/28 06:26:15 momjian Exp $ */ +/* $Header: /cvsroot/pgsql/src/pl/plpython/Attic/plpython.h,v 1.5 2001/11/05 17:46:39 momjian Exp $ */ #ifndef PLPYTHON_H #define PLPYTHON_H @@ -65,4 +65,4 @@ #define refc(O) #endif -#endif /* PLPYTHON_H */ +#endif /* PLPYTHON_H */ diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c index 37c8c3a53a..47f92d1e38 100644 --- a/src/pl/tcl/pltcl.c +++ b/src/pl/tcl/pltcl.c @@ -31,7 +31,7 @@ * ENHANCEMENTS, OR MODIFICATIONS. * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.47 2001/10/25 05:50:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.48 2001/11/05 17:46:39 momjian Exp $ * **********************************************************************/ @@ -93,7 +93,7 @@ utf_e2u(unsigned char *src) #define UTF_END #define UTF_U2E(x) (x) #define UTF_E2U(x) (x) -#endif /* PLTCL_UTF */ +#endif /* PLTCL_UTF */ /********************************************************************** * The information we cache about loaded procedures @@ -110,7 +110,7 @@ typedef struct pltcl_proc_desc FmgrInfo arg_out_func[FUNC_MAX_ARGS]; Oid arg_out_elem[FUNC_MAX_ARGS]; int arg_is_rel[FUNC_MAX_ARGS]; -} pltcl_proc_desc; +} pltcl_proc_desc; /********************************************************************** @@ -126,7 +126,7 @@ typedef struct pltcl_query_desc Oid *argtypelems; bool *argbyvals; Datum *argvalues; -} pltcl_query_desc; +} pltcl_query_desc; /********************************************************************** diff --git a/src/test/examples/testlibpq.c b/src/test/examples/testlibpq.c index b3678005f5..ca5ebbafba 100644 --- a/src/test/examples/testlibpq.c +++ b/src/test/examples/testlibpq.c @@ -28,7 +28,7 @@ main() #ifdef DEBUG FILE *debug; -#endif /* DEBUG */ +#endif /* DEBUG */ PGconn *conn; PGresult *res; @@ -60,7 +60,7 @@ main() #ifdef DEBUG debug = fopen("/tmp/trace.out", "w"); PQtrace(conn, debug); -#endif /* DEBUG */ +#endif /* DEBUG */ /* start a transaction block */ res = PQexec(conn, "BEGIN"); @@ -127,7 +127,7 @@ main() #ifdef DEBUG fclose(debug); -#endif /* DEBUG */ +#endif /* DEBUG */ return 0; } diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c index 7163b49922..bbc45691d4 100644 --- a/src/test/regress/regress.c +++ b/src/test/regress/regress.c @@ -1,5 +1,5 @@ /* - * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.48 2001/08/16 20:38:56 tgl Exp $ + * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.49 2001/11/05 17:46:40 momjian Exp $ */ #include "postgres.h" @@ -214,7 +214,7 @@ typedef struct { Point center; double radius; -} WIDGET; +} WIDGET; WIDGET *widget_in(char *str); char *widget_out(WIDGET * widget); diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent index 8579cc05d2..faa192c94f 100755 --- a/src/tools/pgindent/pgindent +++ b/src/tools/pgindent/pgindent @@ -1454,11 +1454,11 @@ do cat /tmp/$$ fi cat /tmp/$$a | + sed 's;^/\*\(DATA(.*\)\*/$;\1;' | + sed 's;^/\*\(CATALOG(.*\)\*/$;\1;' | # remove tabs and retab with four spaces detab -t8 -qc | entab -t4 -qc | - sed 's;^/\*\(DATA(.*\)\*/$;\1;' | - sed 's;^/\*\(CATALOG(.*\)\*/$;\1;' | sed 's;/\*---X_X;/* ---;g' | # workaround indent bug sed 's;^static[ ][ ]*;static ;g' | diff --git a/src/tutorial/beard.c b/src/tutorial/beard.c index fb2c8ae43a..74dbd4deeb 100644 --- a/src/tutorial/beard.c +++ b/src/tutorial/beard.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/tutorial/Attic/beard.c,v 1.6 2001/03/22 04:01:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/tutorial/Attic/beard.c,v 1.7 2001/11/05 17:46:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,7 +16,7 @@ typedef struct ImageHdr { int size; -} ImageHdr; +} ImageHdr; #define BUFSIZE 10 diff --git a/src/tutorial/complex.c b/src/tutorial/complex.c index 02a6205681..2dd4e6e607 100644 --- a/src/tutorial/complex.c +++ b/src/tutorial/complex.c @@ -10,7 +10,7 @@ typedef struct Complex { double x; double y; -} Complex; +} Complex; /* These prototypes declare the requirements that Postgres places on these user written functions. diff --git a/src/utils/dllinit.c b/src/utils/dllinit.c index 67dc1f82aa..e30a76a5f2 100644 --- a/src/utils/dllinit.c +++ b/src/utils/dllinit.c @@ -52,7 +52,7 @@ BOOL APIENTRY DllMain(HINSTANCE hInst, DWORD reason, DECLARE_CYGWIN_DLL(DllMain); /* save hInstance from DllMain */ HINSTANCE __hDllInstance_base; -#endif /* __CYGWIN__ */ +#endif /* __CYGWIN__ */ struct _reent *_impure_ptr; @@ -84,7 +84,7 @@ DllMain( #ifdef __CYGWIN__ __hDllInstance_base = hInst; -#endif /* __CYGWIN__ */ +#endif /* __CYGWIN__ */ _impure_ptr = __imp_reent_data; @@ -105,4 +105,4 @@ DllMain( return TRUE; } -#endif /* CYGWIN_VERSION_DLL_MAJOR < 1001 */ +#endif /* CYGWIN_VERSION_DLL_MAJOR < 1001 */ diff --git a/src/utils/getopt.c b/src/utils/getopt.c index 108f2d85f5..442631347c 100644 --- a/src/utils/getopt.c +++ b/src/utils/getopt.c @@ -33,7 +33,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95"; -#endif /* LIBC_SCCS and not lint */ +#endif /* LIBC_SCCS and not lint */ #include #include -- cgit v1.2.1