From 44c34ac777d291dbac752c2752fe1ba8a3f37a3d Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Sat, 15 Jul 2017 21:13:28 +0200
Subject: [PATCH] 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>
---
 AUTHORS.src               | 1 +
 doc/make-authors-short.pl | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/AUTHORS.src b/AUTHORS.src
index c9dfea721f..172a1a3f40 100644
--- a/AUTHORS.src
+++ b/AUTHORS.src
@@ -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
 }
diff --git a/doc/make-authors-short.pl b/doc/make-authors-short.pl
index 229622d995..14fdd503ac 100755
--- a/doc/make-authors-short.pl
+++ b/doc/make-authors-short.pl
@@ -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) {