aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gmr1_common.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-03-16 20:46:19 +0000
committerEvan Huus <eapache@gmail.com>2013-03-16 20:46:19 +0000
commite8c305fd3b957b68388653ad1029a253c90b9a53 (patch)
tree71987db56b4e08ccb2c210d2cff61aad8dac8633 /epan/dissectors/packet-gmr1_common.c
parentd456976017141773e7640b281c3a6263cd49390c (diff)
From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8487
Use enum values instead of manual constants in value_strings. This was introduced by r47218, which was designed to fix r47209, which would have been correct in the first place if the value_strings hadn't been full of hacks. I think everything is correct now. Perhaps it may be worth using extended value_strings though, since most of the tables seem to be consecutive in order? svn path=/trunk/; revision=48345
Diffstat (limited to 'epan/dissectors/packet-gmr1_common.c')
-rw-r--r--epan/dissectors/packet-gmr1_common.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-gmr1_common.c b/epan/dissectors/packet-gmr1_common.c
index 5b6021bb18..60a5af0884 100644
--- a/epan/dissectors/packet-gmr1_common.c
+++ b/epan/dissectors/packet-gmr1_common.c
@@ -74,8 +74,10 @@ const value_string gmr1_pd_short_vals[] = {
/* ------------------------------------------------------------------------ */
const value_string gmr1_ie_common_strings[] = {
- { 0, "Mobile Earth Station Classmark 2" }, /* [1] 11.5.1.6 */
- { 1, "Spare Half Octet" }, /* [1] 11.5.1.8 */
+ { GMR1_IE_COM_CM2,
+ "Mobile Earth Station Classmark 2" }, /* [1] 11.5.1.6 */
+ { GMR1_IE_COM_SPARE_NIBBLE,
+ "Spare Half Octet" }, /* [1] 11.5.1.8 */
{ 0, NULL}
};