aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2005-07-13 04:44:42 +0000
committerBruce Momjian <bruce@momjian.us>2005-07-13 04:44:42 +0000
commit5d0a43c585b739c329efe26c0193a5c5ff980c0e (patch)
tree457ff134ceff4a6957be937d432c12d417f55f76 /src
parent7690b4132824b32875a4c7765955a133dca4ad89 (diff)
downloadpostgresql-5d0a43c585b739c329efe26c0193a5c5ff980c0e.tar.gz
postgresql-5d0a43c585b739c329efe26c0193a5c5ff980c0e.zip
Fix pgindent to not have blank line before #else in variable definition
section of a function.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/tools/pgindent/pgindent5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index e0d3969f1a8..e84b23cb711 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -1648,14 +1648,15 @@ do
print line1;
}
}' |
-# remove blank line before #endif
+# remove blank line before #else and #endif
awk ' BEGIN {line1 = ""; line2 = ""; skips = 0}
{
line2 = $0;
if (skips > 0)
skips--;
if (line1 ~ /^$/ &&
- line2 ~ /^#endif/)
+ (line2 ~ /^#else/ ||
+ line2 ~ /^#endif/))
{
print line2;
line2 = "";