X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util%2Fopenssl-format-source;h=2655e9c4009ccaa6d5e320c94c7d8c7a21881f72;hb=0494014781d2e348996f55acca0d179b09f9499f;hp=19f2b72e7cbabf7c02d7e278e0600d39d9912081;hpb=850864d81c49697b08254eebf565e8251f2e30db;p=oweals%2Fopenssl.git diff --git a/util/openssl-format-source b/util/openssl-format-source index 19f2b72e7c..2655e9c400 100755 --- a/util/openssl-format-source +++ b/util/openssl-format-source @@ -111,7 +111,7 @@ do # the process-comments options and then undo that marking, and then # finally re-run indent without process-comments so the marked-to- # be-ignored comments we did automatically end up getting moved - # into the right possition within the code as indent leaves marked + # into the right position within the code as indent leaves marked # comments entirely untouched - we appear to have no way to avoid # the double processing and get the desired output cat "$j" | \ @@ -124,7 +124,7 @@ do perl -np \ -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|STATIC_ASN1|ASN1|ADB|STACK_OF|PKCS12_STACK_OF|PEM|OBJ|LHASH|DEPRECATED).*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \ + -e 's/^((DECLARE|IMPLEMENT)_.*)$/\/**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|END)\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \