diff options
Diffstat (limited to 'epan/dissectors/packet-miop.c')
| -rw-r--r-- | epan/dissectors/packet-miop.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/epan/dissectors/packet-miop.c b/epan/dissectors/packet-miop.c index 50adf6fee4..7d489db2fc 100644 --- a/epan/dissectors/packet-miop.c +++ b/epan/dissectors/packet-miop.c @@ -48,26 +48,26 @@ void proto_reg_handoff_miop(void); */ -static int proto_miop = -1; +static int proto_miop; /* * (sub)Tree declares */ -static gint hf_miop_magic = -1; -static gint hf_miop_hdr_version = -1; -static gint hf_miop_flags = -1; -static gint hf_miop_packet_length = -1; -static gint hf_miop_packet_number = -1; -static gint hf_miop_number_of_packets = -1; -static gint hf_miop_unique_id_len = -1; -static gint hf_miop_unique_id = -1; +static gint hf_miop_magic; +static gint hf_miop_hdr_version; +static gint hf_miop_flags; +static gint hf_miop_packet_length; +static gint hf_miop_packet_number; +static gint hf_miop_number_of_packets; +static gint hf_miop_unique_id_len; +static gint hf_miop_unique_id; -static gint ett_miop = -1; +static gint ett_miop; -static expert_field ei_miop_version_not_supported = EI_INIT; -static expert_field ei_miop_unique_id_len_exceed_max_value = EI_INIT; +static expert_field ei_miop_version_not_supported; +static expert_field ei_miop_unique_id_len_exceed_max_value; static dissector_handle_t miop_handle; @@ -120,7 +120,7 @@ static int dissect_miop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, guint32 unique_id_len; - wmem_strbuf_t *flags_strbuf = wmem_strbuf_new_label(pinfo->pool); + wmem_strbuf_t *flags_strbuf = wmem_strbuf_create(pinfo->pool); wmem_strbuf_append(flags_strbuf, "none"); if (!dissect_miop_heur_check(tvb, pinfo, tree, data)) @@ -177,7 +177,7 @@ static int dissect_miop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, miop_tree = proto_item_add_subtree (ti, ett_miop); /* XXX - Should we bail out if we don't have the right magic number? */ - proto_tree_add_item(miop_tree, hf_miop_magic, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(miop_tree, hf_miop_magic, tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_uint_format_value(miop_tree, hf_miop_hdr_version, tvb, offset, 1, hdr_version, "%u.%u", version_major, version_minor); @@ -237,7 +237,7 @@ dissect_miop_heur (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void dissect_miop (tvb, pinfo, tree, data); - /* TODO: make reasembly */ + /* TODO: make reassembly */ return TRUE; } |