diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-01-05 13:18:26 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-01-05 21:18:56 +0000 |
| commit | 1176db2ffe23a8467967787ea02912b8ad9807d3 (patch) | |
| tree | 4d7ef8a4c194ef26e094889c3f3524ad4f058b9d /epan/dissectors/packet-dji-uav.c | |
| parent | 318b8f81aed1939715a9dcc3e96ef1cba3d583d6 (diff) | |
Squelch harmless compiler warnings.
(Yes, we know, we're casting 16-bit integers to pointers. That's
because various generic maps need to be able to take arbitrary values as
keys, and sometimes the arbitrary values aren't structures to which we
point, but just integral values, and that's why GUINT_TO_POINTER()
exists, but it doesn't do enough casting to suppress harmless warnings.)
Change-Id: I1a9c68b4b1007f0a38017ba3570b94efb0b6845a
Reviewed-on: https://code.wireshark.org/review/6329
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-dji-uav.c')
| -rw-r--r-- | epan/dissectors/packet-dji-uav.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dji-uav.c b/epan/dissectors/packet-dji-uav.c index 1967fc3fcd..bb80f8af10 100644 --- a/epan/dissectors/packet-dji-uav.c +++ b/epan/dissectors/packet-dji-uav.c @@ -127,9 +127,9 @@ request_response_handling(tvbuff_t *tvb, packet_info *pinfo, proto_tree *djiuav_ djiuav_trans->request_time=pinfo->fd->abs_ts; djiuav_trans->seqno=seq_no; djiuav_trans->command=packet_type; - wmem_map_insert(djiuav_info->pdus, GUINT_TO_POINTER(seq_no), (void *)djiuav_trans); + wmem_map_insert(djiuav_info->pdus, GUINT_TO_POINTER((guint)seq_no), (void *)djiuav_trans); } else { - djiuav_trans=(djiuav_transaction_t *)wmem_map_lookup(djiuav_info->pdus, GUINT_TO_POINTER(seq_no)); + djiuav_trans=(djiuav_transaction_t *)wmem_map_lookup(djiuav_info->pdus, GUINT_TO_POINTER((guint)seq_no)); if (djiuav_trans) { /* Special case: djiuav seems to send 0x24 replies with seqno 0 and without a request */ if (djiuav_trans->reply_frame == 0) @@ -137,7 +137,7 @@ request_response_handling(tvbuff_t *tvb, packet_info *pinfo, proto_tree *djiuav_ } } } else { - djiuav_trans=(djiuav_transaction_t *)wmem_map_lookup(djiuav_info->pdus, GUINT_TO_POINTER(seq_no)); + djiuav_trans=(djiuav_transaction_t *)wmem_map_lookup(djiuav_info->pdus, GUINT_TO_POINTER((guint)seq_no)); } /* djiuav_trans may be 0 in case it's a reply without a matching request */ |