diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-18 21:30:42 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-18 21:30:42 +0000 |
| commit | c3af1555bb4c1eb47d86a0576d3dd7944572e6f5 (patch) | |
| tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-mbtcp.c | |
| parent | 8210e1b06b7f866f3bc60e22b8fb54a12adba06c (diff) | |
From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-mbtcp.c')
| -rw-r--r-- | epan/dissectors/packet-mbtcp.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index bdb7dd8b7a..1d41c494fb 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -594,98 +594,98 @@ proto_register_modbus(void) { &hf_mbtcp_transid, { "transaction identifier", "modbus_tcp.trans_id", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_mbtcp_protid, { "protocol identifier", "modbus_tcp.prot_id", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_mbtcp_len, { "length", "modbus_tcp.len", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, /* Modbus header fields */ { &hf_mbtcp_unitid, { "unit identifier", "modbus_tcp.unit_id", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_mbtcp_functioncode, { "function code", "modbus_tcp.func_code", FT_UINT8, BASE_DEC, VALS(function_code_vals), 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_modbus_reference, { "reference number", "modbus_tcp.reference_num", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_modbus_lreference, { "reference number (32 bit)", "modbus_tcp.reference_num_32", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_modbus_reftype, { "reference type", "modbus_tcp.reference_type", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_modbus_readref, { "read reference number", "modbus_tcp.read_reference_num", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_modbus_writeref, { "write reference number", "modbus_tcp.write_reference_num", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_modbus_wordcnt, { "word count", "modbus_tcp.word_cnt", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_modbus_readwordcnt, { "read word count", "modbus_tcp.read_word_cnt", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_modbus_writewordcnt, { "write word count", "modbus_tcp.write_word_cnt", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_modbus_bitcnt, { "bit count", "modbus_tcp.bit_cnt", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_modbus_bytecnt, { "byte count", "modbus_tcp.byte_cnt", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_modbus_lbytecnt, { "byte count (16-bit)", "modbus_tcp.byte_cnt_16", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_modbus_exceptioncode, { "exception code", "modbus_tcp.exception_code", FT_UINT8, BASE_DEC, VALS(exception_code_vals), 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_modbus_andmask, { "AND mask", "modbus_tcp.and_mask", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_modbus_ormask, { "OR mask", "modbus_tcp.or_mask", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } } }; |