summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-03-02 13:26:29 +0000
committerDr. Stephen Henson <steve@openssl.org>2015-03-02 13:26:29 +0000
commit437b14b533fe7f7408e3ebca6d5569f1d3347b1a (patch)
tree250dc817335bfc6cef5c046c749fc6939e43b171 /util
parent9f7f8eced5f0c3744203dad461b7e8373f9833e3 (diff)
Fix format script.
The format script didn't correctly recognise some ASN.1 macros and didn't reformat some files as a result. Fix script and reformat affected files. Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'util')
-rwxr-xr-xutil/openssl-format-source2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/openssl-format-source b/util/openssl-format-source
index 6380a100b4..4ea2f1bbd9 100755
--- a/util/openssl-format-source
+++ b/util/openssl-format-source
@@ -116,7 +116,7 @@ do
-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**\//;' \
+ -e 's/^((ASN1|ADB)_.*_(end|END)\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \
-e '/ASN1_(ITEM_ref|ITEM_ptr|ITEM_rptr|PCTX)/ || s/^((ASN1|ADB)_[^\*]*[){=,]+[ \t]*)$/\/**INDENT-OFF**\/\n$1/;' \
-e 's/^(} (ASN1|ADB)_[^\*]*[\){=,;]+)$/$1\n\/**INDENT-ON**\//;' \
| \