diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-07 00:15:35 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-07 00:15:35 +0000 |
| commit | bdbdecf21533eb3fb1c4f7f8be06310d7b476ae2 (patch) | |
| tree | 65bab47c5eceb6a0875a602db7a726d919ce8bee /epan/dissectors/packet-scsi-osd.c | |
| parent | 4ec31fe7d8cb331d652bd2c6713b2806a5fc6f7d (diff) | |
Clean up the last two DIRTY_DISSECTOR_SRC entries.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29321 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-scsi-osd.c')
| -rw-r--r-- | epan/dissectors/packet-scsi-osd.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c index 53ba32df3c..1b6a51536f 100644 --- a/epan/dissectors/packet-scsi-osd.c +++ b/epan/dissectors/packet-scsi-osd.c @@ -873,12 +873,13 @@ static void dissect_osd_partition_id(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *tree, int hf_index, scsi_osd_lun_info_t *lun_info, gboolean is_created, gboolean is_removed) { proto_item *item=NULL; - guint64 partition_id; + guint32 partition_id[2]; /* partition id */ item=proto_tree_add_item(tree, hf_index, tvb, offset, 8, 0); - partition_id=tvb_get_ntoh64(tvb, offset); - if(!partition_id){ + partition_id[0]=tvb_get_ntohl(tvb, offset); + partition_id[1]=tvb_get_ntohl(tvb, offset+4); + if(!partition_id[0] && !partition_id[1]){ proto_item_append_text(item, " (ROOT partition)"); } else { partition_info_t *part_info; @@ -886,7 +887,7 @@ dissect_osd_partition_id(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tr proto_tree *partition_tree=NULL; pikey[0].length=2; - pikey[0].key=(guint32 *)&partition_id; + pikey[0].key=partition_id; pikey[1].length=0; part_info=se_tree_lookup32_array(lun_info->partitions, &pikey[0]); if(!part_info){ @@ -895,7 +896,7 @@ dissect_osd_partition_id(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tr part_info->removed_in=0; pikey[0].length=2; - pikey[0].key=(guint32 *)&partition_id; + pikey[0].key=partition_id; pikey[1].length=0; se_tree_insert32_array(lun_info->partitions, &pikey[0], part_info); } |