Fix a few errors in comments. Patch by Fujii Masao, plus the one in

hlinnaka · hlinnaka · commit efa8544fd55e · 2009-06-18T10:08:08.000Z
visibilitymap.c by me.
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.23 2009/06/11 14:48:51 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.24 2009/06/18 10:08:08 heikki Exp $
  *
  *
  * pg_standby.c
@@ -448,7 +448,7 @@ CheckForExternalTrigger(void)
 		/*
 		 * Turn it into a "smart" trigger by truncating the file. Otherwise if
 		 * the server asks us again to restore a segment that was restored
-		 * restored already, we would return "not found" and upset the server.
+		 * already, we would return "not found" and upset the server.
 		 */
 		if (ftruncate(fd, 0) < 0)
 		{
diff --git a/src/backend/access/heap/visibilitymap.c b/src/backend/access/heap/visibilitymap.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/heap/visibilitymap.c,v 1.4 2009/06/11 14:48:54 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/heap/visibilitymap.c,v 1.5 2009/06/18 10:08:08 heikki Exp $
  *
  * INTERFACE ROUTINES
  *		visibilitymap_clear - clear a bit in the visibility map
@@ -98,8 +98,8 @@
 
 /*
  * Size of the bitmap on each visibility map page, in bytes. There's no
- * extra headers, so the whole page minus except for the standard page header
- * is used for the bitmap.
+ * extra headers, so the whole page minus the standard page header is
+ * used for the bitmap.
  */
 #define MAPSIZE (BLCKSZ - MAXALIGN(SizeOfPageHeaderData))
 
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.567 2009/06/11 14:49:02 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.568 2009/06/18 10:08:08 heikki Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -2924,8 +2924,8 @@ PostgresMain(int argc, char *argv[], const char *username)
 	 *	If the databasename is omitted it is taken to be the user name.
 	 *
 	 *	When started from the postmaster, the format is
-	 *		postgres [secure switches] -p databasename [insecure switches]
-	 *	Switches appearing after -p came from the client (via "options"
+	 *		postgres [secure switches] -y databasename [insecure switches]
+	 *	Switches appearing after -y came from the client (via "options"
 	 *	field of connection request).  For security reasons we restrict
 	 *	what these switches can do.
 	 * ----------------
@@ -2938,7 +2938,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 		argc--;
 	}
 
-	/* all options are allowed until '-p' */
+	/* all options are allowed until '-y' */
 	secure = true;
 	ctx = PGC_POSTMASTER;
 	gucsource = PGC_S_ARGV;		/* initial switches came from command line */

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.23 2009/06/11 14:48:51 momjian Exp $`
	`2`	`+ * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.24 2009/06/18 10:08:08 heikki Exp $`
`3`	`3`	`*`
`4`	`4`	`*`
`5`	`5`	`* pg_standby.c`
`@@ -448,7 +448,7 @@ CheckForExternalTrigger(void)`
`448`	`448`	`/*`
`449`	`449`	`* Turn it into a "smart" trigger by truncating the file. Otherwise if`
`450`	`450`	`* the server asks us again to restore a segment that was restored`
`451`		`- * restored already, we would return "not found" and upset the server.`
	`451`	`+ * already, we would return "not found" and upset the server.`
`452`	`452`	`*/`
`453`	`453`	`if (ftruncate(fd, 0) < 0)`
`454`	`454`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/access/heap/visibilitymap.c,v 1.4 2009/06/11 14:48:54 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/access/heap/visibilitymap.c,v 1.5 2009/06/18 10:08:08 heikki Exp $`
`12`	`12`	`*`
`13`	`13`	`* INTERFACE ROUTINES`
`14`	`14`	`* visibilitymap_clear - clear a bit in the visibility map`
`@@ -98,8 +98,8 @@`
`98`	`98`
`99`	`99`	`/*`
`100`	`100`	`* Size of the bitmap on each visibility map page, in bytes. There's no`
`101`		`- * extra headers, so the whole page minus except for the standard page header`
`102`		`- * is used for the bitmap.`
	`101`	`+ * extra headers, so the whole page minus the standard page header is`
	`102`	`+ * used for the bitmap.`
`103`	`103`	`*/`
`104`	`104`	`#define MAPSIZE (BLCKSZ - MAXALIGN(SizeOfPageHeaderData))`
`105`	`105`