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 /ui/gtk/packet_panes.c | |
parent | e8a63a5a464f56628f179cf14afd4429e61b7d91 (diff) |
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 'ui/gtk/packet_panes.c')
-rw-r--r-- | ui/gtk/packet_panes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/packet_panes.c b/ui/gtk/packet_panes.c index 36888ab61a..e8c193711c 100644 --- a/ui/gtk/packet_panes.c +++ b/ui/gtk/packet_panes.c @@ -961,7 +961,7 @@ packet_hex_print(GtkWidget *bv, const guint8 *pd, frame_data *fd, /* XXX, mask has only 32 bit, later we can store bito&bitc, and use them (which should be faster) */ if (bitt > 0 && bitt < 32) { - bmask = ((1ULL << bitc) - 1) << ((8-bitt) & 7); + bmask = ((G_GUINT64_CONSTANT(1) << bitc) - 1) << ((8-bitt) & 7); bmask_le = 0; /* ? */ } } @@ -1025,7 +1025,7 @@ packet_hex_editor_print(GtkWidget *bv, const guint8 *pd, frame_data *fd, int off break; case BYTES_BITS: - bmask = (1ULL << (7-bitoffset)); + bmask = (G_GUINT64_CONSTANT(1) << (7-bitoffset)); break; default: |