Review and fix regular expressions of the form /^foo|bar$/.
Replace regular expressions with simple string comparisons where
possible.
Use '(?:subregexp)' instead of '(subregexp)' wherever possible.
'dlls/gdi' does not have a win16drv subdirectory anymore so simplify
regular expressions accordingly.
diff --git a/tools/winapi_check/winapi_function.pm b/tools/winapi_check/winapi_function.pm
index 6b4065e..688651a 100644
--- a/tools/winapi_check/winapi_function.pm
+++ b/tools/winapi_check/winapi_function.pm
@@ -304,15 +304,15 @@
}
local $_ = $self->calling_convention;
- if(/^__cdecl$/) {
+ if($_ eq "__cdecl") {
return "cdecl";
- } elsif(/^VFWAPIV|WINAPIV$/) {
+ } elsif(/^(?:VFWAPIV|WINAPIV)$/) {
if(!defined($suffix)) { return undef; }
return "pascal$suffix"; # FIXME: Is this correct?
- } elsif(/^__stdcall|VFWAPI|WINAPI|CALLBACK$/) {
+ } elsif(/^(?:__stdcall|VFWAPI|WINAPI|CALLBACK)$/) {
if(!defined($suffix)) { return undef; }
return "pascal$suffix";
- } elsif(/^__asm$/) {
+ } elsif($_ eq "__asm") {
return "asm";
} else {
return "cdecl";
@@ -323,13 +323,13 @@
my $self = shift;
local $_ = $self->calling_convention;
- if(/^__cdecl$/) {
+ if($_ eq "__cdecl") {
return "cdecl";
- } elsif(/^VFWAPIV|WINAPIV$/) {
+ } elsif(/^(?:VFWAPIV|WINAPIV)$/) {
return "varargs";
- } elsif(/^__stdcall|VFWAPI|WINAPI|CALLBACK$/) {
+ } elsif(/^(?:__stdcall|VFWAPI|WINAPI|CALLBACK)$/) {
return "stdcall";
- } elsif(/^__asm$/) {
+ } elsif($_ eq "__asm") {
return "asm";
} else {
return "cdecl";
