Adjust comments previously moved to column 1 by pgident.

diff --git a/contrib/dbase/dbf.c b/contrib/dbase/dbf.c
index bed75c7fad0081461a95615284cbae958d60cb3d..4ecb2b0e5a2fa6c55cb6d32583cfe3d8ea45f7f0 100644 (file)
--- a/contrib/dbase/dbf.c
+++ b/contrib/dbase/dbf.c
@@ -505,7 +505,7 @@ dbf_put_record(dbhead * dbh, field * rec, u_long where)
    if (write(dbh->db_fd, data, dbh->db_rlen) != dbh->db_rlen)
        return DBF_ERROR;
 
-/* There's a 0x1A at the end of a dbf-file */
+   /* There's a 0x1A at the end of a dbf-file */
    if (where == dbh->db_records)
    {
        if (write(dbh->db_fd, &end, 1) != 1)

diff --git a/contrib/fuzzystrmatch/dmetaphone.c b/contrib/fuzzystrmatch/dmetaphone.c
index 331b71df729729867ca05ce73a23c6bcbe3ce381..3eca0ae317fa7aa7adc293ac125f8c73b3521e66 100644 (file)
--- a/contrib/fuzzystrmatch/dmetaphone.c
+++ b/contrib/fuzzystrmatch/dmetaphone.c
@@ -48,8 +48,8 @@
 
 
 /*
- * $Revision: 1.3 $
- * $Id: dmetaphone.c,v 1.3 2004/08/29 05:06:35 momjian Exp $
+ * $Revision: 1.4 $
+ * $Id: dmetaphone.c,v 1.4 2004/10/07 15:21:49 momjian Exp $
  */
 
 
@@ -950,7 +950,7 @@ DoubleMetaphone(char *str, char **codes)
                    current += 2;
                }
                else
-/* also takes care of 'HH' */
+                   /* also takes care of 'HH' */
                    current += 1;
                break;
 

diff --git a/contrib/intagg/int_aggregate.c b/contrib/intagg/int_aggregate.c
index bd03f5c0c317e37cdfe29bcab219f85cfa4f63b3..78b1a173873e4a0d708e0a093ebbf5aa30fbc878 100644 (file)
--- a/contrib/intagg/int_aggregate.c
+++ b/contrib/intagg/int_aggregate.c
@@ -229,7 +229,7 @@ int_enum(PG_FUNCTION_ARGS)
        pc->num = 0;
    }
    else
-/* use an existing one */
+   /* use an existing one */
        pc = (CTX *) fcinfo->context;
    /* Are we done yet? */
    if (pc->num >= pc->p->items)
@@ -242,7 +242,7 @@ int_enum(PG_FUNCTION_ARGS)
        rsi->isDone = ExprEndResult;
    }
    else
-/* nope, return the next value */
+   /* nope, return the next value */
    {
        int         val = pc->p->array[pc->num++];
 

diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c
index c409a269cac8f880efbb35ec06c2d3d56f91702d..bc358f6eb44df73df5b55172b7c3bb7ab10a8752 100644 (file)
--- a/contrib/spi/refint.c
+++ b/contrib/spi/refint.c
@@ -495,7 +495,7 @@ check_foreign_key(PG_FUNCTION_ARGS)
 
                }
                else
-/* DELETE */
+                   /* DELETE */
                    snprintf(sql, sizeof(sql), "delete from %s where ", relname);
 
            }

diff --git a/contrib/spi/timetravel.c b/contrib/spi/timetravel.c
index d20b101e7ab8db0618693fa9e596843436c4cba5..ba4838af659e32cab4874ec40d10a7a6a89f1807 100644 (file)
--- a/contrib/spi/timetravel.c
+++ b/contrib/spi/timetravel.c
@@ -233,7 +233,7 @@ timetravel(PG_FUNCTION_ARGS)
        /* end of INSERT */
    }
 
-/* UPDATE/DELETE: */
+   /* UPDATE/DELETE: */
    oldtimeon = SPI_getbinval(trigtuple, tupdesc, attnum[a_time_on], &isnull);
    if (isnull)
        elog(ERROR, "timetravel (%s): %s must be NOT NULL", relname, args[a_time_on]);
@@ -402,7 +402,7 @@ timetravel(PG_FUNCTION_ARGS)
        /* SPI_pfree(tmptuple); */
    }
    else
-/* DELETE case */
+       /* DELETE case */
        rettuple = trigtuple;
 
    SPI_finish();               /* don't forget say Bye to SPI mgr */

diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c
index 063773e91ba772afeceafd217d881065df9ceacf..a4c7fb8f16b6f9ec5db821c6cf8d67372b97ea89 100644 (file)
--- a/contrib/tablefunc/tablefunc.c
+++ b/contrib/tablefunc/tablefunc.c
@@ -260,7 +260,7 @@ normal_rand(PG_FUNCTION_ARGS)
        SRF_RETURN_NEXT(funcctx, Float8GetDatum(result));
    }
    else
-/* do when there is no more left */
+   /* do when there is no more left */
        SRF_RETURN_DONE(funcctx);
 }
 
@@ -643,7 +643,7 @@ crosstab(PG_FUNCTION_ARGS)
        }
    }
    else
-/* do when there is no more left */
+   /* do when there is no more left */
    {
        /* release SPI related resources */
        SPI_finish();

diff --git a/contrib/xml2/xslt_proc.c b/contrib/xml2/xslt_proc.c
index d0b348958d526260814f2c80368c2aa0ca9cce84..7b044a9e8a1bce5e1faa77cab864e3f01b1ea372 100644 (file)
--- a/contrib/xml2/xslt_proc.c
+++ b/contrib/xml2/xslt_proc.c
@@ -65,7 +65,7 @@ xslt_process(PG_FUNCTION_ARGS)
        parse_params(params, paramstr);
    }
    else
-/* No parameters */
+   /* No parameters */
        params[0] = NULL;
 
    /* Setup parser */

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index d46a3e543d86bdf915e76be355522ebfe03f5d42..667045510389dc455e529cae9254787c8adfa0d3 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.170 2004/09/16 16:58:26 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.171 2004/10/07 15:21:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -4306,7 +4306,7 @@ StartupXLOG(void)
            ereport(FATAL,
                    (errmsg("requested recovery stop point is before end time of backup dump")));
        else
-/* ran off end of WAL */
+           /* ran off end of WAL */
            ereport(FATAL,
                    (errmsg("WAL ends before end time of backup dump")));
    }

diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index 6a4380932988045240654167b482054385bcd26f..1a9ebf7cf7baabb2737849c5e47562df7ab4423d 100644 (file)
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.63 2004/08/29 05:06:41 momjian Exp $
+ *   $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.64 2004/10/07 15:21:52 momjian Exp $
  *
  * DESCRIPTION
  *   The "DefineFoo" routines take the parse tree and pick out the
@@ -1222,7 +1222,7 @@ AlterDomainDefault(List *names, Node *defaultRaw)
        new_record_repl[Anum_pg_type_typdefault - 1] = 'r';
    }
    else
-/* Default is NULL, drop it */
+   /* Default is NULL, drop it */
    {
        new_record_nulls[Anum_pg_type_typdefaultbin - 1] = 'n';
        new_record_repl[Anum_pg_type_typdefaultbin - 1] = 'r';

diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c
index 029a5027a7b1f3c519e35ec931a31022b3dd58cc..0c31cccae52ba01b07b4c75ac85b9cdbb3edba21 100644 (file)
--- a/src/backend/optimizer/geqo/geqo_ox2.c
+++ b/src/backend/optimizer/geqo/geqo_ox2.c
@@ -6,7 +6,7 @@
 *   OX2 operator according to Syswerda
 *   (The Genetic Algorithms Handbook, ed L Davis)
 *
-* $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_ox2.c,v 1.9 2003/11/29 22:39:49 pgsql Exp $
+* $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_ox2.c,v 1.10 2004/10/07 15:21:52 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -102,7 +102,7 @@ ox2(Gene *tour1, Gene *tour2, Gene *offspring, int num_gene, City *city_table)
            select++;           /* next city in  the select list   */
        }
        else
-/* city isn't used yet, so inherit from tour2 */
+           /* city isn't used yet, so inherit from tour2 */
            offspring[k] = tour2[k];
    }
 

diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index f730240a563c2d10a6f3393225ae609016309c08..4f061783a7ecdc5f6db406f98acebe8382ff1177 100644 (file)
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.111 2004/08/29 05:06:49 momjian Exp $
+ *   $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.112 2004/10/07 15:21:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1205,7 +1205,7 @@ makeaclitem(PG_FUNCTION_ARGS)
        ACLITEM_SET_IDTYPE(*aclitem, ACL_IDTYPE_UID);
    }
    else
