Commit 59da2105 authored by Bruce Momjian's avatar Bruce Momjian

Update to prevent CATALOG() from wrapping.

parent bbc7491d
...@@ -39,7 +39,9 @@ do ...@@ -39,7 +39,9 @@ do
int pgindent_func_no_var_fix;\ int pgindent_func_no_var_fix;\
,g' | ,g' |
# protect backslashes in DATA() # protect backslashes in DATA()
sed 's;^DATA(.*$;/*&*/;' >/tmp/$$a sed 's;^DATA(.*$;/*&*/;' |
# protect wrapping in CATALOG()
sed 's;^CATALOG(.*$;/*&*/;' >/tmp/$$a
# We get the list of typedef's from /src/tools/find_typedef # We get the list of typedef's from /src/tools/find_typedef
indent -bad -bap -bc -bl -d0 -cdb -nce -nfc1 -di12 -i4 -l75 \ indent -bad -bap -bc -bl -d0 -cdb -nce -nfc1 -di12 -i4 -l75 \
...@@ -1282,6 +1284,7 @@ int pgindent_func_no_var_fix;\ ...@@ -1282,6 +1284,7 @@ int pgindent_func_no_var_fix;\
fi fi
cat /tmp/$$a | cat /tmp/$$a |
sed 's;^/\*\(DATA(.*\)\*/$;\1;' | sed 's;^/\*\(DATA(.*\)\*/$;\1;' |
sed 's;^/\*\(CATALOG(.*\)\*/$;\1;' |
sed 's;/\*---X_X;/* ---;g' | sed 's;/\*---X_X;/* ---;g' |
# workaround indent bug # workaround indent bug
sed 's;^static[ ][ ]*;static ;g' | sed 's;^static[ ][ ]*;static ;g' |
...@@ -1366,9 +1369,9 @@ int pgindent_func_no_var_fix;\ ...@@ -1366,9 +1369,9 @@ int pgindent_func_no_var_fix;\
print line2; print line2;
}' | }' |
# remove blank line before #endif # remove blank line before #endif
awk ' awk ' BEGIN {line1 = ""; line2 = ""; skips = 0}
{ {
line2 = $0; line2 = $0;
if (skips > 0) if (skips > 0)
skips--; skips--;
if (line1 ~ "^$" && if (line1 ~ "^$" &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment