diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/packet-scsi-osd.h | |
parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | epan/dissectors/packet-scsi-osd.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-scsi-osd.h b/epan/dissectors/packet-scsi-osd.h index 2ab6a014..a8560a77 100644 --- a/epan/dissectors/packet-scsi-osd.h +++ b/epan/dissectors/packet-scsi-osd.h @@ -23,18 +23,18 @@ typedef void (*attribute_dissector)(tvbuff_t *tvb, packet_info *pinfo, proto_tre scsi_osd_lun_info_t *lun_info, const attribute_page_numbers_t *att); struct _attribute_page_numbers_t { - guint32 number; + uint32_t number; const char *name; attribute_dissector dissector; int* hf_index; - guint expected_length; + unsigned expected_length; }; const attribute_page_numbers_t * -osd_lookup_attribute(guint32 page, guint32 number); +osd_lookup_attribute(uint32_t page, uint32_t number); extern int hf_scsi_osd_opcode; -extern scsi_cdb_table_t scsi_osd_table[256]; +extern const scsi_cdb_table_t scsi_osd_table[256]; WS_DLL_PUBLIC value_string_ext scsi_osd_vals_ext; #endif |