-/* (g_grantee != 0) */
+   /* (g_grantee != 0) */
    {
        aclitem   ->ai_grantee = g_grantee;
 

diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c
index bad46becebbc2fcc88135cd7038f0c03c4cea630..090c7949cbf5d72698b580cac4755d3d261b1c9f 100644 (file)
--- a/src/backend/utils/adt/inet_net_pton.c
+++ b/src/backend/utils/adt/inet_net_pton.c
@@ -14,7 +14,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  *
- *   $PostgreSQL: pgsql/src/backend/utils/adt/inet_net_pton.c,v 1.18 2003/11/29 19:51:58 pgsql Exp $
+ *   $PostgreSQL: pgsql/src/backend/utils/adt/inet_net_pton.c,v 1.19 2004/10/07 15:21:53 momjian Exp $
  */
 
 #include "postgres.h"
@@ -206,7 +206,7 @@ inet_cidr_pton_ipv4(const char *src, u_char *dst, size_t size)
        else if (*odst >= 128)  /* Class B */
            bits = 16;
        else
-/* Class A */
+           /* Class A */
            bits = 8;
        /* If imputed mask is narrower than specified octets, widen. */
        if (bits >= 8 && bits < ((dst - odst) * 8))

diff --git a/src/backend/utils/adt/rowtypes.c b/src/backend/utils/adt/rowtypes.c
index 0a4cafbf93c9eef97bf6c0e026225618d028ad41..ca0e7f6e85b2c83366cf476941b599c75274bdcb 100644 (file)
--- a/src/backend/utils/adt/rowtypes.c
+++ b/src/backend/utils/adt/rowtypes.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/utils/adt/rowtypes.c,v 1.6 2004/08/29 05:06:49 momjian Exp $
+ *   $PostgreSQL: pgsql/src/backend/utils/adt/rowtypes.c,v 1.7 2004/10/07 15:21:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -146,7 +146,7 @@ record_in(PG_FUNCTION_ARGS)
            if (*ptr == ',')
                ptr++;
            else
-/* *ptr must be ')' */
+               /* *ptr must be ')' */
                ereport(ERROR,
                        (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
                      errmsg("malformed record literal: \"%s\"", string),

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 20ff94d7dda35654bf243f4ea54721744fc91f29..42ba5ccb187e76e56ffe410a7bc64176bf52b909 100644 (file)
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -42,7 +42,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.151 2004/09/22 03:55:26 neilc Exp $
+ *   $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.152 2004/10/07 15:21:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1972,7 +1972,7 @@ write_stderr(const char *fmt,...)
        write_eventlog(EVENTLOG_ERROR_TYPE, errbuf);
    }
    else
-/* Not running as service, write to stderr */
+       /* Not running as service, write to stderr */
        vfprintf(stderr, fmt, ap);
 #endif
    va_end(ap);

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 37731054e39e7d0e5ad913373a37853c545328a7..d756d4ca39cb1228011d0c9feaa9e803dd5c1641 100644 (file)
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.31 2004/09/02 20:07:50 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.32 2004/10/07 15:21:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -172,7 +172,7 @@ write_stderr(const char *fmt,...)
        write_eventlog(EVENTLOG_ERROR_TYPE, errbuf);
    }
    else
-/* Not running as service, write to stderr */
+       /* Not running as service, write to stderr */
        vfprintf(stderr, fmt, ap);
 #endif
    va_end(ap);
@@ -777,7 +777,7 @@ do_status(void)
        fprintf(stdout, _("%s: a standalone backend \"postgres\" is running (PID: %ld)\n"), progname, pid);
    }
    else
