diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2022-03-18 21:01:40 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2022-03-18 21:01:40 +0000 |
| commit | 096bc367b6ebf932850a5e11176e2b19e66ac65e (patch) | |
| tree | 49a6531acdb8f54b5f076dcb88b0c309d7c3fee6 /tools/make-plugin-reg.py | |
| parent | 4099137ad1c6eb2ed2d0be1da9bf96dc1b1b9a1a (diff) | |
Align plugin reg function search with epan reg function search
Diffstat (limited to 'tools/make-plugin-reg.py')
| -rwxr-xr-x | tools/make-plugin-reg.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/make-plugin-reg.py b/tools/make-plugin-reg.py index 45bbafc2ab..2b9bc3450d 100755 --- a/tools/make-plugin-reg.py +++ b/tools/make-plugin-reg.py @@ -58,23 +58,23 @@ regs = { # For those that don't know Python, r"" indicates a raw string, # devoid of Python escapes. -proto_regex = r"\bproto_register_(?P<symbol>[_A-Za-z0-9]+)\s*\(\s*void\s*\)[^;]*$" +proto_regex = r"\bproto_register_(?P<symbol>[\w]+)\s*\(\s*void\s*\)\s*{" -handoff_regex = r"\bproto_reg_handoff_(?P<symbol>[_A-Za-z0-9]+)\s*\(\s*void\s*\)[^;]*$" +handoff_regex = r"\bproto_reg_handoff_(?P<symbol>[\w]+)\s*\(\s*void\s*\)\s*{" -wtap_reg_regex = r"\bwtap_register_(?P<symbol>[_A-Za-z0-9]+)\s*\([^;]+$" +wtap_reg_regex = r"\bwtap_register_(?P<symbol>[\w]+)\s*\(\s*void\s*\)\s*{" -codec_reg_regex = r"\bcodec_register_(?P<symbol>[_A-Za-z0-9]+)\s*\([^;]+$" +codec_reg_regex = r"\bcodec_register_(?P<symbol>[\w]+)\s*\(\s*void\s*\)\s*{" -tap_reg_regex = r"\bregister_tap_listener_(?P<symbol>[_A-Za-z0-9]+)\s*\([^;]+$" +tap_reg_regex = r"\bregister_tap_listener_(?P<symbol>[\w]+)\s*\(\s*void\s*\)\s*{" # This table drives the pattern-matching and symbol-harvesting patterns = [ - ( 'proto_reg', re.compile(proto_regex, re.MULTILINE) ), - ( 'handoff_reg', re.compile(handoff_regex, re.MULTILINE) ), - ( 'wtap_register', re.compile(wtap_reg_regex, re.MULTILINE) ), - ( 'codec_register', re.compile(codec_reg_regex, re.MULTILINE) ), - ( 'register_tap_listener', re.compile(tap_reg_regex, re.MULTILINE) ), + ( 'proto_reg', re.compile(proto_regex, re.MULTILINE | re.ASCII) ), + ( 'handoff_reg', re.compile(handoff_regex, re.MULTILINE | re.ASCII) ), + ( 'wtap_register', re.compile(wtap_reg_regex, re.MULTILINE | re.ASCII) ), + ( 'codec_register', re.compile(codec_reg_regex, re.MULTILINE | re.ASCII) ), + ( 'register_tap_listener', re.compile(tap_reg_regex, re.MULTILINE | re.ASCII) ), ] # Grep |