diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-04-29 15:51:15 -0400 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-04-29 19:54:00 +0000 |
| commit | 133d4deb7e3f07a6f4db4e62a53256a66e218b61 (patch) | |
| tree | 7cab9bc982ab74cf39033bd6a66d86f8975242b2 /epan/dissectors/packet-iscsi.c | |
| parent | dfb92dfd674474b89fa6a2d833b01443b1183032 (diff) | |
Fix cast for older versions of GLib.
The version of GLib on the 32-bit OS X builder defines
Unfortunately this results in a cast warning when u is a guint16. Newer
versions of GLib cast to gulong so do that.
Change-Id: I2d7e56ef9e5164789ee3a59115cb0f4a76155880
Reviewed-on: https://code.wireshark.org/review/1433
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/dissectors/packet-iscsi.c')
| -rw-r--r-- | epan/dissectors/packet-iscsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index d57b9905f8..b90dc50453 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -816,18 +816,18 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off cdata->itlq.lun=lun; cdata->itlq.first_exchange_frame=pinfo->fd->num; - itl=(itl_nexus_t *)wmem_map_lookup(iscsi_session->itl, GUINT_TO_POINTER(lun)); + itl=(itl_nexus_t *)wmem_map_lookup(iscsi_session->itl, GUINT_TO_POINTER((gulong)lun)); if(!itl){ itl=wmem_new(wmem_file_scope(), itl_nexus_t); itl->cmdset=0xff; itl->conversation=conversation; - wmem_map_insert(iscsi_session->itl, GUINT_TO_POINTER(lun), itl); + wmem_map_insert(iscsi_session->itl, GUINT_TO_POINTER((gulong)lun), itl); } } if(!itl){ - itl=(itl_nexus_t *)wmem_map_lookup(iscsi_session->itl, GUINT_TO_POINTER(cdata->itlq.lun)); + itl=(itl_nexus_t *)wmem_map_lookup(iscsi_session->itl, GUINT_TO_POINTER((gulong)cdata->itlq.lun)); } |