aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-11-20 12:23:42 +0100
committerMichael Mann <mmann78@netscape.net>2016-11-20 16:52:27 +0000
commit95325a2e399d86b67a04f13dccbcdfdabe192087 (patch)
tree5794326088b5d24e7a76d75f4b5a462ba1c0e079
parent01d1abcec075cab84454a7a42a8bd561ce3ae5d3 (diff)
hsms: Fix conflict for hf fields
'hsms.data.item.value' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_BYTES 'hsms.data.item.value' exists multiple times with NOT compatible types: FT_STRING and FT_BOOLEAN 'hsms.data.item.value' exists multiple times with NOT compatible types: FT_INT64 and FT_STRING 'hsms.data.item.value' exists multiple times with NOT compatible types: FT_INT8 and FT_INT64 'hsms.data.item.value' exists multiple times with NOT compatible types: FT_DOUBLE and FT_INT32 'hsms.data.item.value' exists multiple times with NOT compatible types: FT_UINT64 and FT_FLOAT 'hsms.data.item.value' exists multiple times with NOT compatible types: FT_UINT8 and FT_UINT64 Change-Id: I83697e72ebfa4e164178141d789c4ca2d9d09db0 Reviewed-on: https://code.wireshark.org/review/18887 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Benjamin Parzella <bparzella@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/dissectors/packet-hsms.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/epan/dissectors/packet-hsms.c b/epan/dissectors/packet-hsms.c
index 211d8e8e71..4403cd6315 100644
--- a/epan/dissectors/packet-hsms.c
+++ b/epan/dissectors/packet-hsms.c
@@ -645,79 +645,79 @@ proto_register_hsms(void)
NULL, HFILL }
},
{ &hf_hsms_data_item_value_binary,
- { "Value", "hsms.data.item.value",
+ { "Value", "hsms.data.item.value.binary",
FT_BYTES, SEP_COLON,
NULL, 0x00,
NULL, HFILL }
},
{ &hf_hsms_data_item_value_boolean,
- { "Value", "hsms.data.item.value",
+ { "Value", "hsms.data.item.value.boolean",
FT_BOOLEAN, 8,
NULL, 0x01,
NULL, HFILL }
},
{ &hf_hsms_data_item_value_string,
- { "Value", "hsms.data.item.value",
+ { "Value", "hsms.data.item.value.string",
FT_STRING, BASE_NONE,
NULL, 0x00,
NULL, HFILL }
},
{ &hf_hsms_data_item_value_i8,
- { "Value", "hsms.data.item.value",
+ { "Value", "hsms.data.item.value.int64",
FT_INT64, BASE_DEC,
NULL, 0x00,
NULL, HFILL }
},
{ &hf_hsms_data_item_value_i1,
- { "Value", "hsms.data.item.value",
+ { "Value", "hsms.data.item.value.int8",
FT_INT8, BASE_DEC,
NULL, 0x00,
NULL, HFILL }
},
{ &hf_hsms_data_item_value_i2,
- { "Value", "hsms.data.item.value",
+ { "Value", "hsms.data.item.value.int16",
FT_INT16, BASE_DEC,
NULL, 0x00,
NULL, HFILL }
},
{ &hf_hsms_data_item_value_i4,
- { "Value", "hsms.data.item.value",
+ { "Value", "hsms.data.item.value.int32",
FT_INT32, BASE_DEC,
NULL, 0x00,
NULL, HFILL }
},
{ &hf_hsms_data_item_value_f8,
- { "Value", "hsms.data.item.value",
+ { "Value", "hsms.data.item.value.double",
FT_DOUBLE, BASE_NONE,
NULL, 0x00,
NULL, HFILL }
},
{ &hf_hsms_data_item_value_f4,
- { "Value", "hsms.data.item.value",
+ { "Value", "hsms.data.item.value.float",
FT_FLOAT, BASE_NONE,
NULL, 0x00,
NULL, HFILL }
},
{ &hf_hsms_data_item_value_u8,
- { "Value", "hsms.data.item.value",
+ { "Value", "hsms.data.item.value.uint64",
FT_UINT64, BASE_DEC,
NULL, 0x00,
NULL, HFILL }
},
{ &hf_hsms_data_item_value_u1,
- { "Value", "hsms.data.item.value",
+ { "Value", "hsms.data.item.value.uint8",
FT_UINT8, BASE_DEC,
NULL, 0x00,
NULL, HFILL }
},
{ &hf_hsms_data_item_value_u2,
- { "Value", "hsms.data.item.value",
+ { "Value", "hsms.data.item.value.uint16",
FT_UINT16, BASE_DEC,
NULL, 0x00,
NULL, HFILL }
},
{ &hf_hsms_data_item_value_u4,
- { "Value", "hsms.data.item.value",
+ { "Value", "hsms.data.item.value.uint32",
FT_UINT32, BASE_DEC,
NULL, 0x00,
NULL, HFILL }