diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-03-13 10:20:28 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-03-13 17:25:41 +0000 |
| commit | 641eb36dd5c89d5b2f6291d5bc540072b4bacdf2 (patch) | |
| tree | 1544a94961979fbc40d71595a36929094c0a448f /tools | |
| parent | 53dab8e1f1acb95930bfb06da3c8b9c30af85d1c (diff) | |
Fix value_string checks in checkAPIs.pl.
Some strings contain semicolons, which meant g36db2df was terminating
our REs too early. Try terminating them with '}' followed by ';'.
Change-Id: I97f63351ef35c91e3123d9abd47576d47fea4b2b
Reviewed-on: https://code.wireshark.org/review/638
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/checkAPIs.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/checkAPIs.pl b/tools/checkAPIs.pl index 0c210ce108..2ef992d27c 100755 --- a/tools/checkAPIs.pl +++ b/tools/checkAPIs.pl @@ -1501,8 +1501,8 @@ sub check_snprintf_plus_strlen($$) my $StaticRegex = qr/ static \s+ /xs; my $ConstRegex = qr/ const \s+ /xs; my $Static_andor_ConstRegex = qr/ (?: $StaticRegex $ConstRegex | $StaticRegex | $ConstRegex) /xs; -my $ValueStringRegex = qr/ ^ \s* $Static_andor_ConstRegex (?:value|string|range)_string \ + [^;*]+ = [^;]+ [{] [^;]+ ; /xms; -my $EnumValRegex = qr/ $Static_andor_ConstRegex enum_val_t \ + [^;*]+ = [^;]+ [{] [^;]+ ; /xs; +my $ValueStringRegex = qr/ ^ \s* $Static_andor_ConstRegex (?:value|string|range)_string \ + [^;*]+ = [^;]+ [{] .+? [}] \s*? ; /xms; +my $EnumValRegex = qr/ $Static_andor_ConstRegex enum_val_t \ + [^;*]+ = [^;]+ [{] .+? [}] \s*? ; /xs; my $NewlineStringRegex = qr/ ["] [^"]* \\n [^"]* ["] /xs; sub check_value_string_arrays($$$) |