diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-08-03 19:49:32 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-08-05 12:19:08 +0200 |
| commit | 931b160a24369db792de52a37058111e90c8af09 (patch) | |
| tree | e065d613e4886b2f308a1c9c7de6611331003e32 | |
| parent | 9cc76cc40a033ade05a2799a4de5be5f29a35ed1 (diff) | |
openssl-format-source: no dash marker on *INDENT-(ON|OFF)* comments
We mark small comments with a dash immediately following the starting /*.
However, *INDENT-(ON|OFF)* comments shouldn't be treated that way, or
indent will ignore them if we do.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rwxr-xr-x | util/openssl-format-source | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/openssl-format-source b/util/openssl-format-source index 36ea43231c..77645afe0e 100755 --- a/util/openssl-format-source +++ b/util/openssl-format-source @@ -122,7 +122,7 @@ do -e 's/(STACK_OF|LHASH_OF)\(([^ \t,\)]+)\)( |\n)/$1_$2_$3/g;' \ | \ perl -np \ - -e 's/^([ \t]*)\/\*([ \t]+.*)\*\/[ \t]*$/if (length("$1$2")<75) {$c="-"}else{$c=""}; "$1\/*$c$2*\/"/e;' \ + -e 's/^([ \t]*)\/\*([ \t]+.*)\*\/[ \t]*$/my ($x1,$x2) = ($1, $2); if (length("$x1$x2")<75 && $x2 !~ m#^\s*\*INDENT-(ON|OFF)\*\s*$#) {$c="-"}else{$c=""}; "$x1\/*$c$x2*\/"/e;' \ -e 's/^\/\* ((Copyright|=|----).*)$/\/*-$1/;' \ -e 's/^((DECLARE|IMPLEMENT)_(EXTERN_ASN1|ASN1|ADB|STACK_OF|PKCS12_STACK_OF).*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \ -e 's/^([ \t]*(make_dh|make_dh_bn|make_rfc5114_td)\(.*\)[ \t,]*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \ |