diff options
author | Bruce Momjian | 2004-10-07 15:21:58 +0000 |
---|---|---|
committer | Bruce Momjian | 2004-10-07 15:21:58 +0000 |
commit | 9406fa646b425ebc3e4e924e094ef315eb47af64 (patch) | |
tree | bbae8e9379a372074bae7523e84a204781ea8d98 | |
parent | 8422e2767c7d219b7b60850cdc4ecfd72cc66dd0 (diff) |
Adjust comments previously moved to column 1 by pgident.
-rw-r--r-- | contrib/dbase/dbf.c | 2 | ||||
-rw-r--r-- | contrib/fuzzystrmatch/dmetaphone.c | 4 | ||||
-rw-r--r-- | contrib/intagg/int_aggregate.c | 4 | ||||
-rw-r--r-- | contrib/spi/refint.c | 2 | ||||
-rw-r--r-- | contrib/spi/timetravel.c | 4 | ||||
-rw-r--r-- | contrib/tablefunc/tablefunc.c | 4 | ||||
-rw-r--r-- | contrib/xml2/xslt_proc.c | 2 | ||||
-rw-r--r-- | src/backend/access/transam/xlog.c | 2 | ||||
-rw-r--r-- | src/backend/commands/typecmds.c | 2 | ||||
-rw-r--r-- | src/backend/optimizer/geqo/geqo_ox2.c | 2 | ||||
-rw-r--r-- | src/backend/utils/adt/acl.c | 2 | ||||
-rw-r--r-- | src/backend/utils/adt/inet_net_pton.c | 2 | ||||
-rw-r--r-- | src/backend/utils/adt/rowtypes.c | 2 | ||||
-rw-r--r-- | src/backend/utils/error/elog.c | 2 | ||||
-rw-r--r-- | src/bin/pg_ctl/pg_ctl.c | 6 | ||||
-rw-r--r-- | src/bin/pg_dump/pg_backup_tar.c | 4 | ||||
-rw-r--r-- | src/bin/psql/command.c | 2 | ||||
-rw-r--r-- | src/include/executor/execdebug.h | 2 | ||||
-rw-r--r-- | src/pl/plperl/plperl.c | 3 | ||||
-rw-r--r-- | src/port/exec.c | 3 | ||||
-rw-r--r-- | src/port/getopt.c | 2 | ||||
-rw-r--r-- | src/test/regress/regress.c | 4 |
22 files changed, 30 insertions, 32 deletions
diff --git a/contrib/dbase/dbf.c b/contrib/dbase/dbf.c index bed75c7fad..4ecb2b0e5a 100644 --- 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 e935c8a84a..6db422331f 100644 --- a/contrib/fuzzystrmatch/dmetaphone.c +++ b/contrib/fuzzystrmatch/dmetaphone.c @@ -48,7 +48,7 @@ /* - * $Revision: 1.3 $ + * $Revision: 1.4 $ * $Id$ */ @@ -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 bd03f5c0c3..78b1a17387 100644 --- 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 c409a269ca..bc358f6eb4 100644 --- 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 d20b101e7a..ba4838af65 100644 --- 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 063773e91b..a4c7fb8f16 100644 --- 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 d0b348958d..7b044a9e8a 100644 --- 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 e97b6cd706..9ce6f24527 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -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 56dcb7d693..543cfdf176 100644 --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -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 2a94d0151d..0d2e0def32 100644 --- a/src/backend/optimizer/geqo/geqo_ox2.c +++ b/src/backend/optimizer/geqo/geqo_ox2.c @@ -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 f7b5f3732f..e53a829a22 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -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 ad29ce0efe..2967df9c69 100644 --- a/src/backend/utils/adt/inet_net_pton.c +++ b/src/backend/utils/adt/inet_net_pton.c @@ -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 ed5290193f..594dede69e 100644 --- a/src/backend/utils/adt/rowtypes.c +++ b/src/backend/utils/adt/rowtypes.c @@ -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 367c849ea9..b92451b8b3 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -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 265c2ba139..22aa810b26 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -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 075191b0ad..1b009fa4b6 100644 --- a/src/bin/pg_dump/pg_backup_tar.c +++ b/src/bin/pg_dump/pg_backup_tar.c @@ -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 d182af7777..b46ef7d696 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -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 d2bb7b6005..2e39eb159b 100644 --- a/src/include/executor/execdebug.h +++ b/src/include/executor/execdebug.h @@ -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 958e3ba01d..f2682f179d 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -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 4e752531c7..e508802451 100644 --- a/src/port/exec.c +++ b/src/port/exec.c @@ -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 512331d21c..8451a872aa 100644 --- 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 9ad42d2501..6b8073b230 100644 --- a/src/test/regress/regress.c +++ b/src/test/regress/regress.c @@ -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 */ |