diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-10-13 14:17:35 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-10-13 15:34:09 +0000 |
| commit | b3ad51db7cb6f09f876e1a65343d97afc8713fb1 (patch) | |
| tree | 246600040cc5cdd1f59b8ca652ee2a5f9a75bab2 /epan/to_str.c | |
| parent | e8a63a5a464f56628f179cf14afd4429e61b7d91 (diff) | |
| download | wireshark-b3ad51db7cb6f09f876e1a65343d97afc8713fb1.tar.gz | |
Follow-up of ged0b19b (Make boolean bitmask type 64-bit wide)
- use G_GINT64_MODIFIER instead of "%ll"
- use G_GUINT64_CONSTANT instead of ULL
- add some missing explicit casts
Change-Id: Ic048d9ee8966ea504ea542cefe55688edcfb2dc7
Reviewed-on: https://code.wireshark.org/review/4644
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/to_str.c')
| -rw-r--r-- | epan/to_str.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/to_str.c b/epan/to_str.c index f9b876a0e0..c12e58b3f3 100644 --- a/epan/to_str.c +++ b/epan/to_str.c @@ -1004,7 +1004,7 @@ other_decode_bitfield_value(char *buf, const guint64 val, const guint64 mask, co i = 0; p = buf; - bit = 1ULL << (width - 1); + bit = G_GUINT64_CONSTANT(1) << (width - 1); for (;;) { if (mask & bit) { /* This bit is part of the field. Show its value. */ @@ -1051,7 +1051,7 @@ decode_numeric_bitfield(const guint64 val, const guint64 mask, const int width, buf=(char *)ep_alloc(1025); /* isn't this a bit overkill? */ /* Compute the number of bits we have to shift the bitfield right to extract its value. */ - while ((mask & (1ULL << shift)) == 0) + while ((mask & (G_GUINT64_CONSTANT(1) << shift)) == 0) shift++; p = decode_bitfield_value(buf, val, mask, width); |