diff options
| author | Daniel Mack <daniel@zonque.org> | 2014-09-17 18:39:22 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-10-12 14:15:12 +0000 |
| commit | ed0b19b94bf07056b5e0cfe64d4d05c3ebae801a (patch) | |
| tree | 4c4dd80aa856bf0a4c55704c88761a2d2ab2199a /epan/ftypes | |
| parent | 29afac24a579b01c029b2b5404bda7a102fe2232 (diff) | |
Make boolean bitmask type 64-bit wide
There are protocols out there that have 64-bit wide bit mask fields, so
make the internal representation and bitfield decoders 64-bit aware.
For this, the ws_ctz() fallback and bits_count_ones() have to be tweaked
slightly.
Change-Id: I19237b954a69c9e6c55864f281993c1e8731a233
Reviewed-on: https://code.wireshark.org/review/4158
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/ftypes')
| -rw-r--r-- | epan/ftypes/ftype-integer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c index 2bf81d6781..e603a9bf4a 100644 --- a/epan/ftypes/ftype-integer.c +++ b/epan/ftypes/ftype-integer.c @@ -1077,7 +1077,7 @@ ftype_register_integers(void) 0, /* wire_size */ boolean_fvalue_new, /* new_value */ NULL, /* free_value */ - uint32_from_unparsed, /* val_from_unparsed */ + uint64_from_unparsed, /* val_from_unparsed */ NULL, /* val_from_string */ boolean_to_repr, /* val_to_string_repr */ boolean_repr_len, /* len_string_repr */ @@ -1090,13 +1090,13 @@ ftype_register_integers(void) NULL, /* set_value_tvbuff */ set_uinteger, /* set_value_uinteger */ NULL, /* set_value_sinteger */ - NULL, /* set_value_integer64 */ + set_integer64, /* set_value_integer64 */ NULL, /* set_value_floating */ NULL, /* get_value */ - get_uinteger, /* get_value_uinteger */ + NULL, /* get_value_uinteger */ NULL, /* get_value_sinteger */ - NULL, /* get_value_integer64 */ + get_integer64, /* get_value_integer64 */ NULL, /* get_value_floating */ bool_eq, /* cmp_eq */ |