Cleanup for new else/comment handling.

diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c
index 321c250b30038138fc45556d2bfb2892a1b14d53..2dde664493e1f9ce0adccc30b5b957c101958559 100644 (file)
--- a/src/backend/utils/mb/conv.c
+++ b/src/backend/utils/mb/conv.c
@@ -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
index 6523079bbbe48c6075346c20a41a6c32412a6c96..d35914a590b2d36824454126d61678b5a2c8aee5 100644 (file)
--- a/src/bin/psql/mbprint.c
+++ b/src/bin/psql/mbprint.c
@@ -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
index abe0684d7ece77c402957cfa6236ec15d8d1214a..236db78fb6beec92e60bb9d21375df6e827f851e 100755 (executable)
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -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