aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/ethercat
diff options
context:
space:
mode:
authorGerasimos Dimitriadis <dimeg@intracom.gr>2009-11-17 18:35:27 +0000
committerGerasimos Dimitriadis <dimeg@intracom.gr>2009-11-17 18:35:27 +0000
commitc840cdd5a07a65b3903e443f1ed1203e60c5eba6 (patch)
tree0c1a8f4c587328fa6f7313f95799faaab62acfb4 /plugins/ethercat
parent99b8600eca893ba19631de2b7438d587ceb71350 (diff)
Remove the address operator from value_string arrays fed to VALS()
svn path=/trunk/; revision=30995
Diffstat (limited to 'plugins/ethercat')
-rw-r--r--plugins/ethercat/packet-ethercat-datagram.c6
-rw-r--r--plugins/ethercat/packet-ethercat-frame.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c
index 1fd66b5d72..cc577ccd89 100644
--- a/plugins/ethercat/packet-ethercat-datagram.c
+++ b/plugins/ethercat/packet-ethercat-datagram.c
@@ -1666,15 +1666,15 @@ void proto_register_ecat(void)
},
{ &hf_ecat_length_r,
{ "Reserved", "ecat.subframe.reserved",
- FT_UINT16, BASE_DEC, VALS(&ecat_subframe_reserved_vals), 0x3800, NULL, HFILL}
+ FT_UINT16, BASE_DEC, VALS(ecat_subframe_reserved_vals), 0x3800, NULL, HFILL}
},
{ &hf_ecat_length_c,
{ "Round trip", "ecat.subframe.circulating",
- FT_UINT16, BASE_DEC, VALS(&ecat_subframe_circulating_vals), 0x4000, NULL, HFILL}
+ FT_UINT16, BASE_DEC, VALS(ecat_subframe_circulating_vals), 0x4000, NULL, HFILL}
},
{ &hf_ecat_length_m,
{ "Last indicator", "ecat.subframe.more",
- FT_UINT16, BASE_DEC, VALS(&ecat_subframe_more_vals), 0x8000, NULL, HFILL}
+ FT_UINT16, BASE_DEC, VALS(ecat_subframe_more_vals), 0x8000, NULL, HFILL}
},
{ &hf_ecat_padding,
{ "Pad bytes", "ecat.subframe.pad_bytes",
diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c
index 0369b60c70..b17af4afae 100644
--- a/plugins/ethercat/packet-ethercat-frame.c
+++ b/plugins/ethercat/packet-ethercat-frame.c
@@ -119,7 +119,7 @@ void proto_register_ethercat_frame(void)
{ &hf_ethercat_frame_reserved,
{ "Reserved", "ecatf.reserved",
- FT_UINT16, BASE_HEX, VALS(&ethercat_frame_reserved_vals), 0x0800,
+ FT_UINT16, BASE_HEX, VALS(ethercat_frame_reserved_vals), 0x0800,
NULL, HFILL}
},