diff options
author | Rich Salz <rsalz@akamai.com> | 2019-08-12 15:50:51 -0400 |
---|---|---|
committer | Rich Salz <rsalz@akamai.com> | 2019-09-19 09:27:38 -0400 |
commit | 8c0e76813af6a886f66d3e95b908c6c924d2a6ad (patch) | |
tree | 95865fd3e64fdc3f5b972e7ef4094f9377a71085 /util/merge-err-lines | |
parent | f6aca23e268799380e4e4193789ed96db1ed57f3 (diff) |
Add merge-err-lines script
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9441)
Diffstat (limited to 'util/merge-err-lines')
-rwxr-xr-x | util/merge-err-lines | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/util/merge-err-lines b/util/merge-err-lines new file mode 100755 index 0000000000..33644fa12e --- /dev/null +++ b/util/merge-err-lines @@ -0,0 +1,29 @@ +#! /usr/bin/env perl +# Copyright 2019 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the Apache License 2.0 (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + +# Sometimes calls to XXXerr() are split into two lines, because the define'd +# names are very long. This script looks for those lines and merges them. +# It should be run before the "err-to-raise" script. + +# Run this program like this: +# perl -pi util/merge-err-lines files... +# or +# git grep -l '[A-Z0-9]err([^)]*$' | xargs perl -pi util/merge-err-lines + +use strict; +use warnings; + +# Look for "{whitespace}XXXerr(no-close-paren{WHITESPACE}" lines +if ( /^ *[_A-Z0-9]+err\([^)]+ *$/ ) { + my $copy = $_; + chop($copy); + $copy =~ s/ +$//; + my $next = <>; + $next =~ s/^ +//; + $_ = $copy . ' ' . $next; +} |