Fix some comments.

Like commit 123661427b, these were discovered while reviewing
Aleksander Alekseev's proposed changes to pgindent.

diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c
index 1cc126772f7c013437764eaab442b0e9039f5eda..67bdd3d93d05f3f37805ffcca1e7fd451d678a64 100644 (file)
--- a/src/backend/libpq/pqformat.c
+++ b/src/backend/libpq/pqformat.c
@@ -307,9 +307,8 @@ pq_endmessage(StringInfo buf)
  *
  * The data buffer is *not* freed, allowing to reuse the buffer with
  * pq_beginmessage_reuse.
  *
  * The data buffer is *not* freed, allowing to reuse the buffer with
  * pq_beginmessage_reuse.

- --------------------------------
+ * --------------------------------

  */
  */

-

 void
 pq_endmessage_reuse(StringInfo buf)
 {
 void
 pq_endmessage_reuse(StringInfo buf)
 {

diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index 688dcd09ca6ec751265f3b1be05555f1b284bf32..0852322cc588c2008f0ad9836a28513c0f080af4 100644 (file)
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -2620,7 +2620,7 @@ view_col_is_auto_updatable(RangeTblRef *rtr, TargetEntry *tle)
  * view_query_is_auto_updatable - test whether the specified view definition
  * represents an auto-updatable view. Returns NULL (if the view can be updated)
  * or a message string giving the reason that it cannot be.
  * view_query_is_auto_updatable - test whether the specified view definition
  * represents an auto-updatable view. Returns NULL (if the view can be updated)
  * or a message string giving the reason that it cannot be.

-
+ *

  * The returned string has not been translated; if it is shown as an error
  * message, the caller should apply _() to translate it.
  *
  * The returned string has not been translated; if it is shown as an error
  * message, the caller should apply _() to translate it.
  *

diff --git a/src/backend/storage/file/fileset.c b/src/backend/storage/file/fileset.c
index 4d5ee353fd7a078688164730f6c71b0058f7ed06..2061aa44e773ded55ce830560e9990ea9f7ccaa7 100644 (file)
--- a/src/backend/storage/file/fileset.c
+++ b/src/backend/storage/file/fileset.c
@@ -114,7 +114,8 @@ FileSetCreate(FileSet *fileset, const char *name)
 }
 
 /*
 }
 
 /*

- * Open a file that was created with FileSetCreate() */
+ * Open a file that was created with FileSetCreate()
+ */

 File
 FileSetOpen(FileSet *fileset, const char *name, int mode)
 {
 File
 FileSetOpen(FileSet *fileset, const char *name, int mode)
 {

diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 3bf30774a0c94430193c9a0332e0ee02d7ad13d1..254c5cf82e4b1215566f764117d01c18a74ef23d 100644 (file)
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -113,7 +113,7 @@ static const int8 hexlookup[128] = {
  * pg_strtoint16() will throw ereport() upon bad input format or overflow;
  * while pg_strtoint16_safe() instead returns such complaints in *escontext,
  * if it's an ErrorSaveContext.
  * pg_strtoint16() will throw ereport() upon bad input format or overflow;
  * while pg_strtoint16_safe() instead returns such complaints in *escontext,
  * if it's an ErrorSaveContext.

-*
+ *

  * NB: Accumulate input as an unsigned number, to deal with two's complement
  * representation of the most negative number, which can't be represented as a
  * signed positive number.
  * NB: Accumulate input as an unsigned number, to deal with two's complement
  * representation of the most negative number, which can't be represented as a
  * signed positive number.

diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index a4dc1cbe5aec2798596ae49afe7650d81db01e42..2d0cb7bcfd4a63f3c9bdd7127337e24b77f9c99e 100644 (file)
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -5643,7 +5643,7 @@ RelationGetIdentityKeyBitmap(Relation relation)
  * This should be called only for an index that is known to have an associated
  * exclusion constraint or primary key/unique constraint using WITHOUT
  * OVERLAPS.
  * This should be called only for an index that is known to have an associated
  * exclusion constraint or primary key/unique constraint using WITHOUT
  * OVERLAPS.

-
+ *

  * It returns arrays (palloc'd in caller's context) of the exclusion operator
  * OIDs, their underlying functions' OIDs, and their strategy numbers in the
  * index's opclasses.  We cache all this information since it requires a fair
  * It returns arrays (palloc'd in caller's context) of the exclusion operator
  * OIDs, their underlying functions' OIDs, and their strategy numbers in the
  * index's opclasses.  We cache all this information since it requires a fair

diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c
index 4a312ab429b6fe378b23faf410ffe17105be87f1..d53e885b067e4cb9c3879d3a6bb2eb4db7b5eae8 100644 (file)
--- a/src/backend/utils/mb/conv.c
+++ b/src/backend/utils/mb/conv.c
@@ -484,7 +484,7 @@ pg_mb_radix_conv(const pg_mb_radix_tree *rt,
  * utf: input string in UTF8 encoding (need not be null-terminated)
  * len: length of input string (in bytes)
  * iso: pointer to the output area (must be large enough!)
  * utf: input string in UTF8 encoding (need not be null-terminated)
  * len: length of input string (in bytes)
  * iso: pointer to the output area (must be large enough!)

-         (output string will be null-terminated)
+ *       (output string will be null-terminated)

  * map: conversion map for single characters
  * cmap: conversion map for combined characters
  *       (optional, pass NULL if none)
  * map: conversion map for single characters
  * cmap: conversion map for combined characters
  *       (optional, pass NULL if none)


@@ -694,7 +694,7 @@ UtfToLocal(const unsigned char *utf, int len,
  * iso: input string in local encoding (need not be null-terminated)
  * len: length of input string (in bytes)
  * utf: pointer to the output area (must be large enough!)
  * iso: input string in local encoding (need not be null-terminated)
  * len: length of input string (in bytes)
  * utf: pointer to the output area (must be large enough!)

-         (output string will be null-terminated)
+ *       (output string will be null-terminated)

  * map: conversion map for single characters
  * cmap: conversion map for combined characters
  *       (optional, pass NULL if none)
  * map: conversion map for single characters
  * cmap: conversion map for combined characters
  *       (optional, pass NULL if none)

diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index dbce0e61812b3170b4f23da06cb802cb2317ce36..d1701d69b16e2b625244fbde4e3fe4a82e662b20 100644 (file)
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -497,7 +497,8 @@ pg_do_encoding_conversion_buf(Oid proc,
  * Convert string to encoding encoding_name. The source
  * encoding is the DB encoding.
  *
  * Convert string to encoding encoding_name. The source
  * encoding is the DB encoding.
  *

- * BYTEA convert_to(TEXT string, NAME encoding_name) */
+ * BYTEA convert_to(TEXT string, NAME encoding_name)
+ */

 Datum
 pg_convert_to(PG_FUNCTION_ARGS)
 {
 Datum
 pg_convert_to(PG_FUNCTION_ARGS)
 {


@@ -522,7 +523,8 @@ pg_convert_to(PG_FUNCTION_ARGS)
  * Convert string from encoding encoding_name. The destination
  * encoding is the DB encoding.
  *
  * Convert string from encoding encoding_name. The destination
  * encoding is the DB encoding.
  *

- * TEXT convert_from(BYTEA string, NAME encoding_name) */
+ * TEXT convert_from(BYTEA string, NAME encoding_name)
+ */

 Datum
 pg_convert_from(PG_FUNCTION_ARGS)
 {
 Datum
 pg_convert_from(PG_FUNCTION_ARGS)
 {

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index f7d63e04c04602c64f4d5504521564bc71506993..935c235e1b39d9f29eaa0c30b72084eb5d959cb9 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -5449,7 +5449,7 @@ ShowGUCOption(const struct config_generic *record, bool use_units)
  *     variable sourceline, integer
  *     variable source, integer
  *     variable scontext, integer
  *     variable sourceline, integer
  *     variable source, integer
  *     variable scontext, integer

-*      variable srole, OID
+ *     variable srole, OID

  */
 static void
 write_one_nondefault_variable(FILE *fp, struct config_generic *gconf)
  */
 static void
 write_one_nondefault_variable(FILE *fp, struct config_generic *gconf)

diff --git a/src/backend/utils/mmgr/alignedalloc.c b/src/backend/utils/mmgr/alignedalloc.c
index b1be7426914974c1d6fde912c1e9115e72e1e646..daee3fc80a1c397c9f775b1df5202372cb2f302a 100644 (file)
--- a/src/backend/utils/mmgr/alignedalloc.c
+++ b/src/backend/utils/mmgr/alignedalloc.c
@@ -23,8 +23,8 @@
 
 /*
  * AlignedAllocFree
 
 /*
  * AlignedAllocFree

-*      Frees allocated memory; memory is removed from its owning context.
-*/
+ *     Frees allocated memory; memory is removed from its owning context.
+ */

 void
 AlignedAllocFree(void *pointer)
 {
 void
 AlignedAllocFree(void *pointer)
 {

diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index 943da087c9f5af8c642e5aa5ea6548f5876e5615..1f2a423f38a675c40c84353b5681406e1a8e3f42 100644 (file)
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -853,7 +853,8 @@ AtAbort_Portals(void)
 /*
  * Post-abort cleanup for portals.
  *
 /*
  * Post-abort cleanup for portals.
  *

- * Delete all portals not held over from prior transactions.  */
+ * Delete all portals not held over from prior transactions.
+ */

 void
 AtCleanup_Portals(void)
 {
 void
 AtCleanup_Portals(void)
 {

diff --git a/src/backend/utils/sort/tuplesortvariants.c b/src/backend/utils/sort/tuplesortvariants.c
index 079a51c474d05aa99c8ef9dad56c7bad89521ce7..a1f5c19ee97604c4356cdddc8ae4f5101a696386 100644 (file)
--- a/src/backend/utils/sort/tuplesortvariants.c
+++ b/src/backend/utils/sort/tuplesortvariants.c
@@ -1132,7 +1132,6 @@ tuplesort_getgintuple(Tuplesortstate *state, Size *len, bool forward)
  * efficient, but only safe for callers that are prepared to have any
  * subsequent manipulation of the tuplesort's state invalidate slot contents.
  * For byval Datums, the value of the 'copy' parameter has no effect.
  * efficient, but only safe for callers that are prepared to have any
  * subsequent manipulation of the tuplesort's state invalidate slot contents.
  * For byval Datums, the value of the 'copy' parameter has no effect.

-

  */
 bool
 tuplesort_getdatum(Tuplesortstate *state, bool forward, bool copy,
  */
 bool
 tuplesort_getdatum(Tuplesortstate *state, bool forward, bool copy,

diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index fa2b657fb2ffb69f8b80815e35b236d7c87f0f9e..7cd6a49309f0bdba61e220a989fa3fcbb8cf935e 100644 (file)
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -404,7 +404,7 @@ ExecEvalExpr(ExprState *state,
  * Like ExecEvalExpr(), but for cases where no return value is expected,
  * because the side-effects of expression evaluation are what's desired. This
  * is e.g. used for projection and aggregate transition computation.
  * Like ExecEvalExpr(), but for cases where no return value is expected,
  * because the side-effects of expression evaluation are what's desired. This
  * is e.g. used for projection and aggregate transition computation.

-
+ *

  * Evaluate expression identified by "state" in the execution context
  * given by "econtext".
  *
  * Evaluate expression identified by "state" in the execution context
  * given by "econtext".
  *

diff --git a/src/include/libpq/libpq-be-fe-helpers.h b/src/include/libpq/libpq-be-fe-helpers.h
index 1c4a342090c33d2410048defdaaed8e313424f3f..d2f6b3b1348420438fe94952e203208b355a8c36 100644 (file)
--- a/src/include/libpq/libpq-be-fe-helpers.h
+++ b/src/include/libpq/libpq-be-fe-helpers.h
@@ -69,7 +69,7 @@ libpqsrv_connect(const char *conninfo, uint32 wait_event_info)
 /*
  * Like libpqsrv_connect(), except that this is a wrapper for
  * PQconnectdbParams().
 /*
  * Like libpqsrv_connect(), except that this is a wrapper for
  * PQconnectdbParams().

-  */
+ */

 static inline PGconn *
 libpqsrv_connect_params(const char *const *keywords,
                        const char *const *values,
 static inline PGconn *
 libpqsrv_connect_params(const char *const *keywords,
                        const char *const *values,