aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-artnet.c
diff options
context:
space:
mode:
authorJoerg Mayer <jmayer@loplof.de>2016-03-28 13:37:24 +0200
committerJörg Mayer <jmayer@loplof.de>2016-03-28 12:46:31 +0000
commit8f3ad919054003ea96c670ab663268b75aba3755 (patch)
treeb97dc12e53bd61a61110406107e55a5b8938404c /epan/dissectors/packet-artnet.c
parentc0e48778b7c54dcd02b3700ff467031648d33bce (diff)
Fix some warnings/errors of type
git/epan/dissectors/packet-a21.c:478:25: error: 'item' was marked unused but was used [-Werror,-Wused-but-marked-unused] proto_item_append_text(item, "%s", val_to_str_const(event_id, a21_event_vals, "Unknown")); ^ Added manual change id because file-jpeg.c forced the use of commit -n Change-Id: Iffff53d6253758c8454d9583f0a11f317c8390cb Fix warnings/errors of type: git/epan/dissectors/packet-ax25-kiss.c:205:52: error: 'pseudo_header' was marked unused but was used [-Werror,-Wused-but-marked-unused] return capture_ax25( pd, l_offset, len, cpinfo, pseudo_header ); Fix checkhf warnings: Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_address_netswitch Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_address_subswitch Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_poll_reply_trailer Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_rdm_universe Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_tod_data_universe Change-Id: Id1fa12afb97a8e9cd4ed0ea25351c3b2639c930e Reviewed-on: https://code.wireshark.org/review/14667 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'epan/dissectors/packet-artnet.c')
-rw-r--r--epan/dissectors/packet-artnet.c38
1 files changed, 1 insertions, 37 deletions
diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c
index e2113018ce..381aff1e9e 100644
--- a/epan/dissectors/packet-artnet.c
+++ b/epan/dissectors/packet-artnet.c
@@ -1685,8 +1685,6 @@ static int hf_artnet_poll_reply_good_input_dmx_sip = -1;
static int hf_artnet_poll_reply_good_input_dmx_test = -1;
static int hf_artnet_poll_reply_good_input_data = -1;
-static int hf_artnet_poll_reply_trailer = -1;
-
static const int *artnet_poll_reply_status_fields[] = {
&hf_artnet_poll_reply_status_ubea_present,
&hf_artnet_poll_reply_status_rdm_supported,
@@ -1734,7 +1732,6 @@ static int hf_artnet_output_length = -1;
/* ArtAddress */
static int hf_artnet_address = -1;
-static int hf_artnet_address_netswitch = -1;
static int hf_artnet_address_netswitch_special = -1;
static int hf_artnet_address_netswitch_net = -1;
static int hf_artnet_address_netswitch_write = -1;
@@ -1750,7 +1747,6 @@ static int hf_artnet_address_swout_1 = -1;
static int hf_artnet_address_swout_2 = -1;
static int hf_artnet_address_swout_3 = -1;
static int hf_artnet_address_swout_4 = -1;
-static int hf_artnet_address_subswitch = -1;
static int hf_artnet_address_subswitch_special = -1;
static int hf_artnet_address_subswitch_sub = -1;
static int hf_artnet_address_subswitch_write = -1;
@@ -1834,7 +1830,6 @@ static int hf_artnet_tod_data_port = -1;
static int hf_artnet_tod_data_net = -1;
static int hf_artnet_tod_data_command_response = -1;
static int hf_artnet_tod_data_address = -1;
-static int hf_artnet_tod_data_universe = -1;
static int hf_artnet_tod_data_uid_total = -1;
static int hf_artnet_tod_data_block_count = -1;
static int hf_artnet_tod_data_uid_count = -1;
@@ -1851,7 +1846,6 @@ static int hf_artnet_tod_control_universe = -1;
static int hf_artnet_rdm = -1;
static int hf_artnet_rdm_command = -1;
static int hf_artnet_rdm_address = -1;
-static int hf_artnet_rdm_universe = -1;
static int hf_artnet_rdm_sc = -1;
static int hf_artnet_rdm_rdmver = -1;
@@ -3878,7 +3872,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
/* Heuristic dissector */
static gboolean
-dissect_artnet_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
+dissect_artnet_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
{
guint64 qword;
@@ -4453,12 +4447,6 @@ proto_register_artnet(void) {
FT_UINT8, BASE_HEX, VALS(artnet_poll_reply_status2_bigaddr_supported_vals), 0x08,
NULL, HFILL }},
- { &hf_artnet_poll_reply_trailer,
- { "Trailer",
- "artnet.poll_reply.trailer",
- FT_BYTES, BASE_NONE, NULL, 0x0,
- NULL, HFILL }},
-
/* ArtOutput */
@@ -4506,12 +4494,6 @@ proto_register_artnet(void) {
FT_UINT8, BASE_HEX, VALS(artnet_address_switch_vals), 0,
NULL, HFILL }},
- { &hf_artnet_address_netswitch,
- { "NetSwitch",
- "artnet.address.netswitch",
- FT_UINT8, BASE_HEX, NULL, 0,
- NULL, HFILL }},
-
{ &hf_artnet_address_netswitch_net,
{ "Net",
"artnet.address.netswitch_net",
@@ -4602,12 +4584,6 @@ proto_register_artnet(void) {
FT_UINT8, BASE_HEX, VALS(artnet_address_switch_vals), 0,
NULL, HFILL }},
- { &hf_artnet_address_subswitch,
- { "SubSwitch",
- "artnet.address.subswitch",
- FT_UINT8, BASE_HEX, NULL, 0,
- NULL, HFILL }},
-
{ &hf_artnet_address_subswitch_sub,
{ "Sub-Net",
"artnet.address.subswitch_sub",
@@ -4874,12 +4850,6 @@ proto_register_artnet(void) {
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
- { &hf_artnet_tod_data_universe,
- { "Universe",
- "artnet.tod_data.universe",
- FT_UINT16, BASE_DEC, NULL, 0x0,
- NULL, HFILL }},
-
{ &hf_artnet_tod_data_uid_total,
{ "UID Total",
"artnet.tod_data.uid_total",
@@ -4954,12 +4924,6 @@ proto_register_artnet(void) {
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
- { &hf_artnet_rdm_universe,
- { "Universe",
- "artnet.rdm.universe",
- FT_UINT16, BASE_DEC, NULL, 0x0,
- NULL, HFILL }},
-
{ &hf_artnet_rdm_sc,
{ "Startcode",
"artnet.rdm.sc",