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

1 files changed, 64 insertions, 32 deletions

diff --git a/epan/dissectors/packet-gmr1_rr.c b/epan/dissectors/packet-gmr1_rr.c
index 67095e96ae..f066441a6a 100644
--- a/epan/dissectors/packet-gmr1_rr.c
+++ b/epan/dissectors/packet-gmr1_rr.c
@@ -95,38 +95,70 @@ enum gmr1_ie_rr_idx {
 };
 
 const value_string gmr1_ie_rr_strings[] = {
-	{ 0x00, "Channel Description" },		/* [1] 11.5.2.5   */
-	{ 0x01, "Channel Mode" },			/* [1] 11.5.2.6   */
-	{ 0x02, "Cipher Mode Setting" },		/* [4] 10.5.2.9   */
-	{ 0x03, "Cipher Response" },		/* [4] 10.5.2.10  */
-	{ 0x04, "L2 Pseudo Length" },		/* [1] 11.5.2.19  */
-	{ 0x05, "Page Mode" },			/* [1] 11.5.2.26  */
-	{ 0x06, "Request Reference" },		/* [1] 11.5.2.30  */
-	{ 0x07, "RR Cause" },			/* [1] 11.5.2.31  */
-	{ 0x08, "Timing Offset" },			/* [1] 11.5.2.40  */
-	{ 0x09, "TMSI/P-TMSI" },			/* [4] 10.5.2.42  */
-	{ 0x0a, "Wait Indication" },		/* [4] 10.5.2.43  */
-	{ 0x0b, "MES Information Flag" },		/* [1] 11.5.2.44  */
-	{ 0x0c, "Frequency Offset" },		/* [1] 11.5.2.49  */
-	{ 0x0d, "Paging Information" },		/* [1] 11.5.2.51  */
-	{ 0x0e, "Position Display" },		/* [1] 11.5.2.52  */
-	{ 0x0f, "Position Update Information" },	/* [1] 11.5.2.54  */
-	{ 0x10, "BCCH Carrier Specification"},	/* [1] 11.5.2.55  */
-	{ 0x11, "Reject Cause" },			/* [1] 11.5.2.56  */
-	{ 0x12, "GPS timestamp" },			/* [1] 11.5.2.57  */
-	{ 0x13, "Power Control Params" },		/* [1] 11.5.2.60  */
-	{ 0x14, "TMSI Availability Mask" },	/* [1] 11.5.2.62  */
-	{ 0x15, "GPS Almanac Data" },		/* [1] 11.5.2.63  */
-	{ 0x16, "MSC ID" },			/* [1] 11.5.2.100 */
-	{ 0x17, "GPS Discriminator" },		/* [1] 11.5.2.101 */
-	{ 0x18, "Packet Imm. Ass. Type 3 Params" },/* [3] 11.5.2.105 */
-	{ 0x19, "Packet Frequency Parameters" },	/* [3] 11.5.2.106 */
-	{ 0x1a, "Packet Imm. Ass. Type 2 Params" },/* [3] 11.5.2.107 */
-	{ 0x1b, "USF" },				/* [3] 11.5.2.110 */
-	{ 0x1c, "Timing Advance Index" },		/* [3] 10.1.18.3.4 */
-	{ 0x1d, "TLLI" },				/* [5] 12.16      */
-	{ 0x1e, "Packet Power Control Params" },	/* [3] 10.1.18.3.3 */
-	{ 0x1f, "Persistence Level" },		/* [3] 10.1.18.4.2 */
+	{ GMR1_IE_RR_CHAN_DESC,
+	  "Channel Description" },		/* [1] 11.5.2.5   */
+	{ GMR1_IE_RR_CHAN_MODE,
+	  "Channel Mode" },			/* [1] 11.5.2.6   */
+	{ GMR1_IE_RR_CIPH_MODE_SETTING,
+	  "Cipher Mode Setting" },		/* [4] 10.5.2.9   */
+	{ GMR1_IE_RR_CIPH_RESP,
+	  "Cipher Response" },			/* [4] 10.5.2.10  */
+	{ GMR1_IE_RR_L2_PSEUDO_LEN,
+	  "L2 Pseudo Length" },			/* [1] 11.5.2.19  */
+	{ GMR1_IE_RR_PAGE_MODE,
+	  "Page Mode" },			/* [1] 11.5.2.26  */
+	{ GMR1_IE_RR_REQ_REF,
+	  "Request Reference" },		/* [1] 11.5.2.30  */
+	{ GMR1_IE_RR_CAUSE,
+	  "RR Cause" },				/* [1] 11.5.2.31  */
+	{ GMR1_IE_RR_TIMING_OFS,
+	  "Timing Offset" },			/* [1] 11.5.2.40  */
+	{ GMR1_IE_RR_TMSI_PTMSI,
+	  "TMSI/P-TMSI" },			/* [4] 10.5.2.42  */
+	{ GMR1_IE_RR_WAIT_IND,
+	  "Wait Indication" },			/* [4] 10.5.2.43  */
+	{ GMR1_IE_RR_MES_INFO_FLG,
+	  "MES Information Flag" },		/* [1] 11.5.2.44  */
+	{ GMR1_IE_RR_FREQ_OFS,
+	  "Frequency Offset" },			/* [1] 11.5.2.49  */
+	{ GMR1_IE_RR_PAGE_INFO,
+	  "Paging Information" },		/* [1] 11.5.2.51  */
+	{ GMR1_IE_RR_POS_DISPLAY,
+	  "Position Display" },			/* [1] 11.5.2.52  */
+	{ GMR1_IE_RR_POS_UPD_INFO,
+	  "Position Update Information" },	/* [1] 11.5.2.54  */
+	{ GMR1_IE_RR_BCCH_CARRIER,
+	  "BCCH Carrier Specification"},	/* [1] 11.5.2.55  */
+	{ GMR1_IE_RR_REJECT_CAUSE,
+	  "Reject Cause" },			/* [1] 11.5.2.56  */
+	{ GMR1_IE_RR_GPS_TIMESTAMP,
+	  "GPS timestamp" },			/* [1] 11.5.2.57  */
+	{ GMR1_IE_RR_PWR_CTRL_PRM,
+	  "Power Control Params" },		/* [1] 11.5.2.60  */
+	{ GMR1_IE_RR_TMSI_AVAIL_MSK,
+	  "TMSI Availability Mask" },		/* [1] 11.5.2.62  */
+	{ GMR1_IE_RR_GPS_ALMANAC,
+	  "GPS Almanac Data" },			/* [1] 11.5.2.63  */
+	{ GMR1_IE_RR_MSC_ID,
+	  "MSC ID" },				/* [1] 11.5.2.100 */
+	{ GMR1_IE_RR_GPS_DISCR,
+	  "GPS Discriminator" },		/* [1] 11.5.2.101 */
+	{ GMR1_IE_RR_PKT_IMM_ASS_3_PRM,
+	  "Packet Imm. Ass. Type 3 Params" },	/* [3] 11.5.2.105 */
+	{ GMR1_IE_RR_PKT_FREQ_PRM,
+	  "Packet Frequency Parameters" },	/* [3] 11.5.2.106 */
+	{ GMR1_IE_RR_PKT_IMM_ASS_2_PRM,
+	  "Packet Imm. Ass. Type 2 Params" },	/* [3] 11.5.2.107 */
+	{ GMR1_IE_RR_USF,		
+	  "USF" },				/* [3] 11.5.2.110 */
+	{ GMR1_IE_RR_TIMING_ADV_IDX,
+	  "Timing Advance Index" },		/* [3] 10.1.18.3.4 */
+	{ GMR1_IE_RR_TLLI,
+	  "TLLI" },				/* [5] 12.16      */
+	{ GMR1_IE_RR_PKT_PWR_CTRL_PRM,
+	  "Packet Power Control Params" },	/* [3] 10.1.18.3.3 */
+	{ GMR1_IE_RR_PERSISTENCE_LVL,
+	  "Persistence Level" },		/* [3] 10.1.18.4.2 */
 	{ 0, NULL },
 };