diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-09-20 00:21:36 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-09-20 23:00:19 +0000 |
| commit | 54f106fb9cc529fe9a838582906a023eb8d903f2 (patch) | |
| tree | 8f8433b9a1e2645fdf029b21357c305a6a5d6cd0 /tools | |
| parent | c768cf550384a846204e65520c5d1f0ada908cb0 (diff) | |
checkAPIs.pl: recognize fields with spaces in display
Fields with display values such as "BASE_RANGE_STRING | BASE_DEC" used
to be ignored, make sure that the regex detects such fields.
Change-Id: I80d4331e3fb75092ffd768dabb85c5f13c9b5462
Reviewed-on: https://code.wireshark.org/review/29755
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/checkAPIs.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/checkAPIs.pl b/tools/checkAPIs.pl index 2b7f823336..6427eddf15 100755 --- a/tools/checkAPIs.pl +++ b/tools/checkAPIs.pl @@ -750,7 +750,7 @@ sub check_hf_entries($$) \s*,\s* (FT_[A-Z0-9_]+) # field type \s*,\s* - ([A-Z0-9x\|_]+) # display + ([A-Z0-9x\|_\s]+) # display \s*,\s* ([^,]+?) # convert \s*,\s* @@ -767,6 +767,9 @@ sub check_hf_entries($$) my ($hf, $name, $abbrev, $ft, $display, $convert, $bitmask, $blurb) = @items; shift @items; shift @items; shift @items; shift @items; shift @items; shift @items; shift @items; shift @items; + $display =~ s/\s+//g; + $convert =~ s/\s+//g; + #print "name=$name, abbrev=$abbrev, ft=$ft, display=$display, convert=>$convert<, bitmask=$bitmask, blurb=$blurb\n"; if ($abbrev eq '""' || $abbrev eq "NULL") { |