-/* postmaster */
+   /* postmaster */
    {
        char      **optlines;
 
@@ -1285,7 +1285,7 @@ main(int argc, char **argv)
                    if (strchr(optarg, '\\'))
                        register_username = xstrdup(optarg);
                    else
-/* Prepend .\ for local accounts */
+                   /* Prepend .\ for local accounts */
                    {
                        register_username = malloc(strlen(optarg) + 3);
                        if (!register_username)

diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index c01ff2066d1de47e5e026ad649c808e395c326d0..61eeb6d06db4a3e68ecab21aff270eaf9ce85dce 100644 (file)
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -16,7 +16,7 @@
  *
  *
  * IDENTIFICATION
- *     $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.44 2004/08/29 05:06:53 momjian Exp $
+ *     $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.45 2004/10/07 15:21:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -340,7 +340,7 @@ tarOpen(ArchiveHandle *AH, const char *filename, char mode)
                                 * Future: DO SEEK(0) and retry. */
                die_horribly(AH, modulename, "could not find file %s in archive\n", filename);
            else
-/* Any file OK, non left, so return NULL */
+               /* Any file OK, non left, so return NULL */
                return NULL;
        }
 
@@ -1104,7 +1104,7 @@ _tarPositionTo(ArchiveHandle *AH, const char *filename)
        if (filename)
            die_horribly(AH, modulename, "could not find header for file %s in tar archive\n", filename);
        else
-/* We're just scanning the archibe for the next file, so return null */
+       /* We're just scanning the archibe for the next file, so return null */
        {
            free(th);
            return NULL;

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 220299bf2bd3a773696be433e34b53e410a2376b..3d8752a8888785053fc50ac9e73a3b48fe73252a 100644 (file)
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.125 2004/08/29 05:06:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.126 2004/10/07 15:21:56 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "command.h"
@@ -982,7 +982,7 @@ do_connect(const char *new_dbname, const char *new_user)
            else if (dbparam != new_dbname)     /* no new db */
                printf(gettext("You are now connected as new user \"%s\".\n"), new_user);
            else
-/* both new */
+               /* both new */
                printf(gettext("You are now connected to database \"%s\" as user \"%s\".\n"),
                       PQdb(pset.db), PQuser(pset.db));
        }

diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h
index ab4fe00939b8997c9211fd28df56667b7cd9e75f..f6bfaafb13f970bdc619d2599d467cc2517029d5 100644 (file)
--- a/src/include/executor/execdebug.h
+++ b/src/include/executor/execdebug.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/execdebug.h,v 1.23 2004/08/29 04:13:06 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/execdebug.h,v 1.24 2004/10/07 15:21:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -128,7 +128,7 @@ extern int  NIndexTupleInserted;
 #define IncrIndexProcessed()   NIndexTupleProcessed++
 #define IncrIndexInserted()        NIndexTupleInserted++
 #else
-/*                             stop compiler warnings */
+/* stop compiler warnings */
 #define IncrRetrieved()            (void)(0)
 #define IncrAppended()         (void)(0)
 #define IncrDeleted()          (void)(0)

diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index 3d81d6095b820cd12b157205b14a8b0d44486723..a6b3674794fc22084d527b1bec9baff38b8e8527 100644 (file)
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -33,7 +33,7 @@
  *   ENHANCEMENTS, OR MODIFICATIONS.
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.52 2004/10/06 16:36:02 momjian Exp $
+ *   $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.53 2004/10/07 15:21:57 momjian Exp $
  *
  **********************************************************************/
 
@@ -1150,8 +1150,7 @@ plperl_func_handler(PG_FUNCTION_ARGS)
 
        }
        else
-/* perl string to Datum */
-
+           /* perl string to Datum */
            retval = FunctionCall3(&prodesc->result_in_func,
                                   PointerGetDatum(SvPV(perlret, PL_na)),
                            ObjectIdGetDatum(prodesc->result_typioparam),

diff --git a/src/port/exec.c b/src/port/exec.c
index 7d623a25d7d10542e573f86007170cfd49328388..650fc724768829738d03feced3c52f556f0b1eaf 100644 (file)
--- a/src/port/exec.c
+++ b/src/port/exec.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/port/exec.c,v 1.28 2004/09/27 23:58:09 momjian Exp $
+ *   $PostgreSQL: pgsql/src/port/exec.c,v 1.29 2004/10/07 15:21:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -277,8 +277,7 @@ find_my_exec(const char *argv0, char *retpath)
    log_error("could not find a \"%s\" to execute", argv0);
    return -1;
 
-#if 0
-
+#if NOT_USED
    /*
     * Win32 has a native way to find the executable name, but the above
     * method works too.

diff --git a/src/port/getopt.c b/src/port/getopt.c
index 512331d21c43db8b5947c2b117fec63c0190300e..8451a872aa1e4197f961bbd68c1df481e62b7a43 100644 (file)
--- a/src/port/getopt.c
+++ b/src/port/getopt.c
@@ -119,7 +119,7 @@ const char *ostr;
            return BADCH;
        }
        else
-/* white space */
+           /* white space */
            optarg = nargv[optind];
        place = EMSG;
        ++optind;

diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index 31210a8e0d94c765d0e13c8e690a448c7a26b970..c0afa59658a4dc646efd31aea14a25273de53d05 100644 (file)
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/src/test/regress/regress.c,v 1.60 2004/04/01 21:28:47 tgl Exp $
+ * $PostgreSQL: pgsql/src/test/regress/regress.c,v 1.61 2004/10/07 15:21:58 momjian Exp $
  */
 
 #include "postgres.h"
@@ -586,7 +586,7 @@ ttdummy(PG_FUNCTION_ARGS)
        cnulls[attnum[1] - 1] = ' ';
    }
    else
-/* DELETE */
+       /* DELETE */
    {
        cvals[attnum[1] - 1] = newoff;  /* stop_date eq current date */
        cnulls[attnum[1] - 1] = ' ';
@@ -641,7 +641,7 @@ ttdummy(PG_FUNCTION_ARGS)
        SPI_freetuple(tmptuple);
    }
    else
-/* DELETE */
+       /* DELETE */
        rettuple = trigtuple;
 
    SPI_finish();               /* don't forget say Bye to SPI mgr */