Cleanup for new else/comment handling.

bmomjian · bmomjian · commit 0c2c061eb043 · 2007-11-16T01:11:04.000Z
diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conv.c,v 1.64 2007/11/15 23:23:44 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conv.c,v 1.65 2007/11/16 01:11:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -461,7 +461,7 @@ UtfToLocal(const unsigned char *utf, unsigned char *iso,
 				code = p->code;
 			}
 		}
-		else	/*  no cmap or no remaining data */
+		else	/* no cmap or no remaining data */
 		{
 			p = bsearch(&iutf, map, size1,
 						sizeof(pg_utf_to_local), compare1);
diff --git a/src/bin/psql/mbprint.c b/src/bin/psql/mbprint.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.27 2007/11/15 23:23:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.28 2007/11/16 01:11:04 momjian Exp $
  *
  * XXX this file does not really belong in psql/.  Perhaps move to libpq?
  * It also seems that the mbvalidate function is redundant with existing
@@ -246,7 +246,7 @@ pg_wcssize(unsigned char *pwcs, size_t len, int encoding, int *result_width,
 				linewidth += 4;
 				format_size += 4;
 			}
-			else	/*  Output it as-is */
+			else	/* Output it as-is */
 			{
 				linewidth += w;
 				format_size += 1;
@@ -257,7 +257,7 @@ pg_wcssize(unsigned char *pwcs, size_t len, int encoding, int *result_width,
 			linewidth += 6;		/* \u0000 */
 			format_size += 6;
 		}
-		else	/*  All other chars */
+		else	/* All other chars */
 		{
 			linewidth += w;
 			format_size += chlen;
@@ -321,7 +321,7 @@ pg_wcsformat(unsigned char *pwcs, size_t len, int encoding,
 				linewidth += 4;
 				ptr += 4;
 			}
-			else	/*  Output it as-is */
+			else	/* Output it as-is */
 			{
 				linewidth += w;
 				*ptr++ = *pwcs;
@@ -343,7 +343,7 @@ pg_wcsformat(unsigned char *pwcs, size_t len, int encoding,
 			ptr += 6;
 			linewidth += 6;
 		}
-		else	/*  All other chars */
+		else	/* All other chars */
 		{
 			int			i;
 
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.94 2007/11/15 23:23:44 momjian Exp $
+# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.95 2007/11/16 01:11:04 momjian Exp $
 
 # Known bugs:
 #
@@ -46,9 +46,10 @@ do
 # 'else' followed by a single-line comment, followed by
 # a brace on the next line confuses BSD indent, so we push
 # the comment down to the next line, then later pull it
-# back up again.
+# back up again.  Add space before PGMV or indent will add
+# it for us.
 	sed 's;\([} 	]\)else[ 	]*\(/\*\)\(.*\*/\)[ 	]*$;\1else\
-    \2PGINDENT_MOVED\3;g' |
+    \2 PGMV\3;g' |
 
 # Indent multi-line after-'else' comment so BSD indent will move it properly.
 # We already moved down single-line comments above.  Check for '*' to make
@@ -2243,10 +2244,10 @@ do
 		{
 			if (NR != 1)
 			{
-				if ($0 ~ "/\*PGINDENT_MOVED")
+				if ($0 ~ "/\* PGMV")
 				{
 					# remove tag
-					sub("PGINDENT_MOVED", "", $0);
+					sub(" PGMV", "", $0);
 					# remove leading whitespace
 					sub("^[ 	]*", "", $0);
 					# add comment with single tab prefix

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $PostgreSQL: pgsql/src/backend/utils/mb/conv.c,v 1.64 2007/11/15 23:23:44 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/backend/utils/mb/conv.c,v 1.65 2007/11/16 01:11:04 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -461,7 +461,7 @@ UtfToLocal(const unsigned char utf, unsigned char iso,`
`461`	`461`	`code = p->code;`
`462`	`462`	`}`
`463`	`463`	`}`
`464`		`- else /* no cmap or no remaining data */`
	`464`	`+ else /* no cmap or no remaining data */`
`465`	`465`	`{`
`466`	`466`	`p = bsearch(&iutf, map, size1,`
`467`	`467`	`sizeof(pg_utf_to_local), compare1);`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2007, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.27 2007/11/15 23:23:44 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.28 2007/11/16 01:11:04 momjian Exp $`
`7`	`7`	`*`
`8`	`8`	`* XXX this file does not really belong in psql/. Perhaps move to libpq?`
`9`	`9`	`* It also seems that the mbvalidate function is redundant with existing`
`@@ -246,7 +246,7 @@ pg_wcssize(unsigned char pwcs, size_t len, int encoding, int result_width,`
`246`	`246`	`linewidth += 4;`
`247`	`247`	`format_size += 4;`
`248`	`248`	`}`
`249`		`- else /* Output it as-is */`
	`249`	`+ else /* Output it as-is */`
`250`	`250`	`{`
`251`	`251`	`linewidth += w;`
`252`	`252`	`format_size += 1;`
`@@ -257,7 +257,7 @@ pg_wcssize(unsigned char pwcs, size_t len, int encoding, int result_width,`
`257`	`257`	`linewidth += 6; /* \u0000 */`
`258`	`258`	`format_size += 6;`
`259`	`259`	`}`
`260`		`- else /* All other chars */`
	`260`	`+ else /* All other chars */`
`261`	`261`	`{`
`262`	`262`	`linewidth += w;`
`263`	`263`	`format_size += chlen;`
`@@ -321,7 +321,7 @@ pg_wcsformat(unsigned char *pwcs, size_t len, int encoding,`
`321`	`321`	`linewidth += 4;`
`322`	`322`	`ptr += 4;`
`323`	`323`	`}`
`324`		`- else /* Output it as-is */`
	`324`	`+ else /* Output it as-is */`
`325`	`325`	`{`
`326`	`326`	`linewidth += w;`
`327`	`327`	`ptr++ = pwcs;`
`@@ -343,7 +343,7 @@ pg_wcsformat(unsigned char *pwcs, size_t len, int encoding,`
`343`	`343`	`ptr += 6;`
`344`	`344`	`linewidth += 6;`
`345`	`345`	`}`
`346`		`- else /* All other chars */`
	`346`	`+ else /* All other chars */`
`347`	`347`	`{`
`348`	`348`	`int i;`
`349`	`349`