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/to_str.h | |
| parent | 29afac24a579b01c029b2b5404bda7a102fe2232 (diff) | |
| download | wireshark-ed0b19b94bf07056b5e0cfe64d4d05c3ebae801a.tar.gz | |
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/to_str.h')
| -rw-r--r-- | epan/to_str.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/to_str.h b/epan/to_str.h index 6d180dba44..963d228856 100644 --- a/epan/to_str.h +++ b/epan/to_str.h @@ -94,11 +94,11 @@ gchar* guid_to_str_buf(const e_guid_t*, gchar*, int); WS_DLL_PUBLIC char *decode_bits_in_field(const guint bit_offset, const gint no_of_bits, const guint64 value); -WS_DLL_PUBLIC char *other_decode_bitfield_value(char *buf, const guint32 val, const guint32 mask, +WS_DLL_PUBLIC char *other_decode_bitfield_value(char *buf, const guint64 val, const guint64 mask, const int width); -WS_DLL_PUBLIC char *decode_bitfield_value(char *buf, const guint32 val, const guint32 mask, +WS_DLL_PUBLIC char *decode_bitfield_value(char *buf, const guint64 val, const guint64 mask, const int width); -WS_DLL_PUBLIC const char *decode_numeric_bitfield(const guint32 val, const guint32 mask, const int width, +WS_DLL_PUBLIC const char *decode_numeric_bitfield(const guint64 val, const guint64 mask, const int width, const char *fmt) G_GNUC_PRINTF(4, 0); WS_DLL_PUBLIC const gchar* port_type_to_str (port_type type); |