diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-09-20 00:11:28 +0200 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2018-09-20 05:06:07 +0000 |
| commit | 71c7798f8ae40e90a211a74cde8d90cc31bdeaa8 (patch) | |
| tree | 313717d9115b220e4628bf1ea5bac97c215aeb66 /epan/wslua/wslua_proto_field.c | |
| parent | 081c72344cc39274f496ebc2eefd879db1e93c26 (diff) | |
epan: fix various misannotations of VALS/RVALS/VALS64/TFS
No functional change, just using the correct macro for value_strings.
Other fixes: Taking the address of the first element of an array gives
the same address as the array itself. An array of a structure with a
single element is the same as the single element itself (packet-sprt.c).
Change-Id: I08bc9de49fbd1659a6700ace863e5f05144c7b3e
Reviewed-on: https://code.wireshark.org/review/29752
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/wslua/wslua_proto_field.c')
| -rw-r--r-- | epan/wslua/wslua_proto_field.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/wslua/wslua_proto_field.c b/epan/wslua/wslua_proto_field.c index ffddd8bec0..7af9b513a3 100644 --- a/epan/wslua/wslua_proto_field.c +++ b/epan/wslua/wslua_proto_field.c @@ -632,7 +632,7 @@ WSLUA_CONSTRUCTOR ProtoField_new(lua_State* L) { } else if (vs64) { /* Indicate that we are using val64_string */ f->base |= BASE_VAL64_STRING; - f->vs = VALS(vs64); + f->vs = VALS64(vs64); } else if (uns) { f->base |= BASE_UNIT_STRING; f->vs = uns; @@ -727,7 +727,7 @@ static int ProtoField_integer(lua_State* L, enum ftenum type) { if (vs64) { /* Indicate that we are using val64_string */ f->base |= BASE_VAL64_STRING; - f->vs = VALS(vs64); + f->vs = VALS64(vs64); } else if (vs32) { f->vs = VALS(vs32); } else if (uns) { |