From 6aca10831f86c562970b13efa811f46e25ee3091 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Fri, 14 Sep 2012 14:05:50 +0000 Subject: From Mike Morrin: Fix pedantic compiler warnings in csn.1 dissectors. There is some tricky casting going on in csn.1 structures. To eliminate all the warnings, the function pointers needed to be moved out of the object pointer unions. Fortunately macros (mostly) hide these changes from the protocol dissector tables. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7686 svn path=/trunk/; revision=44899 --- epan/dissectors/packet-gsm_rlcmac.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'epan/dissectors/packet-gsm_rlcmac.h') diff --git a/epan/dissectors/packet-gsm_rlcmac.h b/epan/dissectors/packet-gsm_rlcmac.h index 7746a33654..138b8c20eb 100644 --- a/epan/dissectors/packet-gsm_rlcmac.h +++ b/epan/dissectors/packet-gsm_rlcmac.h @@ -334,10 +334,10 @@ typedef struct struct MobileId /* Mobile id, -> TMSI, IMEI or IMSI */ { - guint8 Length:8; - guint8 IdType:3; - guint8 OddEven:1; - guint8 Dig1:4; + guint8 Length; + guint8 IdType; + guint8 OddEven; + guint8 Dig1; union { unsigned char TMSI[TMSI_LEN]; @@ -5004,7 +5004,7 @@ typedef enum RLCMAC_HDR_TYPE_7 = 0x37, RLCMAC_HDR_TYPE_8 = 0x38, RLCMAC_HDR_TYPE_9 = 0x39, - RLCMAC_HDR_TYPE_10 = 0x3a, + RLCMAC_HDR_TYPE_10 = 0x3a }RLCMAC_block_format_t; /* < Downlink RLC/MAC control message > */ -- cgit v1.2.3