summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-tds.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-03-11 09:07:35 +0100
committerAnders Broman <a.broman58@gmail.com>2016-03-11 12:41:06 +0000
commit6f3bcd01024feb7f1f473d1c0b9e6c1a8b6e1c00 (patch)
treee09861116553bc6acc9521301ada2f720f411a00 /epan/dissectors/packet-tds.c
parentf67e7d78d82081c72bed5facd287c901a2ca72cd (diff)
downloadwireshark-6f3bcd01024feb7f1f473d1c0b9e6c1a8b6e1c00.tar.gz
TDS: Fix conflict for hf fields
'tds.done.donerowcount' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'tds.doneproc.donerowcount' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'tds.doneinproc.donerowcount' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'tds.envchange.newvalue' exists multiple times with NOT compatible types: FT_BYTES and FT_STRING 'tds.envchange.oldvalue' exists multiple times with NOT compatible types: FT_BYTES and FT_STRING Change-Id: I87d713aaa722d7ab9e8d19955f3820e9040446c1 Reviewed-on: https://code.wireshark.org/review/14415 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-tds.c')
-rw-r--r--epan/dissectors/packet-tds.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c
index 0306ae7f56..b6a8122836 100644
--- a/epan/dissectors/packet-tds.c
+++ b/epan/dissectors/packet-tds.c
@@ -4473,7 +4473,7 @@ proto_register_tds(void)
NULL, HFILL }
},
{ &hf_tds_done_donerowcount_64,
- { "Row count", "tds.done.donerowcount",
+ { "Row count", "tds.done.donerowcount64",
FT_UINT64, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
@@ -4500,7 +4500,7 @@ proto_register_tds(void)
NULL, HFILL }
},
{ &hf_tds_doneproc_donerowcount_64,
- { "Row count", "tds.doneproc.donerowcount",
+ { "Row count", "tds.doneproc.donerowcount64",
FT_UINT64, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
@@ -4527,7 +4527,7 @@ proto_register_tds(void)
NULL, HFILL }
},
{ &hf_tds_doneinproc_donerowcount_64,
- { "Row count", "tds.doneinproc.donerowcount",
+ { "Row count", "tds.doneinproc.donerowcount64",
FT_UINT64, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
@@ -4569,7 +4569,7 @@ proto_register_tds(void)
NULL, HFILL }
},
{ &hf_tds_envchg_newvalue_string,
- { "New Value", "tds.envchange.newvalue",
+ { "New Value", "tds.envchange.newvalue_string",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
@@ -4584,7 +4584,7 @@ proto_register_tds(void)
NULL, HFILL }
},
{ &hf_tds_envchg_oldvalue_string,
- { "Old Value", "tds.envchange.oldvalue",
+ { "Old Value", "tds.envchange.oldvalue_string",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},