diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2016-12-18 19:00:52 +0100 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2016-12-19 17:53:11 +0000 |
| commit | d7ce60bb080eb22808ccf304ebc400da866bae0b (patch) | |
| tree | 3f8165af46d56f47cf6a8771dc8302f7a2f6b59e /epan | |
| parent | a942468e0771686ea168d19c0e59fe443c644b88 (diff) | |
Lua: Include all BASE_PT_* to base table.
Also added a note above field_display_e enum to indicate that this
values are parsed in make-init-lua.pl to build init.lua.
Change-Id: Ibd125684f9a68e1b8116fae0ccbc72147825d75d
Reviewed-on: https://code.wireshark.org/review/19336
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/proto.h | 4 | ||||
| -rwxr-xr-x | epan/wslua/make-init-lua.pl | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/epan/proto.h b/epan/proto.h index ac38a5d4dd..7a955be27f 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -504,6 +504,10 @@ WS_DLL_PUBLIC WS_NORETURN void proto_report_dissector_bug(const char *message); /** FIELD_DISPLAY_E_MASK selects the field_display_e value. */ #define FIELD_DISPLAY_E_MASK 0xFF +/* + * Note that this enum values are parsed in make-init-lua.pl so make sure + * any changes here still makes valid entries in init.lua. + */ typedef enum { /* Integral types */ BASE_NONE = 0, /**< none */ diff --git a/epan/wslua/make-init-lua.pl b/epan/wslua/make-init-lua.pl index afebcc5b3f..f1b2e945f8 100755 --- a/epan/wslua/make-init-lua.pl +++ b/epan/wslua/make-init-lua.pl @@ -180,7 +180,7 @@ my $skip_this = 0; while(<PROTO_H>) { $skip_this = 0; - if (/^\s+BASE_([A-Z_]+)[ ]*=[ ]*([0-9]+),/ ) { + if (/^\s+BASE_([A-Z_]+)[ ]*=[ ]*([0-9]+)[, ]+/ ) { $bases_table .= "\t[\"$1\"] = $2,\n"; } |