diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-21 15:28:57 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:37:10 +0000 |
| commit | 7116341e18b69a4017c01e1197cf4e0486052a9c (patch) | |
| tree | ed8c4f08c49f57e1a586048fe0719f07f5c580ad | |
| parent | 92fe1dbc0e3b2c40fef6badd64182a4502be1c86 (diff) | |
| download | openssl-new-7116341e18b69a4017c01e1197cf4e0486052a9c.tar.gz | |
Amend openssl-format-source so that it give more repeatable output
Reviewed-by: Tim Hudson <tjh@openssl.org>
| -rwxr-xr-x | util/openssl-format-source | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/openssl-format-source b/util/openssl-format-source index c92c37c4a4..f1800e0306 100755 --- a/util/openssl-format-source +++ b/util/openssl-format-source @@ -106,12 +106,12 @@ do perl -0 -np \ -e 's/(\n#[ \t]*ifdef[ \t]+__cplusplus\n[^\n]*\n#[ \t]*endif\n)/\n\/**INDENT-OFF**\/$1\/**INDENT-ON**\/\n/g;' \ -e 's/(\n\/\*\!)/\n\/**/g;' \ - -e 's/(STACK_OF|LHASH_OF)\(([^ \t,\)]+)\) /$1_$2_ /g;' \ + -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/^\/\* ((Copyright|=|----).*)$/\/*-$1/;' \ - -e 's/^((DECLARE|IMPLEMENT)_(EXTERN_ASN1|ASN1|ADB|STACK_OF).*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \ + -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**\//;' \ -e 's/^(ASN1_ADB_TEMPLATE\(.*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \ -e 's/^((ASN1|ADB)_.*_END\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \ |