diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-27 11:34:51 +0100 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-27 18:39:09 +0000 |
commit | 62b03da49a3e6c32f788da375faea2ca47fa2aa9 (patch) | |
tree | 7169a2968d68b9ee20db3c9cfac11207b5c7958f /ui | |
parent | 946222c676dbda138fff0b437be12f8fddab5131 (diff) | |
download | wireshark-62b03da49a3e6c32f788da375faea2ca47fa2aa9.tar.gz |
Fix display of bytes as EBCDIC
MSVC compiler does not support properly setting an enum being part of a bit field.
For example the following code:
pinfo->fd->flags.encoding = PACKET_CHAR_ENC_CHAR_EBCDIC;
changes pinfo->fd->flags.encoding from 0x0 to 0xfffffffe instead of 0x1
Let's put back an unsigned int definition (like it is in master-1.12 branch) and add explicit casts where required
Bug: 11787
Change-Id: Idae0140fb6c172f1b3dbf10baefc8cfb00128f4c
Reviewed-on: https://code.wireshark.org/review/12220
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/gtk/packet_panes.c | 4 | ||||
-rw-r--r-- | ui/qt/packet_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/packet_list.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ui/gtk/packet_panes.c b/ui/gtk/packet_panes.c index 6f78f8ef27..42f75b94a2 100644 --- a/ui/gtk/packet_panes.c +++ b/ui/gtk/packet_panes.c @@ -999,7 +999,7 @@ packet_hex_print(GtkWidget *bv, const guint8 *pd, frame_data *fd, /* stig: it should be done only for bitview... */ if (recent.gui_bytes_view != BYTES_BITS) bmask = 0x00; - packet_hex_update(bv, pd, len, bstart, bend, bmask, bmask_le, astart, aend, pstart, pend, fd->flags.encoding); + packet_hex_update(bv, pd, len, bstart, bend, bmask, bmask_le, astart, aend, pstart, pend, (packet_char_enc)fd->flags.encoding); } void @@ -1040,7 +1040,7 @@ packet_hex_editor_print(GtkWidget *bv, const guint8 *pd, frame_data *fd, int off g_object_set_data(G_OBJECT(bv), E_BYTE_VIEW_PROTO_START_KEY, GINT_TO_POINTER(pstart)); g_object_set_data(G_OBJECT(bv), E_BYTE_VIEW_PROTO_END_KEY, GINT_TO_POINTER(pend)); - packet_hex_update(bv, pd, len, bstart, bend, bmask, bmask_le, astart, aend, pstart, pend, fd->flags.encoding); + packet_hex_update(bv, pd, len, bstart, bend, bmask, bmask_le, astart, aend, pstart, pend, (packet_char_enc)fd->flags.encoding); } /* diff --git a/ui/qt/packet_dialog.cpp b/ui/qt/packet_dialog.cpp index e8efeadac5..a562f37f3f 100644 --- a/ui/qt/packet_dialog.cpp +++ b/ui/qt/packet_dialog.cpp @@ -83,7 +83,7 @@ PacketDialog::PacketDialog(QWidget &parent, CaptureFile &cf, frame_data *fdata) source = (struct data_source *)src_le->data; source_name = get_data_source_name(source); byte_view_tab_->addTab(source_name, get_data_source_tvb(source), edt_.tree, proto_tree_, - cap_file_.capFile()->current_frame->flags.encoding); + (packet_char_enc)cap_file_.capFile()->current_frame->flags.encoding); wmem_free(NULL, source_name); } byte_view_tab_->setCurrentIndex(0); diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp index 4c0ec0bdda..60fadf6d7a 100644 --- a/ui/qt/packet_list.cpp +++ b/ui/qt/packet_list.cpp @@ -475,7 +475,7 @@ void PacketList::selectionChanged (const QItemSelection & selected, const QItemS for (src_le = cap_file_->edt->pi.data_src; src_le != NULL; src_le = src_le->next) { source = (struct data_source *)src_le->data; source_name = get_data_source_name(source); - byte_view_tab_->addTab(source_name, get_data_source_tvb(source), cap_file_->edt->tree, proto_tree_, cap_file_->current_frame->flags.encoding); + byte_view_tab_->addTab(source_name, get_data_source_tvb(source), cap_file_->edt->tree, proto_tree_, (packet_char_enc)cap_file_->current_frame->flags.encoding); wmem_free(NULL, source_name); } byte_view_tab_->setCurrentIndex(0); |