Phase 3 of pgindent updates. Don't move parenthesized lines to the left, even if that means they flow past the right margin.
By default, BSD indent lines up statement continuation lines that are within parentheses so that they start just to the right of the preceding left parenthesis. However, traditionally, if that resulted in the continuation line extending to the right of the desired right margin, then indent would push it left just far enough to not overrun the margin, if it could do so without making the continuation line start to the left of the current statement indent. That makes for a weird mix of indentations unless one has been completely rigid about never violating the 80-column limit. This behavior has been pretty universally panned by Postgres developers. Hence, disable it with indent's new -lpl switch, so that parenthesized lines are always lined up with the preceding left paren. This patch is much less interesting than the first round of indent changes, but also bulkier, so I thought it best to separate the effects. Discussion: https://postgr.es/m/e1damxk-0006ee...@gemulon.postgresql.org Discussion: https://postgr.es/m/30527.1495162...@sss.pgh.pa.us Branch ------ master Details ------- https://git.postgresql.org/pg/commitdiff/382ceffdf7f620d8f2d50e451b4167d291ae2348 Modified Files -------------- contrib/adminpack/adminpack.c | 4 +- contrib/amcheck/verify_nbtree.c | 62 ++-- contrib/auth_delay/auth_delay.c | 2 +- contrib/auto_explain/auto_explain.c | 6 +- contrib/bloom/bloom.h | 4 +- contrib/bloom/blvacuum.c | 4 +- contrib/btree_gin/btree_gin.c | 4 +- contrib/btree_gist/btree_cash.c | 4 +- contrib/btree_gist/btree_date.c | 18 +- contrib/btree_gist/btree_enum.c | 4 +- contrib/btree_gist/btree_float4.c | 4 +- contrib/btree_gist/btree_float8.c | 4 +- contrib/btree_gist/btree_inet.c | 6 +- contrib/btree_gist/btree_int2.c | 4 +- contrib/btree_gist/btree_int4.c | 4 +- contrib/btree_gist/btree_int8.c | 4 +- contrib/btree_gist/btree_interval.c | 4 +- contrib/btree_gist/btree_macaddr.c | 4 +- contrib/btree_gist/btree_macaddr8.c | 4 +- contrib/btree_gist/btree_oid.c | 4 +- contrib/btree_gist/btree_time.c | 16 +- contrib/btree_gist/btree_ts.c | 4 +- contrib/btree_gist/btree_utils_var.c | 4 +- contrib/btree_gist/btree_uuid.c | 6 +- contrib/cube/cube.c | 8 +- contrib/dblink/dblink.c | 56 +-- contrib/earthdistance/earthdistance.c | 2 +- contrib/file_fdw/file_fdw.c | 2 +- contrib/hstore/hstore_io.c | 16 +- contrib/hstore/hstore_op.c | 26 +- contrib/intarray/_int_bool.c | 4 +- contrib/intarray/_int_gist.c | 2 +- contrib/intarray/_int_op.c | 4 +- contrib/intarray/_int_selfuncs.c | 12 +- contrib/isn/isn.c | 4 +- contrib/ltree/_ltree_op.c | 2 +- contrib/ltree/lquery_op.c | 2 +- contrib/ltree/ltree.h | 2 +- contrib/ltree/ltree_gist.c | 12 +- contrib/ltree/ltree_io.c | 8 +- contrib/oid2name/oid2name.c | 6 +- contrib/pageinspect/brinfuncs.c | 2 +- contrib/pageinspect/btreefuncs.c | 4 +- contrib/pageinspect/ginfuncs.c | 2 +- contrib/pageinspect/hashfuncs.c | 2 +- contrib/pageinspect/heapfuncs.c | 8 +- contrib/pageinspect/rawpage.c | 2 +- contrib/passwordcheck/passwordcheck.c | 2 +- contrib/pg_prewarm/pg_prewarm.c | 4 +- contrib/pg_standby/pg_standby.c | 4 +- contrib/pg_stat_statements/pg_stat_statements.c | 32 +- contrib/pg_visibility/pg_visibility.c | 4 +- contrib/pgcrypto/crypt-blowfish.c | 2 +- contrib/pgcrypto/crypt-gensalt.c | 8 +- contrib/pgcrypto/pgp-pgsql.c | 4 +- contrib/pgcrypto/px-crypt.h | 8 +- contrib/pgrowlocks/pgrowlocks.c | 2 +- contrib/pgstattuple/pgstatapprox.c | 2 +- contrib/pgstattuple/pgstatindex.c | 12 +- contrib/postgres_fdw/connection.c | 20 +- contrib/postgres_fdw/deparse.c | 16 +- contrib/postgres_fdw/option.c | 2 +- contrib/postgres_fdw/postgres_fdw.c | 40 +-- contrib/seg/seg.c | 12 +- contrib/sepgsql/hooks.c | 4 +- contrib/sepgsql/label.c | 8 +- contrib/sepgsql/proc.c | 2 +- contrib/sepgsql/uavc.c | 2 +- contrib/spi/refint.c | 2 +- contrib/sslinfo/sslinfo.c | 4 +- contrib/tablefunc/tablefunc.c | 26 +- contrib/tcn/tcn.c | 2 +- contrib/test_decoding/test_decoding.c | 24 +- contrib/unaccent/unaccent.c | 8 +- contrib/xml2/xpath.c | 6 +- contrib/xml2/xslt_proc.c | 2 +- src/backend/access/brin/brin.c | 4 +- src/backend/access/brin/brin_inclusion.c | 8 +- src/backend/access/brin/brin_minmax.c | 4 +- src/backend/access/brin/brin_pageops.c | 12 +- src/backend/access/brin/brin_revmap.c | 10 +- src/backend/access/brin/brin_tuple.c | 2 +- src/backend/access/common/indextuple.c | 4 +- src/backend/access/common/reloptions.c | 30 +- src/backend/access/gin/gindatapage.c | 8 +- src/backend/access/gin/ginentrypage.c | 8 +- src/backend/access/gin/ginfast.c | 10 +- src/backend/access/gin/ginget.c | 16 +- src/backend/access/gin/gininsert.c | 4 +- src/backend/access/gin/ginlogic.c | 32 +- src/backend/access/gin/ginscan.c | 6 +- src/backend/access/gin/ginutil.c | 16 +- src/backend/access/gist/gist.c | 12 +- src/backend/access/gist/gistbuild.c | 6 +- src/backend/access/gist/gistbuildbuffers.c | 2 +- src/backend/access/gist/gistproc.c | 76 ++-- src/backend/access/gist/gistsplit.c | 4 +- src/backend/access/gist/gistutil.c | 10 +- src/backend/access/hash/hashinsert.c | 2 +- src/backend/access/hash/hashovfl.c | 4 +- src/backend/access/hash/hashpage.c | 2 +- src/backend/access/hash/hashutil.c | 12 +- src/backend/access/heap/heapam.c | 48 +-- src/backend/access/heap/pruneheap.c | 4 +- src/backend/access/heap/tuptoaster.c | 4 +- src/backend/access/heap/visibilitymap.c | 2 +- src/backend/access/index/indexam.c | 4 +- src/backend/access/nbtree/nbtinsert.c | 26 +- src/backend/access/nbtree/nbtpage.c | 12 +- src/backend/access/nbtree/nbtsearch.c | 8 +- src/backend/access/nbtree/nbtsort.c | 14 +- src/backend/access/nbtree/nbtutils.c | 4 +- src/backend/access/rmgrdesc/brindesc.c | 2 +- src/backend/access/rmgrdesc/gindesc.c | 16 +- src/backend/access/rmgrdesc/hashdesc.c | 6 +- src/backend/access/rmgrdesc/logicalmsgdesc.c | 2 +- src/backend/access/rmgrdesc/nbtdesc.c | 2 +- src/backend/access/rmgrdesc/spgdesc.c | 2 +- src/backend/access/rmgrdesc/xactdesc.c | 4 +- src/backend/access/rmgrdesc/xlogdesc.c | 4 +- src/backend/access/spgist/spgdoinsert.c | 46 +-- src/backend/access/spgist/spginsert.c | 2 +- src/backend/access/spgist/spgquadtreeproc.c | 4 +- src/backend/access/spgist/spgscan.c | 2 +- src/backend/access/spgist/spgutils.c | 4 +- src/backend/access/spgist/spgvacuum.c | 4 +- src/backend/access/spgist/spgxlog.c | 36 +- src/backend/access/transam/clog.c | 2 +- src/backend/access/transam/commit_ts.c | 4 +- src/backend/access/transam/multixact.c | 42 +-- src/backend/access/transam/parallel.c | 8 +- src/backend/access/transam/slru.c | 16 +- src/backend/access/transam/timeline.c | 8 +- src/backend/access/transam/twophase.c | 46 +-- src/backend/access/transam/varsup.c | 10 +- src/backend/access/transam/xact.c | 22 +- src/backend/access/transam/xlog.c | 330 ++++++++--------- src/backend/access/transam/xlogfuncs.c | 10 +- src/backend/access/transam/xloginsert.c | 4 +- src/backend/access/transam/xlogreader.c | 44 +-- src/backend/access/transam/xlogutils.c | 6 +- src/backend/bootstrap/bootstrap.c | 2 +- src/backend/catalog/aclchk.c | 24 +- src/backend/catalog/dependency.c | 8 +- src/backend/catalog/heap.c | 48 +-- src/backend/catalog/index.c | 12 +- src/backend/catalog/namespace.c | 18 +- src/backend/catalog/objectaddress.c | 120 +++---- src/backend/catalog/partition.c | 34 +- src/backend/catalog/pg_aggregate.c | 20 +- src/backend/catalog/pg_collation.c | 4 +- src/backend/catalog/pg_constraint.c | 18 +- src/backend/catalog/pg_depend.c | 6 +- src/backend/catalog/pg_enum.c | 2 +- src/backend/catalog/pg_operator.c | 6 +- src/backend/catalog/pg_proc.c | 26 +- src/backend/catalog/pg_publication.c | 8 +- src/backend/catalog/pg_shdepend.c | 10 +- src/backend/catalog/pg_type.c | 16 +- src/backend/commands/aggregatecmds.c | 2 +- src/backend/commands/alter.c | 2 +- src/backend/commands/analyze.c | 18 +- src/backend/commands/async.c | 2 +- src/backend/commands/cluster.c | 10 +- src/backend/commands/collationcmds.c | 22 +- src/backend/commands/copy.c | 82 ++--- src/backend/commands/createas.c | 4 +- src/backend/commands/dbcommands.c | 26 +- src/backend/commands/define.c | 2 +- src/backend/commands/dropcmds.c | 10 +- src/backend/commands/event_trigger.c | 22 +- src/backend/commands/explain.c | 28 +- src/backend/commands/extension.c | 38 +- src/backend/commands/foreigncmds.c | 38 +- src/backend/commands/functioncmds.c | 58 +-- src/backend/commands/indexcmds.c | 38 +- src/backend/commands/matview.c | 14 +- src/backend/commands/opclasscmds.c | 14 +- src/backend/commands/operatorcmds.c | 14 +- src/backend/commands/policy.c | 14 +- src/backend/commands/prepare.c | 8 +- src/backend/commands/proclang.c | 10 +- src/backend/commands/publicationcmds.c | 6 +- src/backend/commands/schemacmds.c | 6 +- src/backend/commands/sequence.c | 40 +-- src/backend/commands/statscmds.c | 12 +- src/backend/commands/subscriptioncmds.c | 18 +- src/backend/commands/tablecmds.c | 246 ++++++------- src/backend/commands/tablespace.c | 30 +- src/backend/commands/trigger.c | 74 ++-- src/backend/commands/tsearchcmds.c | 26 +- src/backend/commands/typecmds.c | 66 ++-- src/backend/commands/user.c | 18 +- src/backend/commands/vacuum.c | 8 +- src/backend/commands/vacuumlazy.c | 24 +- src/backend/commands/variable.c | 4 +- src/backend/commands/view.c | 16 +- src/backend/executor/execExpr.c | 20 +- src/backend/executor/execExprInterp.c | 38 +- src/backend/executor/execIndexing.c | 6 +- src/backend/executor/execMain.c | 92 ++--- src/backend/executor/execParallel.c | 12 +- src/backend/executor/execProcnode.c | 2 +- src/backend/executor/execReplication.c | 4 +- src/backend/executor/execSRF.c | 14 +- src/backend/executor/execTuples.c | 2 +- src/backend/executor/functions.c | 36 +- src/backend/executor/nodeAgg.c | 32 +- src/backend/executor/nodeBitmapIndexscan.c | 2 +- src/backend/executor/nodeFunctionscan.c | 4 +- src/backend/executor/nodeGatherMerge.c | 2 +- src/backend/executor/nodeHash.c | 8 +- src/backend/executor/nodeHashjoin.c | 14 +- src/backend/executor/nodeIndexonlyscan.c | 2 +- src/backend/executor/nodeIndexscan.c | 2 +- src/backend/executor/nodeLimit.c | 4 +- src/backend/executor/nodeMergejoin.c | 8 +- src/backend/executor/nodeModifyTable.c | 28 +- src/backend/executor/nodeNestloop.c | 2 +- src/backend/executor/nodeSamplescan.c | 4 +- src/backend/executor/nodeSeqscan.c | 2 +- src/backend/executor/nodeTableFuncscan.c | 12 +- src/backend/executor/nodeTidscan.c | 2 +- src/backend/executor/nodeWindowAgg.c | 16 +- src/backend/executor/spi.c | 20 +- src/backend/executor/tqueue.c | 6 +- src/backend/executor/tstoreReceiver.c | 2 +- src/backend/lib/pairingheap.c | 4 +- src/backend/libpq/auth-scram.c | 6 +- src/backend/libpq/auth.c | 150 ++++---- src/backend/libpq/be-fsstubs.c | 16 +- src/backend/libpq/be-secure-openssl.c | 14 +- src/backend/libpq/hba.c | 48 +-- src/backend/libpq/pqcomm.c | 20 +- src/backend/main/main.c | 10 +- src/backend/nodes/nodeFuncs.c | 14 +- src/backend/nodes/params.c | 2 +- src/backend/nodes/tidbitmap.c | 6 +- src/backend/optimizer/path/allpaths.c | 16 +- src/backend/optimizer/path/clausesel.c | 2 +- src/backend/optimizer/path/costsize.c | 22 +- src/backend/optimizer/path/equivclass.c | 16 +- src/backend/optimizer/path/indxpath.c | 16 +- src/backend/optimizer/path/joinpath.c | 12 +- src/backend/optimizer/path/joinrels.c | 2 +- src/backend/optimizer/path/pathkeys.c | 12 +- src/backend/optimizer/plan/createplan.c | 50 +-- src/backend/optimizer/plan/initsplan.c | 2 +- src/backend/optimizer/plan/planagg.c | 2 +- src/backend/optimizer/plan/planner.c | 54 +-- src/backend/optimizer/plan/setrefs.c | 6 +- src/backend/optimizer/plan/subselect.c | 2 +- src/backend/optimizer/prep/prepjointree.c | 20 +- src/backend/optimizer/prep/prepunion.c | 22 +- src/backend/optimizer/util/clauses.c | 32 +- src/backend/optimizer/util/orclauses.c | 2 +- src/backend/optimizer/util/pathnode.c | 8 +- src/backend/optimizer/util/plancat.c | 6 +- src/backend/optimizer/util/relnode.c | 2 +- src/backend/optimizer/util/var.c | 4 +- src/backend/parser/analyze.c | 62 ++-- src/backend/parser/parse_agg.c | 16 +- src/backend/parser/parse_clause.c | 100 +++--- src/backend/parser/parse_coerce.c | 48 +-- src/backend/parser/parse_collate.c | 12 +- src/backend/parser/parse_cte.c | 14 +- src/backend/parser/parse_expr.c | 52 +-- src/backend/parser/parse_func.c | 84 ++--- src/backend/parser/parse_node.c | 4 +- src/backend/parser/parse_oper.c | 14 +- src/backend/parser/parse_param.c | 4 +- src/backend/parser/parse_relation.c | 40 +-- src/backend/parser/parse_target.c | 14 +- src/backend/parser/parse_type.c | 14 +- src/backend/parser/parse_utilcmd.c | 82 ++--- src/backend/port/dynloader/hpux.c | 2 +- src/backend/port/sysv_sema.c | 12 +- src/backend/port/sysv_shmem.c | 22 +- src/backend/port/win32/crashdump.c | 6 +- src/backend/port/win32/mingwcompat.c | 4 +- src/backend/port/win32/signal.c | 12 +- src/backend/port/win32/socket.c | 2 +- src/backend/port/win32/timer.c | 8 +- src/backend/postmaster/autovacuum.c | 8 +- src/backend/postmaster/bgworker.c | 2 +- src/backend/postmaster/checkpointer.c | 6 +- src/backend/postmaster/pgarch.c | 22 +- src/backend/postmaster/pgstat.c | 62 ++-- src/backend/postmaster/postmaster.c | 52 +-- src/backend/postmaster/syslogger.c | 4 +- src/backend/replication/basebackup.c | 30 +- .../libpqwalreceiver/libpqwalreceiver.c | 8 +- src/backend/replication/logical/decode.c | 2 +- src/backend/replication/logical/launcher.c | 16 +- src/backend/replication/logical/logical.c | 18 +- src/backend/replication/logical/logicalfuncs.c | 4 +- src/backend/replication/logical/origin.c | 14 +- src/backend/replication/logical/relation.c | 14 +- src/backend/replication/logical/reorderbuffer.c | 16 +- src/backend/replication/logical/snapbuild.c | 32 +- src/backend/replication/logical/tablesync.c | 4 +- src/backend/replication/logical/worker.c | 16 +- src/backend/replication/pgoutput/pgoutput.c | 6 +- src/backend/replication/slot.c | 12 +- src/backend/replication/syncrep.c | 8 +- src/backend/replication/walreceiver.c | 20 +- src/backend/replication/walsender.c | 20 +- src/backend/rewrite/rewriteDefine.c | 24 +- src/backend/rewrite/rewriteHandler.c | 52 +-- src/backend/rewrite/rewriteManip.c | 6 +- src/backend/rewrite/rowsecurity.c | 6 +- src/backend/statistics/dependencies.c | 12 +- src/backend/statistics/extended_stats.c | 2 +- src/backend/statistics/mvdistinct.c | 6 +- src/backend/storage/buffer/bufmgr.c | 22 +- src/backend/storage/buffer/freelist.c | 2 +- src/backend/storage/buffer/localbuf.c | 2 +- src/backend/storage/file/fd.c | 8 +- src/backend/storage/ipc/dsm.c | 4 +- src/backend/storage/ipc/dsm_impl.c | 52 +-- src/backend/storage/ipc/ipc.c | 6 +- src/backend/storage/ipc/latch.c | 2 +- src/backend/storage/ipc/procarray.c | 6 +- src/backend/storage/ipc/shm_toc.c | 4 +- src/backend/storage/ipc/shmem.c | 10 +- src/backend/storage/ipc/sinval.c | 2 +- src/backend/storage/ipc/standby.c | 10 +- src/backend/storage/large_object/inv_api.c | 4 +- src/backend/storage/lmgr/deadlock.c | 10 +- src/backend/storage/lmgr/lock.c | 22 +- src/backend/storage/lmgr/predicate.c | 60 ++-- src/backend/storage/lmgr/proc.c | 32 +- src/backend/storage/lmgr/s_lock.c | 2 +- src/backend/storage/page/bufpage.c | 12 +- src/backend/storage/smgr/md.c | 22 +- src/backend/storage/smgr/smgr.c | 4 +- src/backend/tcop/fastpath.c | 20 +- src/backend/tcop/postgres.c | 66 ++-- src/backend/tcop/pquery.c | 2 +- src/backend/tcop/utility.c | 12 +- src/backend/tsearch/dict.c | 16 +- src/backend/tsearch/dict_ispell.c | 4 +- src/backend/tsearch/dict_simple.c | 4 +- src/backend/tsearch/dict_thesaurus.c | 20 +- src/backend/tsearch/spell.c | 14 +- src/backend/tsearch/to_tsany.c | 10 +- src/backend/tsearch/ts_locale.c | 2 +- src/backend/tsearch/ts_parse.c | 18 +- src/backend/tsearch/ts_typanalyze.c | 4 +- src/backend/tsearch/wparser.c | 22 +- src/backend/tsearch/wparser_def.c | 2 +- src/backend/utils/adt/acl.c | 10 +- src/backend/utils/adt/amutils.c | 2 +- src/backend/utils/adt/array_selfuncs.c | 6 +- src/backend/utils/adt/array_typanalyze.c | 4 +- src/backend/utils/adt/array_userfuncs.c | 16 +- src/backend/utils/adt/arrayfuncs.c | 116 +++--- src/backend/utils/adt/date.c | 14 +- src/backend/utils/adt/datetime.c | 32 +- src/backend/utils/adt/dbsize.c | 8 +- src/backend/utils/adt/domains.c | 2 +- src/backend/utils/adt/encode.c | 2 +- src/backend/utils/adt/enum.c | 2 +- src/backend/utils/adt/float.c | 6 +- src/backend/utils/adt/formatting.c | 74 ++-- src/backend/utils/adt/genfile.c | 4 +- src/backend/utils/adt/geo_ops.c | 16 +- src/backend/utils/adt/inet_cidr_ntop.c | 4 +- src/backend/utils/adt/json.c | 50 +-- src/backend/utils/adt/jsonb.c | 18 +- src/backend/utils/adt/jsonb_util.c | 14 +- src/backend/utils/adt/jsonfuncs.c | 30 +- src/backend/utils/adt/levenshtein.c | 4 +- src/backend/utils/adt/like.c | 2 +- src/backend/utils/adt/like_match.c | 4 +- src/backend/utils/adt/lockfuncs.c | 2 +- src/backend/utils/adt/mac.c | 4 +- src/backend/utils/adt/mac8.c | 20 +- src/backend/utils/adt/misc.c | 14 +- src/backend/utils/adt/nabstime.c | 22 +- src/backend/utils/adt/network_selfuncs.c | 10 +- src/backend/utils/adt/numeric.c | 14 +- src/backend/utils/adt/numutils.c | 2 +- src/backend/utils/adt/pg_locale.c | 16 +- src/backend/utils/adt/pg_upgrade_support.c | 2 +- src/backend/utils/adt/pgstatfuncs.c | 4 +- src/backend/utils/adt/rangetypes.c | 18 +- src/backend/utils/adt/rangetypes_selfuncs.c | 24 +- src/backend/utils/adt/rangetypes_spgist.c | 12 +- src/backend/utils/adt/rangetypes_typanalyze.c | 10 +- src/backend/utils/adt/regexp.c | 8 +- src/backend/utils/adt/regproc.c | 20 +- src/backend/utils/adt/ri_triggers.c | 16 +- src/backend/utils/adt/rowtypes.c | 12 +- src/backend/utils/adt/ruleutils.c | 62 ++-- src/backend/utils/adt/selfuncs.c | 52 +-- src/backend/utils/adt/timestamp.c | 92 ++--- src/backend/utils/adt/tsquery.c | 2 +- src/backend/utils/adt/tsvector_op.c | 10 +- src/backend/utils/adt/uuid.c | 2 +- src/backend/utils/adt/varbit.c | 8 +- src/backend/utils/adt/varchar.c | 8 +- src/backend/utils/adt/varlena.c | 12 +- src/backend/utils/adt/xml.c | 146 ++++---- src/backend/utils/cache/inval.c | 8 +- src/backend/utils/cache/plancache.c | 4 +- src/backend/utils/cache/relcache.c | 22 +- src/backend/utils/cache/relmapper.c | 4 +- src/backend/utils/cache/ts_cache.c | 2 +- src/backend/utils/error/elog.c | 4 +- src/backend/utils/fmgr/dfmgr.c | 14 +- src/backend/utils/fmgr/fmgr.c | 6 +- src/backend/utils/fmgr/funcapi.c | 2 +- src/backend/utils/hash/dynahash.c | 2 +- src/backend/utils/init/miscinit.c | 6 +- src/backend/utils/init/postinit.c | 30 +- .../utf8_and_euc2004/utf8_and_euc2004.c | 4 +- .../utf8_and_sjis2004/utf8_and_sjis2004.c | 4 +- src/backend/utils/mb/mbutils.c | 18 +- src/backend/utils/mb/wchar.c | 8 +- src/backend/utils/misc/guc.c | 80 ++--- src/backend/utils/misc/help_config.c | 2 +- src/backend/utils/misc/pg_controldata.c | 6 +- src/backend/utils/misc/pg_rusage.c | 4 +- src/backend/utils/mmgr/aset.c | 2 +- src/backend/utils/mmgr/dsa.c | 6 +- src/backend/utils/mmgr/freepage.c | 6 +- src/backend/utils/mmgr/mcxt.c | 2 +- src/backend/utils/sort/logtape.c | 2 +- src/backend/utils/sort/tuplesort.c | 10 +- src/backend/utils/sort/tuplestore.c | 14 +- src/backend/utils/time/combocid.c | 2 +- src/backend/utils/time/snapmgr.c | 18 +- src/bin/initdb/findtimezone.c | 2 +- src/bin/initdb/initdb.c | 46 +-- src/bin/pg_basebackup/pg_basebackup.c | 38 +- src/bin/pg_basebackup/pg_receivewal.c | 2 +- src/bin/pg_basebackup/pg_recvlogical.c | 10 +- src/bin/pg_basebackup/receivelog.c | 24 +- src/bin/pg_basebackup/streamutil.c | 6 +- src/bin/pg_basebackup/walmethods.c | 2 +- src/bin/pg_ctl/pg_ctl.c | 18 +- src/bin/pg_dump/compress_io.c | 6 +- src/bin/pg_dump/dumputils.c | 18 +- src/bin/pg_dump/parallel.c | 4 +- src/bin/pg_dump/pg_backup_archiver.c | 20 +- src/bin/pg_dump/pg_backup_custom.c | 6 +- src/bin/pg_dump/pg_backup_db.c | 2 +- src/bin/pg_dump/pg_backup_tar.c | 8 +- src/bin/pg_dump/pg_dump.c | 390 ++++++++++----------- src/bin/pg_dump/pg_dumpall.c | 56 +-- src/bin/pg_dump/pg_restore.c | 2 +- src/bin/pg_resetwal/pg_resetwal.c | 4 +- src/bin/pg_rewind/filemap.c | 2 +- src/bin/pg_rewind/parsexlog.c | 2 +- src/bin/pg_rewind/pg_rewind.c | 2 +- src/bin/pg_test_timing/pg_test_timing.c | 2 +- src/bin/pg_upgrade/check.c | 34 +- src/bin/pg_upgrade/controldata.c | 6 +- src/bin/pg_upgrade/dump.c | 6 +- src/bin/pg_upgrade/function.c | 6 +- src/bin/pg_upgrade/info.c | 2 +- src/bin/pg_upgrade/option.c | 14 +- src/bin/pg_upgrade/pg_upgrade.c | 6 +- src/bin/pg_upgrade/pg_upgrade.h | 4 +- src/bin/pg_upgrade/server.c | 6 +- src/bin/pg_upgrade/tablespace.c | 12 +- src/bin/pg_upgrade/version.c | 10 +- src/bin/pg_waldump/compat.c | 2 +- src/bin/pg_waldump/pg_waldump.c | 8 +- src/bin/pgbench/pgbench.c | 40 +-- src/bin/pgevent/pgevent.c | 4 +- src/bin/psql/command.c | 20 +- src/bin/psql/crosstabview.c | 6 +- src/bin/psql/describe.c | 334 +++++++++--------- src/bin/psql/help.c | 18 +- src/bin/psql/large_obj.c | 6 +- src/bin/psql/mainloop.c | 2 +- src/bin/psql/tab-complete.c | 38 +- src/bin/scripts/common.h | 4 +- src/bin/scripts/dropdb.c | 2 +- src/bin/scripts/reindexdb.c | 14 +- src/bin/scripts/vacuumdb.c | 4 +- src/common/file_utils.c | 2 +- src/common/restricted_token.c | 4 +- src/common/username.c | 2 +- src/fe_utils/mbprint.c | 2 +- src/fe_utils/print.c | 10 +- src/include/access/amapi.h | 10 +- src/include/access/clog.h | 2 +- src/include/access/genam.h | 2 +- src/include/access/gin_private.h | 2 +- src/include/access/hash.h | 2 +- src/include/access/heapam.h | 4 +- src/include/access/xlog.h | 4 +- src/include/catalog/pg_constraint_fn.h | 2 +- src/include/commands/createas.h | 2 +- src/include/commands/explain.h | 2 +- src/include/executor/executor.h | 2 +- src/include/executor/nodeIndexscan.h | 2 +- src/include/foreign/fdwapi.h | 8 +- src/include/lib/pairingheap.h | 2 +- src/include/mb/pg_wchar.h | 2 +- src/include/optimizer/cost.h | 2 +- src/include/parser/parse_relation.h | 2 +- src/include/pgtar.h | 2 +- src/include/postgres.h | 2 +- src/include/replication/logical.h | 8 +- src/include/replication/reorderbuffer.h | 4 +- src/include/rewrite/rewriteManip.h | 2 +- src/include/storage/procarray.h | 2 +- src/include/storage/sinval.h | 2 +- src/include/tcop/utility.h | 4 +- src/include/utils/acl.h | 2 +- src/include/utils/elog.h | 6 +- src/include/utils/jsonapi.h | 4 +- src/interfaces/ecpg/ecpglib/data.c | 4 +- src/interfaces/ecpg/ecpglib/error.c | 8 +- src/interfaces/ecpg/ecpglib/execute.c | 4 +- src/interfaces/ecpg/ecpglib/extern.h | 2 +- src/interfaces/ecpg/ecpglib/prepare.c | 4 +- src/interfaces/ecpg/pgtypeslib/dt_common.c | 16 +- src/interfaces/ecpg/preproc/descriptor.c | 2 +- src/interfaces/ecpg/preproc/ecpg.c | 2 +- src/interfaces/ecpg/preproc/type.c | 2 +- src/interfaces/libpq/fe-auth-scram.c | 18 +- src/interfaces/libpq/fe-auth.c | 44 +-- src/interfaces/libpq/fe-connect.c | 138 ++++---- src/interfaces/libpq/fe-exec.c | 36 +- src/interfaces/libpq/fe-lobj.c | 38 +- src/interfaces/libpq/fe-misc.c | 6 +- src/interfaces/libpq/fe-print.c | 4 +- src/interfaces/libpq/fe-protocol2.c | 12 +- src/interfaces/libpq/fe-protocol3.c | 14 +- src/interfaces/libpq/fe-secure-openssl.c | 72 ++-- src/interfaces/libpq/fe-secure.c | 16 +- src/interfaces/libpq/win32.c | 2 +- src/pl/plperl/plperl.c | 44 +-- src/pl/plpgsql/src/pl_comp.c | 42 +-- src/pl/plpgsql/src/pl_exec.c | 146 ++++---- src/pl/plpgsql/src/pl_handler.c | 4 +- src/pl/plpython/plpy_cursorobject.c | 6 +- src/pl/plpython/plpy_elog.c | 14 +- src/pl/plpython/plpy_elog.h | 2 +- src/pl/plpython/plpy_exec.c | 10 +- src/pl/plpython/plpy_plpymodule.c | 4 +- src/pl/plpython/plpy_procedure.c | 10 +- src/pl/plpython/plpy_spi.c | 8 +- src/pl/plpython/plpy_typeio.c | 2 +- src/pl/tcl/pltcl.c | 74 ++-- src/port/dirmod.c | 6 +- src/port/getaddrinfo.c | 2 +- src/port/getopt_long.c | 2 +- src/port/gettimeofday.c | 4 +- src/port/inet_net_ntop.c | 4 +- src/port/open.c | 20 +- src/port/path.c | 2 +- src/port/win32security.c | 2 +- src/test/isolation/isolationtester.c | 4 +- src/test/modules/test_shm_mq/setup.c | 2 +- src/test/modules/test_shm_mq/test.c | 4 +- src/test/modules/test_shm_mq/worker.c | 2 +- src/test/modules/worker_spi/worker_spi.c | 10 +- src/test/regress/pg_regress.c | 2 +- src/test/regress/regress.c | 14 +- src/timezone/pgtz.c | 2 +- src/tools/findoidjoins/findoidjoins.c | 2 +- src/tools/pgindent/pgindent | 2 +- 568 files changed, 4747 insertions(+), 4745 deletions(-) -- Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-committers