osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix formatting of AUTHORS list, fix Perl warning 

Fixes the following warning in Perl 5.26:

    Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.30), passed through in regex; marked by <-- HERE in m/(.*){ <-- HERE / at doc/make-authors-short.pl line 36.

While at it, fix formatting of the AUTHORS-SHORT file, a newline must be
present after "}" or the file will be mis-parsed.

Change-Id: I76bc1a30714dafd703342d2d430dc1c90cf2bf82
Reviewed-on: https://code.wireshark.org/review/22637
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Peter Wu 2017-07-15 21:13:28 +02:00 committed by Anders Broman
parent 30f7014dfc
commit 44c34ac777
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.src
View File

@ -3687,6 +3687,7 @@ Martin Kacer <kacer.martin[AT]gmail.com> {
JSON and Elasticsearch tshark output
json2pcap
}
Ben Stewart <bst[AT]google.com> {
SCTE-35 dissector
}

6
doc/make-authors-short.pl
View File

@ -33,12 +33,14 @@ s/\xef\xbb\xbf//; # Skip UTF-8 byte order mark
print unless /^\n/;
while (<>) {
if (/(.*){/) {
if (/(.*?)\s*\{/) {
$subinfo = 1;
print "$1\n";
} elsif (/}/) {
} elsif (/\}/) {
$subinfo = 0;
if (($nextline = <>) !~ /^[\s]*$/) {
print STDERR "Missing newline after '}', found: $nextline"
if $nextline =~ m/\{/;
print $nextline;
}
} elsif ($subinfo == 1) {