diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-08-06 20:10:59 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-08-06 20:10:59 +0000 |
| commit | 72ea2f9c9c63c7e5c6270383888ad32683d96edf (patch) | |
| tree | c58a12fbefc4c245ec132d2c7db06486a6981945 /ui/gtk | |
| parent | 93f56d8a770e9a29bfeb27f0698ae25ae89206a9 (diff) | |
| download | wireshark-72ea2f9c9c63c7e5c6270383888ad32683d96edf.tar.gz | |
Remove hfinfo->bitshift member, add hfinfo_bitshift() to get it.
svn path=/trunk/; revision=51174
Diffstat (limited to 'ui/gtk')
| -rw-r--r-- | ui/gtk/packet_panes.c | 2 | ||||
| -rw-r--r-- | ui/gtk/packet_win.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ui/gtk/packet_panes.c b/ui/gtk/packet_panes.c index 242cc8bb3b..9ae9888abe 100644 --- a/ui/gtk/packet_panes.c +++ b/ui/gtk/packet_panes.c @@ -933,7 +933,7 @@ packet_hex_print(GtkWidget *bv, const guint8 *pd, frame_data *fd, bstart = finfo->start; } - /* bmask = finfo->hfinfo->bitmask << finfo->hfinfo->bitshift; */ /* (value & mask) >> shift */ + /* bmask = finfo->hfinfo->bitmask << hfinfo_bitshift(finfo->hfinfo); */ /* (value & mask) >> shift */ if (finfo->hfinfo) bmask = finfo->hfinfo->bitmask; astart = finfo->appendix_start; alen = finfo->appendix_length; diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c index 6e52c3438c..5c8ee53656 100644 --- a/ui/gtk/packet_win.c +++ b/ui/gtk/packet_win.c @@ -406,8 +406,8 @@ finfo_integer_changed(GtkSpinButton *spinbutton, gpointer user_data) return; } - if (hfinfo->bitmask && hfinfo->bitshift > 0) - u_val <<= hfinfo->bitshift; + if (hfinfo->bitmask) + u_val <<= hfinfo_bitshift(hfinfo); finfo_integer_common(DataPtr, u_val); } @@ -578,8 +578,8 @@ new_finfo_window(GtkWidget *w, struct FieldinfoWinData *DataPtr) if (finfo->length * 8 < bitcount) bitcount = finfo->length / 8; - if (hfinfo->bitmask && hfinfo->bitshift > 0) - bitcount -= hfinfo->bitshift; + if (hfinfo->bitmask) + bitcount -= hfinfo_bitshift(hfinfo); /* XXX, hfinfo->bitmask: Can we configure GTK_ADJUSTMENT to do custom step? (value-changed signal?) */ |