diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-10-13 15:49:45 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-10-13 15:49:45 +0000 |
| commit | c55d00576e6758403a8034c6d0710c0ee3a40092 (patch) | |
| tree | 43837d8e8739250e9d3f544ff0101b4df36f8eeb | |
| parent | b768a63583656b61b1c6b699dd7717e22f6ff151 (diff) | |
Delete unused hf_ entries found by checkhf.pl.
svn path=/trunk/; revision=39404
| -rw-r--r-- | epan/dissectors/packet-ajp13.c | 5 | ||||
| -rw-r--r-- | epan/dissectors/packet-fmtp.c | 13 |
2 files changed, 3 insertions, 15 deletions
diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c index 8bfb1f4e92..2174cff4d1 100644 --- a/epan/dissectors/packet-ajp13.c +++ b/epan/dissectors/packet-ajp13.c @@ -220,7 +220,6 @@ static int hf_ajp13_srv = -1; static int hf_ajp13_port = -1; static int hf_ajp13_sslp = -1; static int hf_ajp13_nhdr = -1; -static int hf_ajp13_hname = -1; static int hf_ajp13_hval = -1; static int hf_ajp13_rlen = -1; static int hf_ajp13_reusep = -1; @@ -787,10 +786,6 @@ proto_register_ajp13(void) { "NHDR", "ajp13.nhdr", FT_UINT16, BASE_DEC, NULL, 0x0, "Num Headers", HFILL } }, - { &hf_ajp13_hname, - { "HNAME", "ajp13.hname", FT_STRING, BASE_NONE, NULL, 0x0, "Header Name", - HFILL } - }, { &hf_ajp13_hval, { "HVAL", "ajp13.hval", FT_STRING, BASE_NONE, NULL, 0x0, "Header Value", HFILL } diff --git a/epan/dissectors/packet-fmtp.c b/epan/dissectors/packet-fmtp.c index 73193a6360..7d840bbf27 100644 --- a/epan/dissectors/packet-fmtp.c +++ b/epan/dissectors/packet-fmtp.c @@ -40,7 +40,6 @@ static int hf_fmtp_pdu_version = -1; static int hf_fmtp_pdu_reserved = -1; static int hf_fmtp_pdu_type = -1; static int hf_fmtp_pdu_length = -1; -static int hf_fmtp_data = -1; static gint ett_fmtp = -1; #define TCP_PORT_FMTP 8500 @@ -98,10 +97,10 @@ dissect_fmtp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case FMTP_TYP_IDENTIFICATION: proto_item_append_text(ti, " (%s)", tvb_get_ephemeral_string(tvb, FMTP_HEADER_LEN, packet_len-FMTP_HEADER_LEN)); - col_add_fstr(pinfo->cinfo, COL_INFO, "%s (%s)", + col_add_fstr(pinfo->cinfo, COL_INFO, "%s (%s)", val_to_str(packet_type, packet_type_names, "Unknown (0x%02x)"), tvb_get_ephemeral_string(tvb, FMTP_HEADER_LEN, packet_len-FMTP_HEADER_LEN)); - break; + break; case FMTP_TYP_SYSTEM: proto_item_append_text(ti, " (%s)", @@ -182,12 +181,6 @@ proto_register_fmtp(void) FT_UINT8, BASE_DEC, VALS(packet_type_names), 0x0, NULL, HFILL } - }, - { &hf_fmtp_data, - { "Data", "fmtp.data", - FT_BYTES, BASE_NONE, - NULL, 0x0, - NULL, HFILL } } }; @@ -209,7 +202,7 @@ void proto_reg_handoff_fmtp(void) { static int fmtp_inited = FALSE; - + if (!fmtp_inited) { /* Register as heuristic dissector for TCP */ |