diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-02-03 22:29:48 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-02-03 22:29:48 +0000 |
| commit | 6549fbbad7f6e2bd8cb05b63e4fe7b98d77468d0 (patch) | |
| tree | 16e4f196347be2fca882512fbb9b3f13e71f3c61 /epan/dissectors/packet-netperfmeter.c | |
| parent | 7fa9cf92098e8547c38f8df7e71cf216228a8333 (diff) | |
#if 0 unused hf[] entries & etc.
Note: All (or almost all) unused hf[] entries
in non-generated Wireshark dissectors
have been #if 0'd (or commented) out.
(This applies only to 'static hf_...' vars).
A number of (non-generated) dissector
files with *missing* hf[] entries
still need to be fixed.
svn path=/trunk/; revision=47459
Diffstat (limited to 'epan/dissectors/packet-netperfmeter.c')
| -rw-r--r-- | epan/dissectors/packet-netperfmeter.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/epan/dissectors/packet-netperfmeter.c b/epan/dissectors/packet-netperfmeter.c index 36fc3e5464..269b7ac86d 100644 --- a/epan/dissectors/packet-netperfmeter.c +++ b/epan/dissectors/packet-netperfmeter.c @@ -77,7 +77,7 @@ INIT_FIELD(message_length, 2, 2) INIT_FIELD(acknowledge_flowid, 4, 4) INIT_FIELD(acknowledge_measurementid, 8, 8) INIT_FIELD(acknowledge_streamid, 16, 2) -INIT_FIELD(acknowledge_padding, 18, 2) +/* INIT_FIELD(acknowledge_padding, 18, 2) */ INIT_FIELD(acknowledge_status, 20, 4) INIT_FIELD(addflow_flowid, 4, 4) @@ -126,10 +126,10 @@ INIT_FIELD(data_byteseqnumber, 32, 8) INIT_FIELD(data_timestamp, 40, 8) INIT_FIELD(data_payload, 48, 0) -INIT_FIELD(start_padding, 4, 4) +/* INIT_FIELD(start_padding, 4, 4) */ INIT_FIELD(start_measurementid, 8, 8) -INIT_FIELD(stop_padding, 4, 4) +/* INIT_FIELD(stop_padding, 4, 4) */ INIT_FIELD(stop_measurementid, 8, 8) INIT_FIELD(results_data, 4, 0) @@ -172,7 +172,9 @@ static hf_register_info hf[] = { { &hf_acknowledge_flowid, { "Flow ID", "npmp.acknowledge_flowid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_acknowledge_measurementid, { "Measurement ID", "npmp.acknowledge_measurementid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_acknowledge_streamid, { "Stream ID", "npmp.acknowledge_streamid", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_acknowledge_padding, { "Padding", "npmp.acknowledge_padding", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_acknowledge_status, { "Status", "npmp.acknowledge_status", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_addflow_flowid, { "Flow ID", "npmp.addflow_flowid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, @@ -221,10 +223,14 @@ static hf_register_info hf[] = { { &hf_data_timestamp, { "Time Stamp", "npmp.data_timestamp", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_data_payload, { "Payload", "npmp.data_payload", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_start_padding, { "Padding", "npmp.start_padding", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_start_measurementid, { "Measurement ID", "npmp.start_measurementid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_stop_padding, { "Padding", "npmp.stop_padding", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_stop_measurementid, { "Measurement ID", "npmp.stop_measurementid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_results_data, { "Data", "npmp.results_data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, |