summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-06-25 15:23:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:35 -0500
commit386267447b9043eafb8497c0f1fca0f7eead821b (patch)
tree88891e73bf3ad982408ce1504cefe330481f1ddc
parent29a976296cbf21827c31b2b6433478419becfe01 (diff)
downloadsamba-386267447b9043eafb8497c0f1fca0f7eead821b.tar.gz
samba-386267447b9043eafb8497c0f1fca0f7eead821b.tar.bz2
samba-386267447b9043eafb8497c0f1fca0f7eead821b.zip
r23599: Add new version of indent script copied from the the Linux
kernel tree. (This used to be commit bc422ab5f152c3d7ff730a2e0a80ad3a196a797a)
-rwxr-xr-xsource3/script/format_indent.sh23
1 files changed, 7 insertions, 16 deletions
diff --git a/source3/script/format_indent.sh b/source3/script/format_indent.sh
index d901de3ebd..2af1ab41fa 100755
--- a/source3/script/format_indent.sh
+++ b/source3/script/format_indent.sh
@@ -1,21 +1,12 @@
#!/bin/sh
# -npro Do no read the '.indent.pro' files.
-# -l80 Set maximum line length for non-comment lines to 80.
-# -bad Force blank lines after the declarations.
-# -bap Force blank lines after procedure bodies.
-# -bbb Force blank lines before block comments.
-# -br Put braces on line with if, etc.
-# -ce Cuddle else and preceeding ‘}’.
-# -ut Use tabs.
-# -ts8 Set tab size to 8 spaces
+# -kr Use K&R formatting rules
# -i8 Set indentation level to 8 spaces.
-# -di1 Put variables in column 1.
-# -brs Put braces on struct declaration line.
-# -npsl Put the type of a procedure on the same line as its name.
-# -npcs Do not put space after the function in function calls.
-# -nprs Do not put a space after every ’(’ and before every ’)’.
-# -bbo Prefer to break long lines before boolean operators.
-# -hnl Prefer to break long lines at the position of newlines in the input.
+# -ts8 Set tab size to 8 spaces
+# -sob Swallow optional blank lines.
+# -l80 Set the maximum line length at 80 characters.
+# -ss On one-line for and while statments, force a blank before the semicolon
+# -ncs Do not put a space after cast operators.
-indent -npro -l80 -bad -bap -bbb -br -ce -ut -ts8 -i8 -di1 -brs -npsl -npcs -nprs -bbo -hnl "$@"
+indent -npro -kr -i8 -ts8 -sob -l80 -ss -ncs "$@"