Get rid of C++/C99 style comments--not all compilers support them

svn path=/trunk/; revision=23608

14 files changed, 509 insertions, 507 deletions

diff --git a/epan/dissectors/packet-epl.h b/epan/dissectors/packet-epl.h
index f9e7dce5a0..a7ec3acba4 100644
--- a/epan/dissectors/packet-epl.h
+++ b/epan/dissectors/packet-epl.h
@@ -306,7 +306,7 @@ static const value_string epl_nmt_ms_vals[] = {
 
 
 
-// EPL Device Profiles according to CANopen
+/* EPL Device Profiles according to CANopen */
 #define EPL_PROFILE_NO              0
 #define EPL_PROFILE_GENERIC_IO      401
 #define EPL_PROFILE_DRIVE           402
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c
index 55ee55b5b6..a49bcd080f 100644
--- a/epan/dissectors/packet-jxta.c
+++ b/epan/dissectors/packet-jxta.c
@@ -462,7 +462,7 @@ static gboolean dissect_jxta_UDP_heur(tvbuff_t * tvb, packet_info * pinfo, proto
     save_desegment_offset = pinfo->desegment_offset;
     save_desegment_len = pinfo->desegment_len;
     ret = dissect_jxta_udp(tvb, pinfo, tree);
-    
+
     /* g_message( "%d Heuristic UDP Dissection : %d", pinfo->fd->num, ret ); */
 
     if (ret < 0) {
@@ -512,9 +512,9 @@ static gboolean dissect_jxta_TCP_heur(tvbuff_t * tvb, packet_info * pinfo, proto
     save_desegment_offset = pinfo->desegment_offset;
     save_desegment_len = pinfo->desegment_len;
     ret = dissect_jxta_stream(tvb, pinfo, tree);
-    
+
     /* g_message( "%d Heuristic TCP Dissection : %d", pinfo->fd->num, ret ); */
-    
+
     if (ret < 0) {
         /*
          * A heuristic dissector for a TCP-based protocol can reject
@@ -572,7 +572,7 @@ static gboolean dissect_jxta_SCTP_heur(tvbuff_t * tvb, packet_info * pinfo, prot
     save_desegment_offset = pinfo->desegment_offset;
     save_desegment_len = pinfo->desegment_len;
     ret = dissect_jxta_stream(tvb, pinfo, tree);
-    
+
     /* g_message( "%d Heuristic SCTP Dissection : %d", pinfo->fd->num, ret ); */
 
     if (ret < 0) {
@@ -866,16 +866,16 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
 		  peer_conversation = get_peer_conversation(pinfo, tpt_conv_data, TRUE);
 		}
             }
-            
+
             /* Use our source and destination addresses if we have them */
             if (NULL != peer_conversation) {
-                /* g_message("%d Tpt %s:%d -> %s:%d", pinfo->fd->num, 
-                          address_to_str(&tpt_conv_data->initiator_tpt_address), tpt_conv_data->initiator_tpt_port, 
+                /* g_message("%d Tpt %s:%d -> %s:%d", pinfo->fd->num,
+                          address_to_str(&tpt_conv_data->initiator_tpt_address), tpt_conv_data->initiator_tpt_port,
                           address_to_str(&tpt_conv_data->receiver_tpt_address), tpt_conv_data->receiver_tpt_port); */
-                          
+
                 if (ADDRESSES_EQUAL(&pinfo->src, &tpt_conv_data->initiator_tpt_address)
                     && tpt_conv_data->initiator_tpt_port == pinfo->srcport) {
-                    /* g_message("%d From initiator : %s -> %s ", pinfo->fd->num, 
+                    /* g_message("%d From initiator : %s -> %s ", pinfo->fd->num,
                               address_to_str(&tpt_conv_data->initiator_address),
                               address_to_str(&tpt_conv_data->receiver_address)); */
                     pinfo->src = tpt_conv_data->initiator_address;
@@ -885,7 +885,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
                     pinfo->ptype = PT_NONE;
                 } else if (ADDRESSES_EQUAL(&pinfo->src, &tpt_conv_data->receiver_tpt_address) &&
                            tpt_conv_data->receiver_tpt_port == pinfo->srcport) {
-                    /* g_message("%d From receiver : %s -> %s ", pinfo->fd->num, 
+                    /* g_message("%d From receiver : %s -> %s ", pinfo->fd->num,
                               address_to_str(&tpt_conv_data->receiver_address),
                               address_to_str(&tpt_conv_data->initiator_address)); */
                     pinfo->src = tpt_conv_data->receiver_address;
@@ -894,14 +894,14 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
                     pinfo->destport = 0;
                     pinfo->ptype = PT_NONE;
                 } else {
-                    /* g_message("%d Nothing matches %s:%d -> %s:%d", pinfo->fd->num, 
+                    /* g_message("%d Nothing matches %s:%d -> %s:%d", pinfo->fd->num,
                               address_to_str(&pinfo->src), pinfo->srcport,
                               address_to_str(&pinfo->dst), pinfo->destport); */
                 }
             }
-            
+
             processed = headers_len;
-            
+
             processed += dissect_media(content_type, jxta_message_tvb, pinfo, tree);
         } else {
             /* we need more bytes before we can process message body. */
@@ -1393,19 +1393,19 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     gint needed = 0;
     gchar* src_addr;
     gchar* dst_addr;
-    
+
     while (TRUE) {
         guint8 message_version;
         guint message_start_offset = offset;
 
         /* First pass. Make sure all of the bytes we need are available */
         available = tvb_reported_length_remaining(tvb, offset);
-        
+
         if((0 == available) && (0 != complete_messages)) {
-            // We have discovered all of the complete messages in the tvbuff.
+            /* We have discovered all of the complete messages in the tvbuff. */
             break;
-        }        
-        
+        }
+
         if (available < sizeof(JXTA_MSG_SIG)) {
             needed = (gint) (sizeof(JXTA_MSG_SIG) - available);
             break;
@@ -1527,7 +1527,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree
         }
 
         complete_messages++;
-        
+
         /* g_message( "%d Scanned message #%d: ", pinfo->fd->num, complete_messages ); */
     }
 
@@ -1537,7 +1537,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree
         pinfo->desegment_len = needed;
         return -needed;
     }
-    
+
     src_addr = address_to_str(&pinfo->src);
     dst_addr = address_to_str(&pinfo->dst);
 
@@ -1669,13 +1669,13 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree
                 return 0;
             }
        }
-       
+
        proto_item_set_end(jxta_msg_tree_item, tvb, tree_offset);
 
        complete_messages--;
     }
-    
-    if( tree ) {              
+
+    if( tree ) {
         /* g_message( "%d tvb offset : %d  tree offset : %d", pinfo->fd->num, offset, tree_offset ); */
         DISSECTOR_ASSERT(tree_offset == offset);
     }
@@ -1914,7 +1914,7 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p
         element_content_tvb = tvb_new_subset(tvb, tree_offset, content_len, content_len);
 
         tree_offset += dissect_media(mediatype, element_content_tvb, pinfo, jxta_elem_tree);
-        
+
         /* process the signature element */
         if ((flags & JXTAMSG1_ELMFLAG_SIGNATURE) != 0) {
             tvbuff_t *jxta_message_element_tvb = tvb_new_subset(tvb, tree_offset, -1, -1);
@@ -2245,7 +2245,7 @@ static int dissect_jxta_message_element_2(tvbuff_t * tvb, packet_info * pinfo, p
 *   @param  pinfo Packet Info.
 *   @param  tree The protocol tree.
 *   @return Number of bytes from the tvbuff_t which were processed, 0 (zero) if
-*           the packet was not recognized and negative if the dissector needs 
+*           the packet was not recognized and negative if the dissector needs
 *           more bytes in order to process a PDU.
 **/
 static int dissect_media( const gchar* fullmediatype, tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) {
@@ -2296,13 +2296,13 @@ static int dissect_media( const gchar* fullmediatype, tvbuff_t * tvb, packet_inf
                 dissected = dissect_media("text/xml;charset=\"UTF-8\"", uncomp_tvb, pinfo, tree);
 
                 if( dissected > 0 ) {
-                    // report back the uncompressed length.
+                    /* report back the uncompressed length. */
                     dissected = tvb_length(tvb);
                 }
             }
         } else {
             dissected = dissector_try_string(media_type_dissector_table, mediatype, tvb, pinfo, tree) ? tvb_length(tvb) : 0;
-            
+
             if( dissected != (int) tvb_length(tvb) ) {
                 /* g_message( "%s : %d expected, %d dissected", mediatype, tvb_length(tvb), dissected ); */
             }
@@ -2314,7 +2314,7 @@ static int dissect_media( const gchar* fullmediatype, tvbuff_t * tvb, packet_inf
 
         pinfo->match_string = save_match_string;
         pinfo->private_data = save_private_data;
-    } 
+    }
 
     if(0 == dissected) {
         /* display it as raw data */
@@ -2397,7 +2397,7 @@ void proto_reg_handoff_jxta(void)
 
         init_done = TRUE;
         }
-        
+
     if( gMSG_MEDIA ) {
         if( !msg_media_register_done ) {
             /* g_message( "Registering JXTA Message media type" ); */
@@ -2415,41 +2415,41 @@ void proto_reg_handoff_jxta(void)
     if( gUDP_HEUR ) {
         if( !udp_register_done ) {
             /* g_message( "Registering UDP Heuristic dissector" ); */
-            heur_dissector_add("udp", dissect_jxta_UDP_heur, proto_jxta);        
+            heur_dissector_add("udp", dissect_jxta_UDP_heur, proto_jxta);
             udp_register_done = TRUE;
             }
     } else {
         if( udp_register_done ) {
             /* g_message( "Deregistering UDP Heuristic dissector" ); */
-            heur_dissector_delete("udp", dissect_jxta_UDP_heur, proto_jxta);        
+            heur_dissector_delete("udp", dissect_jxta_UDP_heur, proto_jxta);
             udp_register_done = FALSE;
             }
     }
-    
+
     if( gTCP_HEUR ) {
         if( !tcp_register_done ) {
             /* g_message( "Registering TCP Heuristic dissector" ); */
-            heur_dissector_add("tcp", dissect_jxta_TCP_heur, proto_jxta);        
+            heur_dissector_add("tcp", dissect_jxta_TCP_heur, proto_jxta);
             tcp_register_done = TRUE;
             }
     } else {
         if( tcp_register_done ) {
             /* g_message( "Deregistering TCP Heuristic dissector" ); */
-            heur_dissector_delete("tcp", dissect_jxta_TCP_heur, proto_jxta);        
+            heur_dissector_delete("tcp", dissect_jxta_TCP_heur, proto_jxta);
             tcp_register_done = FALSE;
             }
     }
-    
+
     if( gSCTP_HEUR ) {
         if( !sctp_register_done ) {
             /* g_message( "Registering SCTP Heuristic dissector" ); */
-            heur_dissector_add("sctp", dissect_jxta_SCTP_heur, proto_jxta);   
+            heur_dissector_add("sctp", dissect_jxta_SCTP_heur, proto_jxta);
             sctp_register_done = TRUE;
             }
     } else {
         if( sctp_register_done ) {
             /* g_message( "Deregistering SCTP Heuristic dissector" ); */
-            heur_dissector_delete("sctp", dissect_jxta_SCTP_heur, proto_jxta);        
+            heur_dissector_delete("sctp", dissect_jxta_SCTP_heur, proto_jxta);
             sctp_register_done = FALSE;
             }
     }
diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c
index ef9b4d1602..8040560202 100644
--- a/epan/dissectors/packet-wbxml.c
+++ b/epan/dissectors/packet-wbxml.c
@@ -16,7 +16,7 @@
  * Copyright 1998 Gerald Combs
  *
  * WAP Binary XML decoding functionality provided by Olivier Biot.
- * WV-CSP 1.2 updated to Release version and WV-CSP 1.3 protocol 
+ * WV-CSP 1.2 updated to Release version and WV-CSP 1.3 protocol
  * decoding functionality provided by Andrei Rubaniuk.
  *
  * The WAP specifications used to be found at the WAP Forum:
@@ -397,8 +397,8 @@ wv_integer_from_opaque(tvbuff_t *tvb, guint32 offset, guint32 data_len)
 	return str;
 }
 
-static char * 
-wv_csp10_opaque_binary_tag(tvbuff_t *tvb, guint32 offset, 
+static char *
+wv_csp10_opaque_binary_tag(tvbuff_t *tvb, guint32 offset,
 			   guint8 token, guint8 codepage, guint32 *length)
 {
 	guint32 data_len = tvb_get_guintvar(tvb, offset, length);
@@ -460,13 +460,13 @@ wv_csp10_opaque_binary_tag(tvbuff_t *tvb, guint32 offset,
 	return str;
 }
 
-static char * 
+static char *
 wv_csp10_opaque_literal_tag(tvbuff_t *tvb, guint32 offset,
 			    const char *token, guint8 codepage _U_, guint32 *length)
 {
 	guint32 data_len = tvb_get_guintvar(tvb, offset, length);
 	char *str = NULL;
-	
+
 	if ( token && ( (strcmp(token, "Code") == 0)
 			|| (strcmp(token, "ContentSize") == 0)
 			|| (strcmp(token, "MessageCount") == 0)
@@ -487,7 +487,7 @@ wv_csp10_opaque_literal_tag(tvbuff_t *tvb, guint32 offset,
 		{
 			str = wv_datetime_from_opaque(tvb, offset + *length, data_len);
 		}
-	
+
 	if (str == NULL) { /* Error, or not parsed */
 		str = g_strdup_printf("(%d bytes of unparsed opaque data)", data_len);
 	}
@@ -495,13 +495,13 @@ wv_csp10_opaque_literal_tag(tvbuff_t *tvb, guint32 offset,
 	return str;
 }
 
-static char * 
-wv_csp11_opaque_binary_tag(tvbuff_t *tvb, guint32 offset, 
+static char *
+wv_csp11_opaque_binary_tag(tvbuff_t *tvb, guint32 offset,
 			   guint8 token, guint8 codepage, guint32 *length)
 {
 	guint32 data_len = tvb_get_guintvar(tvb, offset, length);
 	char *str = NULL;
-	
+
 	switch (codepage) {
 	case 0: /* Common code page */
 		switch (token) {
@@ -563,7 +563,7 @@ wv_csp11_opaque_binary_tag(tvbuff_t *tvb, guint32 offset,
 		str = g_strdup_printf("(%d bytes of unparsed opaque data)", data_len);
 	}
 	*length += data_len;
-	
+
 	return str;
 }
 
@@ -610,7 +610,7 @@ wv_csp12_opaque_binary_tag(tvbuff_t *tvb, guint32 offset,
 {
 	guint32 data_len = tvb_get_guintvar(tvb, offset, length);
 	char *str = NULL;
-	
+
 	switch (codepage) {
 	case 0: /* Common code page */
 		switch (token) {
@@ -683,7 +683,7 @@ wv_csp12_opaque_binary_tag(tvbuff_t *tvb, guint32 offset,
 		str = g_strdup_printf("(%d bytes of unparsed opaque data)", data_len);
 	}
 	*length += data_len;
-	
+
 	return str;
 }
 
@@ -731,7 +731,7 @@ wv_csp13_opaque_binary_tag(tvbuff_t *tvb, guint32 offset,
 {
 	guint32 data_len = tvb_get_guintvar(tvb, offset, length);
 	char *str = NULL;
-	
+
 	switch (codepage)
 		{
 		case 0: /* Common code page */
@@ -752,7 +752,7 @@ wv_csp13_opaque_binary_tag(tvbuff_t *tvb, guint32 offset,
 			break;
 
 		case 1: /* Access code page */
-			switch (token) 
+			switch (token)
 				{
 				case 0x1C: /* <KeepAliveTime> */
 				case 0x25: /* <SearchFindings> */
@@ -776,12 +776,12 @@ wv_csp13_opaque_binary_tag(tvbuff_t *tvb, guint32 offset,
 				case 0x0E: /* <ServerPollMin> */
 				case 0x12: /* <TCPPort> */
 				case 0x13: /* <UDPPort> */
-					/* New in WV-CSP 1.3*/	
+					/* New in WV-CSP 1.3*/
 				case 0x16: /* <AcceptedPullLength> */
-				case 0x17: /* <AcceptedPushLength> */  
+				case 0x17: /* <AcceptedPushLength> */
 				case 0x18: /* <AcceptedRichContentLength> */
 				case 0x19: /* <AcceptedTextContentLength> */
-				case 0x1B: /* <PlainTextCharset> MIBenum number - character set, i.e. UTF-8, windows-1251, etc. */ 
+				case 0x1B: /* <PlainTextCharset> MIBenum number - character set, i.e. UTF-8, windows-1251, etc. */
 				case 0x1C: /* <SessionPriority> */
 				case 0x1F: /* <UserSessionLimit> */
 				case 0x21: /* <MultiTransPerMessage> */
@@ -794,12 +794,12 @@ wv_csp13_opaque_binary_tag(tvbuff_t *tvb, guint32 offset,
 			break;
 
 		case 5: /* Presence attribute code page */
-			switch (token) 
+			switch (token)
 				{
-					/* New in WV-CSP 1.3*/	
-					//		case 0x3B: /* <ClientContentLimit> */	
+					/* New in WV-CSP 1.3*/
+					/*		case 0x3B: */ /* <ClientContentLimit> */
 				case 0x3C: /* <ClientIMPriority> */
-				case 0x3D: /* <MaxPullLength> */ 
+				case 0x3D: /* <MaxPullLength> */
 				case 0x3E: /* <MaxPushLength> */
 					str = wv_integer_from_opaque(tvb, offset + *length, data_len);
 					break;
@@ -859,18 +859,18 @@ wv_csp13_opaque_binary_tag(tvbuff_t *tvb, guint32 offset,
 			str = g_strdup_printf("(%d bytes of unparsed opaque data)", data_len);
 		}
 	*length += data_len;
-	
+
 	return str;
 }
 
 
 static char *
-wv_csp13_opaque_literal_tag(tvbuff_t *tvb, guint32 offset, 
+wv_csp13_opaque_literal_tag(tvbuff_t *tvb, guint32 offset,
 			    const char *token, guint8 codepage _U_, guint32 *length)
 {
 	guint32 data_len = tvb_get_guintvar(tvb, offset, length);
 	char *str = NULL;
-	
+
 	if ( token && ( (strcmp(token, "Code") == 0)
 			|| (strcmp(token, "ContentSize") == 0)
 			|| (strcmp(token, "MessageCount") == 0)
@@ -891,7 +891,7 @@ wv_csp13_opaque_literal_tag(tvbuff_t *tvb, guint32 offset,
 			|| (strcmp(token, "SearchIndex") == 0)
 			|| (strcmp(token, "SearchLimit") == 0)
 			|| (strcmp(token, "AcceptedPullLength") == 0)
-			|| (strcmp(token, "AcceptedPushLength") == 0)  
+			|| (strcmp(token, "AcceptedPushLength") == 0)
 			|| (strcmp(token, "AcceptedRichContentLength") == 0)
 			|| (strcmp(token, "AcceptedTextContentLength") == 0)
 			|| (strcmp(token, "SessionPriority") == 0)
@@ -914,7 +914,7 @@ wv_csp13_opaque_literal_tag(tvbuff_t *tvb, guint32 offset,
 			{
 				str = wv_datetime_from_opaque(tvb, offset + *length, data_len);
 			}
-		
+
 	if (str == NULL) { /* Error, or not parsed */
 		str = g_strdup_printf("(%d bytes of unparsed opaque data)", data_len);
 	}
@@ -4563,7 +4563,7 @@ static const value_string wbxml_wv_csp_12_tags_cp3[] = {
 	{ 0x12, "TCPPort" },
 	{ 0x13, "UDPPort" },
 	{ 0x14, "CIRURL" },
-	
+
 	{ 0x00, NULL }
 };
 
@@ -5082,7 +5082,7 @@ static const value_string wbxml_wv_csp_13_tags_cp1[] = {
 	{ 0x06, "AllFunctionsRequest" },
 	{ 0x07, "CancelInvite-Request" },
 	{ 0x08, "CancelInviteUser-Request" },
-	//	{ 0x09, "Capability" }, - removed in WV 1.3
+	/*	{ 0x09, "Capability" }, - removed in WV 1.3*/
 	{ 0x0A, "CapabilityList" },
 	{ 0x0B, "CapabilityRequest" },
 	{ 0x0C, "ClientCapability-Request" },
@@ -5147,11 +5147,11 @@ static const value_string wbxml_wv_csp_13_tags_cp1[] = {
 static const value_string wbxml_wv_csp_13_tags_cp2[] = {
 	/* 0x00 -- 0x04 GLOBAL */
 	{ 0x05, "ADDGM" },
-	//	{ 0x06, "AttListFunc" }, removed in WV 1.3
+	/*	{ 0x06, "AttListFunc" }, removed in WV 1.3 */
 	{ 0x07, "BLENT" },
-	//	{ 0x08, "CAAUT" }, removed in WV 1.3
+	/*	{ 0x08, "CAAUT" }, removed in WV 1.3 */
 	{ 0x09, "CAINV" },
-	//	{ 0x0A, "CALI" }, removed in WV 1.3
+	/*	{ 0x0A, "CALI" }, removed in WV 1.3 */
 	{ 0x0B, "CCLI" },
 	{ 0x0C, "ContListFunc" },
 	{ 0x0D, "CREAG" },
@@ -5160,7 +5160,7 @@ static const value_string wbxml_wv_csp_13_tags_cp2[] = {
 	{ 0x10, "DELGR" },
 	{ 0x11, "FundamentalFeat" },
 	{ 0x12, "FWMSG" },
-	//	{ 0x13, "GALS" }, removed in WV 1.3
+	/*	{ 0x13, "GALS" }, removed in WV 1.3 */
 	{ 0x14, "GCLI" },
 	{ 0x15, "GETGM" },
 	{ 0x16, "GETGP" },
@@ -5189,7 +5189,7 @@ static const value_string wbxml_wv_csp_13_tags_cp2[] = {
 	{ 0x2D, "PresenceAuthFunc" },
 	{ 0x2E, "PresenceDeliverFunc"},
 	{ 0x2F, "PresenceFeat" },
-	//	{ 0x30, "REACT" }, removed in WV 1.3
+	/*	{ 0x30, "REACT" }, removed in WV 1.3 */
 	{ 0x31, "REJCM" },
 	{ 0x32, "REJEC" },
 	{ 0x33, "RMVGM" },
@@ -5229,31 +5229,31 @@ static const value_string wbxml_wv_csp_13_tags_cp3[] = {
 	{ 0x11, "TCPAddress"},
 	{ 0x12, "TCPPort"},
 	{ 0x13, "UDPPort"},
-	/* New in WV-CSP 1.3*/	
+	/* New in WV-CSP 1.3*/
 	{ 0x14, "CIRHTTPAddress"},
 	{ 0x15, "UDPAddress"},
-	{ 0x16, "AcceptedPullLength"}, 
-	{ 0x17, "AcceptedPushLength"}, 
-	{ 0x18, "AcceptedRichContentLength"}, 
-	{ 0x19, "AcceptedTextContentLength"}, 
-	{ 0x1A, "OfflineETEMHandling"}, 
-	{ 0x1B, "PlainTextCharset"}, 
-	{ 0x1C, "SessionPriority"}, 
-	{ 0x1D, "SupportedOfflineBearer"}, 	
-	{ 0x1F, "UserSessionLimit"}, 
-	{ 0x20, "CIRSMSAddress"}, 
-	{ 0x21, "MultiTransPerMessage"}, 
-	{ 0x22, "OnlineETEMHandling"}, 
-	{ 0x23,"ContentPolicy"}, 
-	{ 0x24, "ContentPolicyLimit"}, 
-	
+	{ 0x16, "AcceptedPullLength"},
+	{ 0x17, "AcceptedPushLength"},
+	{ 0x18, "AcceptedRichContentLength"},
+	{ 0x19, "AcceptedTextContentLength"},
+	{ 0x1A, "OfflineETEMHandling"},
+	{ 0x1B, "PlainTextCharset"},
+	{ 0x1C, "SessionPriority"},
+	{ 0x1D, "SupportedOfflineBearer"},
+	{ 0x1F, "UserSessionLimit"},
+	{ 0x20, "CIRSMSAddress"},
+	{ 0x21, "MultiTransPerMessage"},
+	{ 0x22, "OnlineETEMHandling"},
+	{ 0x23,"ContentPolicy"},
+	{ 0x24, "ContentPolicyLimit"},
+
 	{ 0x00, NULL }
 };
 
 /* Presence primitive code page (0x04) */
 static const value_string wbxml_wv_csp_13_tags_cp4[] = {
 	/* 0x00 -- 0x04 GLOBAL */
-	//	{ 0x05, "CancelAuth-Request" }, - removed in WV 1.3
+	/*	{ 0x05, "CancelAuth-Request" }, - removed in WV 1.3 */
 	{ 0x06, "ContactListProperties" },
 	{ 0x07, "CreateAttributeList-Request" },
 	{ 0x08, "CreateList-Request" },
@@ -5279,9 +5279,9 @@ static const value_string wbxml_wv_csp_13_tags_cp4[] = {
 	{ 0x1C, "UpdatePresence-Request" },
 	{ 0x1D, "SubscribePresence-Request" },
 	/* New in WV-CSP 1.2 */
-	//	{ 0x1E, "Auto-Subscribe" }, - removed in WV 1.3
-	//	{ 0x1F, "GetReactiveAuthStatus-Request" },
-	//	{ 0x20, "GetReactiveAuthStatus-Response" },
+	/*	{ 0x1E, "Auto-Subscribe" }, - removed in WV 1.3 */
+	/*	{ 0x1F, "GetReactiveAuthStatus-Request" }, */
+	/*	{ 0x20, "GetReactiveAuthStatus-Response" }, */
 	/* New in WV-CSP 1.3 */
 	{ 0x21, "CreateList-Response"},
 
@@ -5348,10 +5348,10 @@ static const value_string wbxml_wv_csp_13_tags_cp5[] = {
 	{ 0x39, "Link" },
 	{ 0x3A, "Text" },
 	/* New in WV-CSP 1.3 */
-	{ 0x3B, "ClientContentLimit"}, 
-	{ 0x3C, "ClientIMPriority"}, 
-	{ 0x3D, "MaxPullLength"}, 
-	{ 0x3E, "MaxPushLength"}, 
+	{ 0x3B, "ClientContentLimit"},
+	{ 0x3C, "ClientIMPriority"},
+	{ 0x3D, "MaxPullLength"},
+	{ 0x3E, "MaxPushLength"},
 
 	{ 0x00, NULL }
 };
@@ -5382,9 +5382,9 @@ static const value_string wbxml_wv_csp_13_tags_cp6[] = {
 	{ 0x19, "SetDeliveryMethod-Request" },
 	{ 0x1A, "DeliveryTime" },
 	/* New in WV-CSP 1.3 */
-	{ 0x20, "MessageInfoList"}, 
-	{ 0x21, "ForwardMessage-Response"}, 
-	
+	{ 0x20, "MessageInfoList"},
+	{ 0x21, "ForwardMessage-Response"},
+
 	{ 0x00, NULL }
 };
 
@@ -5417,7 +5417,7 @@ static const value_string wbxml_wv_csp_13_tags_cp7[] = {
 	{ 0x1C, "SetGroupProps-Request" },
 	{ 0x1D, "SubscribeGroupNotice-Request" },
 	{ 0x1E, "SubscribeGroupNotice-Response" },
-	//	{ 0x1F, "Users" },  - removed in WV 1.3
+	/*	{ 0x1F, "Users" },  - removed in WV 1.3 */
 	{ 0x20, "WelcomeNote" },
 	/* New in WV-CSP 1.1 */
 	{ 0x21, "JoinGroup" },
@@ -5433,8 +5433,8 @@ static const value_string wbxml_wv_csp_13_tags_cp7[] = {
 	{ 0x2A, "UserMapList" },
 	{ 0x2B, "UserMapping" },
 	/* New in WV-CSP 1.3 */
-	{ 0x2C, "JoinedBlocked" }, 
-	{ 0x2D, "LeftBlocked" }, 
+	{ 0x2C, "JoinedBlocked" },
+	{ 0x2D, "LeftBlocked" },
 
 	{ 0x00, NULL }
 };
@@ -5446,13 +5446,13 @@ static const value_string wbxml_wv_csp_13_tags_cp8[] = {
 	{ 0x05, "MP" },
 	{ 0x06, "GETAUT" },
 	{ 0x07, "GETJU" },
-	{ 0x08, "VRID" }, 
-	{ 0x09, "VerifyIDFunc" }, 
+	{ 0x08, "VRID" },
+	{ 0x09, "VerifyIDFunc" },
 	/* New in WV-CSP 1.3 */
- 	{ 0x0A, "GETMAP" }, 
-	{ 0x0B, "SGMNT" }, 
-	{ 0x0C, "EXCON" }, 
-	{ 0x0D, "OFFNOTIF" }, 
+ 	{ 0x0A, "GETMAP" },
+	{ 0x0B, "SGMNT" },
+	{ 0x0C, "EXCON" },
+	{ 0x0D, "OFFNOTIF" },
 	{ 0x0E, "ADVSR" },
 
 	{ 0x00, NULL }
@@ -5468,60 +5468,60 @@ static const value_string wbxml_wv_csp_13_tags_cp9[] = {
 	{ 0x08, "HistoryPeriod" },
 	{ 0x09, "IDList" },
 	{ 0x0A, "MaxWatcherList" },
-	//	{ 0x0B, "ReactiveAuthState" }, - removed in WV 1.3
-	//	{ 0x0C, "ReactiveAuthStatus" }, - removed in WV 1.3
-	//	{ 0x0D, "ReactiveAuthStatusList" }, - removed in WV 1.3
+	/*	{ 0x0B, "ReactiveAuthState" }, - removed in WV 1.3 */
+	/*	{ 0x0C, "ReactiveAuthStatus" }, - removed in WV 1.3 */
+	/*	{ 0x0D, "ReactiveAuthStatusList" }, - removed in WV 1.3 */
 	{ 0x0E, "Watcher" },
 	{ 0x0F, "WatcherStatus" },
 	/* New in WV-CSP 1.3 */
-	{ 0x1B, "AnswerOption"}, 
-	{ 0x1C, "AnswerOptionID" }, 
-	{ 0x1D, "AnswerOptions"}, 
-	{ 0x0B, "AnswerOptionText"}, 
-	{ 0x1E, "ApplicationID"}, 
-	{ 0x1F, "AuthorizeAndGrant"}, 
-	{ 0x20, "ChosenOptionID"}, 
-	{ 0x19, "ClearPublicProfile"}, 
-	{ 0x13, "Color"}, 
-	{ 0x21, "ContactListNotify"}, 
-	{ 0x14, "ContentName"}, 
-	{ 0x22, "DefaultNotify"}, 
-	{ 0x39, "ExtBlockETEM"}, 
-	{ 0x36, "ExtendConversationID"}, 
-	{ 0x23, "ExtendConversationUser"}, 
-	{ 0x10, "Font"}, 
-	{ 0x18, "FriendlyName"}, 
-	{ 0x34 , "GetMap-Request"}, 
-	{ 0x35, "GetMap-Response"}, 
-	{ 0x3A, "GroupContentLimit" }, 
-	{ 0x24, "InText"}, 
-	{ 0x15, "Map"}, 
-	{ 0x3B, "MessageTotalCount"}, 
-	{ 0x16, "NotificationType"}, 
-	{ 0x17, "NotificationTypeList"}, 
-	{ 0x1A, "PublicProfile"}, 
-	{ 0x38, "RequiresResponse"}, 
-	{ 0x25, "SegmentCount"}, 
-	{ 0x26, "SegmentID"	}, 
-	{ 0x27, "SegmentInfo"}, 
-	{ 0x28, "SegmentReference"}, 
-	{ 0x11, "Size"}, 
-	{ 0x12, "Style"	}, 
-	{ 0x29, "SystemMessage"}, 
-	{ 0x2A, "SystemMessageID"}, 
-	{ 0x2B, "SystemMessageList"}, 
-	{ 0x2C, "SystemMessageResponse"}, 
-	{ 0x2D, "SystemMessageResponseList" }, 
-	{ 0x2F, "SystemMessageText"}, 
-	{ 0x30, "TryAgainTimeout"}, 
-	{ 0x3C, "UnrecognizedUserID"}, 
-	{ 0x3F , "UserIDList"}, 
-	{ 0x3D, "UserIDPair"}, 
-	{ 0x31, "UserNotify"}, 
-	{ 0x3E, "ValidUserID"}, 
-	{ 0x32, "VerificationKey"}, 
-	{ 0x33, "VerificationMechanism"}, 
-	{ 0x37, "WatcherCount"}, 
+	{ 0x1B, "AnswerOption"},
+	{ 0x1C, "AnswerOptionID" },
+	{ 0x1D, "AnswerOptions"},
+	{ 0x0B, "AnswerOptionText"},
+	{ 0x1E, "ApplicationID"},
+	{ 0x1F, "AuthorizeAndGrant"},
+	{ 0x20, "ChosenOptionID"},
+	{ 0x19, "ClearPublicProfile"},
+	{ 0x13, "Color"},
+	{ 0x21, "ContactListNotify"},
+	{ 0x14, "ContentName"},
+	{ 0x22, "DefaultNotify"},
+	{ 0x39, "ExtBlockETEM"},
+	{ 0x36, "ExtendConversationID"},
+	{ 0x23, "ExtendConversationUser"},
+	{ 0x10, "Font"},
+	{ 0x18, "FriendlyName"},
+	{ 0x34 , "GetMap-Request"},
+	{ 0x35, "GetMap-Response"},
+	{ 0x3A, "GroupContentLimit" },
+	{ 0x24, "InText"},
+	{ 0x15, "Map"},
+	{ 0x3B, "MessageTotalCount"},
+	{ 0x16, "NotificationType"},
+	{ 0x17, "NotificationTypeList"},
+	{ 0x1A, "PublicProfile"},
+	{ 0x38, "RequiresResponse"},
+	{ 0x25, "SegmentCount"},
+	{ 0x26, "SegmentID"	},
+	{ 0x27, "SegmentInfo"},
+	{ 0x28, "SegmentReference"},
+	{ 0x11, "Size"},
+	{ 0x12, "Style"	},
+	{ 0x29, "SystemMessage"},
+	{ 0x2A, "SystemMessageID"},
+	{ 0x2B, "SystemMessageList"},
+	{ 0x2C, "SystemMessageResponse"},
+	{ 0x2D, "SystemMessageResponseList" },
+	{ 0x2F, "SystemMessageText"},
+	{ 0x30, "TryAgainTimeout"},
+	{ 0x3C, "UnrecognizedUserID"},
+	{ 0x3F , "UserIDList"},
+	{ 0x3D, "UserIDPair"},
+	{ 0x31, "UserNotify"},
+	{ 0x3E, "ValidUserID"},
+	{ 0x32, "VerificationKey"},
+	{ 0x33, "VerificationMechanism"},
+	{ 0x37, "WatcherCount"},
 
 	{ 0x00, NULL }
 };
@@ -5534,24 +5534,24 @@ static const value_string wbxml_wv_csp_13_tags_cp10[] = {
 	{ 0x06, "WV-CSP-NSDiscovery-Response" },
 	{ 0x07, "VersionList"},
 	/* New in WV-CSP 1.3 */
-	{ 0x08, "SubscribeNotification-Request" }, 
-	{ 0x09, "UnsubscribeNotification-Request" }, 
-	{ 0x0A, "Notification-Request" }, 
-	{ 0x0B, "AdvancedCriteria" }, 
-	{ 0x0C, "PairID" }, 
-	{ 0x0D, "GetPublicProfile-Request" }, 
-	{ 0x0E, "GetPublicProfile-Response" }, 
-	{ 0x0F, "UpdatePublicProfile-Request" }, 
-	{ 0x10, "DropSegment-Request" }, 
-	{ 0x11, "ExtendConversation-Response" }, 
-	{ 0x12, "ExtendConversation-Request" }, 
-	{ 0x13, "GetSegment-Request" }, 
-	{ 0x14, "GetSegment-Response" }, 
-	{ 0x15, "SystemMessage-Request" }, 
-	{ 0x16, "SystemMessage-User" }, 
-	{ 0x17, "SearchPair" }, 
-	{ 0x18, "SegmentContent" }, 
-	
+	{ 0x08, "SubscribeNotification-Request" },
+	{ 0x09, "UnsubscribeNotification-Request" },
+	{ 0x0A, "Notification-Request" },
+	{ 0x0B, "AdvancedCriteria" },
+	{ 0x0C, "PairID" },
+	{ 0x0D, "GetPublicProfile-Request" },
+	{ 0x0E, "GetPublicProfile-Response" },
+	{ 0x0F, "UpdatePublicProfile-Request" },
+	{ 0x10, "DropSegment-Request" },
+	{ 0x11, "ExtendConversation-Response" },
+	{ 0x12, "ExtendConversation-Request" },
+	{ 0x13, "GetSegment-Request" },
+	{ 0x14, "GetSegment-Response" },
+	{ 0x15, "SystemMessage-Request" },
+	{ 0x16, "SystemMessage-User" },
+	{ 0x17, "SearchPair" },
+	{ 0x18, "SegmentContent" },
+
 	{ 0x00, NULL }
 };
 
@@ -5559,11 +5559,11 @@ static const value_string wbxml_wv_csp_13_tags_cp10[] = {
 static const value_string wbxml_wv_csp_13_tags_cp11[] = {
 	/* 0x00 -- 0x04 GLOBAL */
 	/* New in WV-CSP 1.3 */
-	{ 0x05, "GrantListInUse" }, 
-	{ 0x06, "BlockListInUse" }, 
-	{ 0x07, "ContactListIDList" }, 
-	{ 0x08, "AnswerOptionsText" }, 
-	
+	{ 0x05, "GrantListInUse" },
+	{ 0x06, "BlockListInUse" },
+	{ 0x07, "ContactListIDList" },
+	{ 0x08, "AnswerOptionsText" },
+
 	{ 0x00, NULL }
 };
 
@@ -5583,7 +5583,7 @@ static const value_string wbxml_wv_csp_13_attrStart_cp0[] = {
 	{ 0x0B, "xmlns='http://www.openmobilealliance.org/DTD/IMPS-CSP'" },
 	{ 0x0C, "xmlns='http://www.openmobilealliance.org/DTD/IMPS-PA'" },
 	{ 0x0D, "xmlns='http://www.openmobilealliance.org/DTD/IMPS-TRC'" },
-	
+
 	{ 0x00, NULL }
 };
 
@@ -5736,7 +5736,7 @@ static const value_string vals_wv_csp_13_element_value_tokens[] = {
 	{ 0x4C, "USER_ONLINE_STATUS" },
 	{ 0x4D, "WAPSMS" },
 	{ 0x4E, "WAPUDP" },
-	{ 0x4F, "WSP" },	
+	{ 0x4F, "WSP" },
 	{ 0x50, "GROUP_USER_ID_AUTOJOIN" },
 	/*
 	 * Presence value tokens
@@ -5792,7 +5792,7 @@ static const value_string vals_wv_csp_13_element_value_tokens[] = {
 	{ 0xB7, "PP_MARITAL_STATUS" },
 	{ 0xB8, "USER_AGE_MAX" },
 	{ 0xB9, "USER_AGE_MIN" },
-	
+
 	{ 0x00, NULL }
 };
 
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index 410be3153e..c0b18b6707 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -1502,7 +1502,7 @@ pnio_ar_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pnio_ar_t *ar)
 
 	if (tree) {
 		sub_item = proto_tree_add_text(tree, tvb, 0, 0, "ARUUID:%s ContrMAC:%s ContrAlRef:0x%x DevMAC:%s DevAlRef:0x%x InCR:0x%x OutCR=0x%x",
-            guid_to_str((const e_guid_t*) &ar->aruuid), 
+            guid_to_str((const e_guid_t*) &ar->aruuid),
             ether_to_str((const guint8 *)ar->controllermac), ar->controlleralarmref,
             ether_to_str((const guint8 *)ar->devicemac), ar->devicealarmref,
             ar->inputframeid, ar->outputframeid);
@@ -1511,7 +1511,7 @@ pnio_ar_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pnio_ar_t *ar)
 
 	    item = proto_tree_add_guid(sub_tree, hf_pn_io_ar_uuid, tvb, 0, 0, (e_guid_t *) &ar->aruuid);
         PROTO_ITEM_SET_GENERATED(item);
-        
+
 	    item = proto_tree_add_ether(sub_tree, hf_pn_io_cminitiator_macadd, tvb, 0, 0, ar->controllermac);
         PROTO_ITEM_SET_GENERATED(item);
 	    item = proto_tree_add_uint(sub_tree, hf_pn_io_localalarmref, tvb, 0, 0, ar->controlleralarmref);
@@ -1873,7 +1873,7 @@ dissect_AlarmNotification_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -1928,7 +1928,7 @@ dissect_IandM0_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -1999,7 +1999,7 @@ dissect_IandM1_block(tvbuff_t *tvb, int offset,
     char *pTagLocation;
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2031,7 +2031,7 @@ dissect_IandM2_block(tvbuff_t *tvb, int offset,
     char *pDate;
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2056,7 +2056,7 @@ dissect_IandM3_block(tvbuff_t *tvb, int offset,
     char *pDescriptor;
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2080,7 +2080,7 @@ dissect_IandM4_block(tvbuff_t *tvb, int offset,
 {
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2111,7 +2111,7 @@ dissect_IandM0FilterData_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2191,7 +2191,7 @@ dissect_IdentificationData_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || (u8BlockVersionLow != 0 && u8BlockVersionLow != 1)) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2267,7 +2267,7 @@ dissect_SubstituteValue_block(tvbuff_t *tvb, int offset,
     guint16 u16SubstitutionMode;
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2299,7 +2299,7 @@ dissect_RecordInputDataObjectElement_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2339,7 +2339,7 @@ dissect_RecordOutputDataObjectElement_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2377,7 +2377,7 @@ dissect_Alarm_ack_block(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow)
 {
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2406,7 +2406,7 @@ dissect_Maintenance_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2484,7 +2484,7 @@ dissect_IODWriteReqHeader_block(tvbuff_t *tvb, int offset,
     e_uuid_t null_uuid;
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2527,7 +2527,7 @@ dissect_IODReadReqHeader_block(tvbuff_t *tvb, int offset,
     e_uuid_t null_uuid;
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2574,7 +2574,7 @@ dissect_IODWriteResHeader_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2626,7 +2626,7 @@ dissect_IODReadResHeader_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2675,7 +2675,7 @@ dissect_ControlConnect_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2764,7 +2764,7 @@ dissect_PDevData_block(tvbuff_t *tvb, int offset,
 {
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2789,7 +2789,7 @@ dissect_PDPortData_Check_Adjust_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2842,7 +2842,7 @@ dissect_PDPortDataReal_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2950,7 +2950,7 @@ dissect_PDInterfaceMrpDataAdjust_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -2998,7 +2998,7 @@ dissect_PDInterfaceMrpDataReal_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3045,7 +3045,7 @@ dissect_PDInterfaceMrpDataCheck_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3074,7 +3074,7 @@ dissect_PDPortMrpData_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3101,7 +3101,7 @@ dissect_MrpManagerParams_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3166,7 +3166,7 @@ dissect_MrpRTModeManagerData_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3195,7 +3195,7 @@ dissect_MrpRingStateData_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3216,7 +3216,7 @@ dissect_MrpRTStateData_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3239,7 +3239,7 @@ dissect_MrpClientParams_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3265,7 +3265,7 @@ dissect_MrpRTModeClientData_block(tvbuff_t *tvb, int offset,
     offset = dissect_pn_align4(tvb, offset, pinfo, tree);
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3287,7 +3287,7 @@ dissect_CheckSyncDifference_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3320,7 +3320,7 @@ dissect_CheckMAUTypeDifference_block(tvbuff_t *tvb, int offset,
     guint16 u16MAUTypeMode;
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3347,7 +3347,7 @@ dissect_AdjustDomainBoundary_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || (u8BlockVersionLow != 0 && u8BlockVersionLow != 1)) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3388,7 +3388,7 @@ dissect_AdjustDomainBoundary_block(tvbuff_t *tvb, int offset,
 
 		break;
 		default:
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3407,7 +3407,7 @@ dissect_AdjustMulticastBoundary_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3438,7 +3438,7 @@ dissect_AdjustMAUType_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3469,7 +3469,7 @@ dissect_CheckMAUType_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3494,7 +3494,7 @@ dissect_CheckLineDelay_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3525,7 +3525,7 @@ dissect_CheckPeers_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3573,7 +3573,7 @@ dissect_AdjustPortState_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3604,7 +3604,7 @@ dissect_CheckPortState_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3633,7 +3633,7 @@ dissect_PDPortFODataReal_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3670,7 +3670,7 @@ dissect_FiberOpticManufacturerSpecific_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3702,7 +3702,7 @@ dissect_PDPortFODataAdjust_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3735,7 +3735,7 @@ dissect_PDPortFODataCheck_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3773,7 +3773,7 @@ dissect_PDNCDataCheck_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3814,7 +3814,7 @@ dissect_PDInterfaceDataReal_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3880,7 +3880,7 @@ dissect_PDSyncData_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -3985,7 +3985,7 @@ dissect_PDSyncData_block(tvbuff_t *tvb, int offset,
             u32PLLWindow, u32SyncSendFactor, u16SendClockFactor);
 		break;
 	default:
-		expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+		expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
     }
 
@@ -4006,7 +4006,7 @@ dissect_PDIRData_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -4046,7 +4046,7 @@ dissect_PDIRGlobalData_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || (u8BlockVersionLow != 0 && u8BlockVersionLow != 1)) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -4101,7 +4101,7 @@ dissect_PDIRFrameData_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -4113,11 +4113,11 @@ dissect_PDIRFrameData_block(tvbuff_t *tvb, int offset,
     /* dissect all IR frame data */
     while (offset < u16EndOffset)
     {
-    
+
      /* new subtree for each IR frame */
       ir_frame_data_sub_item = proto_tree_add_item(tree, hf_pn_io_ir_frame_data, tvb, offset, 17, FALSE);
       ir_frame_data_tree = proto_item_add_subtree(ir_frame_data_sub_item, ett_pn_io_ir_frame_data);
- 
+
       /* FrameSendOffset */
 	    offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ir_frame_data_tree, drep,
                                      hf_pn_io_frame_send_offset, &u32FrameSendOffset);
@@ -4133,7 +4133,7 @@ dissect_PDIRFrameData_block(tvbuff_t *tvb, int offset,
       /* FrameID */
 	    offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ir_frame_data_tree, drep,
                                      hf_pn_io_frame_id, &u16FrameID);
- 
+
       /* Ethertype */
     	offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ir_frame_data_tree, drep,
                                      hf_pn_io_ethertype, &u16Ethertype);
@@ -4146,13 +4146,13 @@ dissect_PDIRFrameData_block(tvbuff_t *tvb, int offset,
       /* TxPortGroup */
 	    offset = dissect_dcerpc_uint8(tvb, offset, pinfo, ir_frame_data_tree, drep,
                                     hf_pn_io_nr_of_tx_port_groups, &u8NumberOfTxPortGroups);
- 
+
       /* align to next dataset */
-      offset = dissect_pn_align4(tvb, offset, pinfo, ir_frame_data_tree); 
+      offset = dissect_pn_align4(tvb, offset, pinfo, ir_frame_data_tree);
 
       proto_item_append_text(ir_frame_data_tree, ": Offset:%u, Len:%u, Ratio:%u, Phase:%u, FrameID:0x%04x",
                              u32FrameSendOffset, u16DataLength, u16ReductionRatio, u16Phase, u16FrameID);
-                             
+
     }
 
     return offset;
@@ -4173,7 +4173,7 @@ dissect_DiagnosisData_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || (u8BlockVersionLow != 0 && u8BlockVersionLow != 1)) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -4305,7 +4305,7 @@ dissect_ARData_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -4436,7 +4436,7 @@ dissect_APIData_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -4468,7 +4468,7 @@ dissect_LogData_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -4510,7 +4510,7 @@ dissect_FSHello_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -4548,7 +4548,7 @@ dissect_FSParameter_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -4581,7 +4581,7 @@ dissect_PDInterfaceFSUDataAdjust_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -4610,7 +4610,7 @@ dissect_ARFSUDataAdjust_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -4647,7 +4647,7 @@ dissect_ARBlockReq_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -4692,7 +4692,7 @@ dissect_ARBlockReq_block(tvbuff_t *tvb, int offset,
         memcpy( (void *) (&par->controllermac), mac, sizeof(par->controllermac));
         /*strncpy( (char *) (&par->controllername), pStationName, sizeof(par->controllername));*/
     } else {
-        //expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "ARBlockReq: AR already existing!");
+        /*expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "ARBlockReq: AR already existing!");*/
     }
     *ar = par;
 
@@ -4715,7 +4715,7 @@ dissect_ARBlockRes_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -4787,7 +4787,7 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -4901,7 +4901,7 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset,
         switch(u16IOCRType) {
         case(1): /* Input CR */
             if(ar->inputframeid != 0 && ar->inputframeid != u16FrameID) {
-                expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "IOCRBlockReq: input frameID changed from %u to %u!", 
+                expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "IOCRBlockReq: input frameID changed from %u to %u!",
                     ar->inputframeid, u16FrameID);
             }
             ar->inputframeid = u16FrameID;
@@ -4910,7 +4910,7 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset,
 #if 0
             /* will usually contain invalid marker 0xffff here */
             if(ar->outputframeid != 0 && ar->outputframeid != u16FrameID) {
-                expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "IOCRBlockReq: output frameID changed from %u to %u!", 
+                expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "IOCRBlockReq: output frameID changed from %u to %u!",
                     ar->outputframeid, u16FrameID);
             }
             ar->outputframeid = u16FrameID;
@@ -4947,7 +4947,7 @@ dissect_AlarmCRBlockReq_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -4986,7 +4986,7 @@ dissect_AlarmCRBlockReq_block(tvbuff_t *tvb, int offset,
 
     if(ar != NULL) {
         if(ar->controlleralarmref != 0xffff && ar->controlleralarmref != u16LocalAlarmReference) {
-            expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "AlarmCRBlockReq: local alarm ref changed from %u to %u!", 
+            expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "AlarmCRBlockReq: local alarm ref changed from %u to %u!",
                 ar->controlleralarmref, u16LocalAlarmReference);
         }
         ar->controlleralarmref = u16LocalAlarmReference;
@@ -5010,7 +5010,7 @@ dissect_AlarmCRBlockRes_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -5028,7 +5028,7 @@ dissect_AlarmCRBlockRes_block(tvbuff_t *tvb, int offset,
 
     if(ar != NULL) {
         if(ar->devicealarmref != 0xffff && ar->devicealarmref != u16LocalAlarmReference) {
-            expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "AlarmCRBlockRes: local alarm ref changed from %u to %u!", 
+            expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "AlarmCRBlockRes: local alarm ref changed from %u to %u!",
                 ar->devicealarmref, u16LocalAlarmReference);
         }
         ar->devicealarmref = u16LocalAlarmReference;
@@ -5054,7 +5054,7 @@ dissect_IOCRBlockRes_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -5074,14 +5074,14 @@ dissect_IOCRBlockRes_block(tvbuff_t *tvb, int offset,
         switch(u16IOCRType) {
         case(1): /* Input CR */
             if(ar->inputframeid != 0 && ar->inputframeid != u16FrameID) {
-                expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "IOCRBlockRes: input frameID changed from %u to %u!", 
+                expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "IOCRBlockRes: input frameID changed from %u to %u!",
                     ar->inputframeid, u16FrameID);
             }
             ar->inputframeid = u16FrameID;
             break;
         case(2): /* Output CR */
             if(ar->outputframeid != 0 && ar->outputframeid != u16FrameID) {
-                expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "IOCRBlockRes: output frameID changed from %u to %u!", 
+                expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "IOCRBlockRes: output frameID changed from %u to %u!",
                     ar->outputframeid, u16FrameID);
             }
             ar->outputframeid = u16FrameID;
@@ -5111,7 +5111,7 @@ dissect_MCRBlockReq_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -5205,7 +5205,7 @@ dissect_ExpectedSubmoduleBlockReq_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -5325,7 +5325,7 @@ dissect_ModuleDiffBlock_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -5446,7 +5446,7 @@ dissect_IsochronousModeData_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -5497,7 +5497,7 @@ dissect_MultipleBlockHeader_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -5557,7 +5557,7 @@ dissect_RecordDataReadQuery_block(tvbuff_t *tvb, int offset,
 
 
 	if(u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
-        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, 
+        expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN,
 			"Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow);
         return offset;
 	}
@@ -5638,11 +5638,11 @@ dissect_block(tvbuff_t *tvb, int offset,
 			u16BodyLength);
         break;
     case(0x0008):
-        dissect_IODWriteReqHeader_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow, 
+        dissect_IODWriteReqHeader_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow,
 			u16Index, u32RecDataLen, ar);
         break;
     case(0x0009):
-        dissect_IODReadReqHeader_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow, 
+        dissect_IODReadReqHeader_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow,
 			u16Index, u32RecDataLen, ar);
         break;
     case(0x0010):
diff --git a/plugins/wimax/mac_hd_type1_decoder.c b/plugins/wimax/mac_hd_type1_decoder.c
index c18733d926..631bed6976 100644
--- a/plugins/wimax/mac_hd_type1_decoder.c
+++ b/plugins/wimax/mac_hd_type1_decoder.c
@@ -73,7 +73,7 @@ enum
 	TYPE_I_SUBTYPE_MAX
 } TYPE_I_SUBTYPE;
 
-static char *type1_subtype_abbrv[TYPE_I_SUBTYPE_MAX] = 
+static char *type1_subtype_abbrv[TYPE_I_SUBTYPE_MAX] =
 {
 	"BR INCREMENTAL",            /* 0 */
 	"BR AGGREGATE",              /* 1 */
@@ -125,8 +125,9 @@ static char *type1_subtype_abbrv[TYPE_I_SUBTYPE_MAX] =
 #define WIMAX_MAC_HEADER_TYPE_1_PERIOD       0x007000
 #define WIMAX_MAC_HEADER_TYPE_1_RSV_7        0x000FFF
 /* 4th to 6th bytes */
-//#define WIMAX_MAC_HEADER_TYPE_1_CID          0xFFFF
-//#define WIMAX_MAC_HEADER_TYPE_1_HCS          0xFF
+/*#define WIMAX_MAC_HEADER_TYPE_1_CID          0xFFFF
+*#define WIMAX_MAC_HEADER_TYPE_1_HCS          0xFF
+*/
 /* Common Fields */
 static int hf_mac_header_type_1_ht = -1;
 static int hf_mac_header_type_1_ec = -1;
diff --git a/plugins/wimax/mac_hd_type2_decoder.c b/plugins/wimax/mac_hd_type2_decoder.c
index 37e2622e81..aba10dbb4f 100644
--- a/plugins/wimax/mac_hd_type2_decoder.c
+++ b/plugins/wimax/mac_hd_type2_decoder.c
@@ -85,7 +85,7 @@ enum
 	TYPE_II_FB_TYPE_MAX
 } TYPE_II_FB_TYPE;
 
-static char *type2_fb_type_abbrv[TYPE_II_FB_TYPE_MAX] = 
+static char *type2_fb_type_abbrv[TYPE_II_FB_TYPE_MAX] =
 {
 	"CQI and MIMO Feedback",
 	"DL average CINR",
@@ -128,7 +128,7 @@ static int hf_mac_header_type_2_cqi_fb_type = -1;
 static int hf_mac_header_type_2_cqi_payload = -1;
 static int hf_mac_header_type_2_cqi_rsv = -1;
 /* 4th & 5th without CID */
-//#define WIMAX_MAC_HEADER_TYPE_2_NO_CID       0xFFFF
+/*#define WIMAX_MAC_HEADER_TYPE_2_NO_CID       0xFFFF*/
 
 /* DL average CINR */
 /* 2nd byte */
@@ -257,9 +257,9 @@ static int hf_mac_header_type_2_mimo_cqi = -1;
 
 /* CINR Feedback */
 /* 2nd byte */
-//#define WIMAX_MAC_HEADER_TYPE_2_CINR_MEAN    0xFF
+/*#define WIMAX_MAC_HEADER_TYPE_2_CINR_MEAN    0xFF*/
 /* 3rd byte */
-//#define WIMAX_MAC_HEADER_TYPE_2_CINR_DEVI    0xFF
+/*#define WIMAX_MAC_HEADER_TYPE_2_CINR_DEVI    0xFF*/
 static int hf_mac_header_type_2_cinr_mean = -1;
 static int hf_mac_header_type_2_cinr_devi = -1;
 
@@ -289,7 +289,7 @@ static int hf_mac_header_type_2_cl_mimo_ant_sel = -1;
 static int hf_mac_header_type_2_cl_mimo_codebook_id = -1;
 
 /* last byte */
-//#define WIMAX_MAC_HEADER_TYPE_2_HCS          0xFF
+/*#define WIMAX_MAC_HEADER_TYPE_2_HCS          0xFF*/
 static int hf_mac_header_type_2_hcs = -1;
 
 /* CID Inclusion Indication messages */
diff --git a/plugins/wimax/msg_rep.c b/plugins/wimax/msg_rep.c
index c033703087..a92bdf8d7e 100644
--- a/plugins/wimax/msg_rep.c
+++ b/plugins/wimax/msg_rep.c
@@ -27,7 +27,7 @@
  */
 
 /*
-#define DEBUG	// for debug only
+#define DEBUG	/* for debug only*/
 */
 
 /* Include files */
@@ -277,350 +277,350 @@ static hf_register_info hf_rep[] =
 	{
 		&hf_rep_invalid_tlv,
 		{
-			"Invalid TLV", "wimax.rep.invalid_tlv", 
+			"Invalid TLV", "wimax.rep.invalid_tlv",
 			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_message_type,
 		{
-			"MAC Management Message Type", "wimax.macmgtmsgtype.rep_req", 
+			"MAC Management Message Type", "wimax.macmgtmsgtype.rep_req",
 			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* type 1.2 */
 		&hf_rep_req_channel_number,
 		{
-			"Channel Number", "wimax.rep_req.channel_number", 
+			"Channel Number", "wimax.rep_req.channel_number",
 			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* type 1.8 */
 		&hf_rep_req_channel_selectivity_report,
 		{
-			"Channel Selectivity Report", "wimax.rep_req.channel_selectivity_report", 
+			"Channel Selectivity Report", "wimax.rep_req.channel_selectivity_report",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_channel_selectivity_rep_bit0,
 		{
-			"Include Frequency Selectivity Report", "wimax.rep_req.channel_selectivity_report.bit0", 
+			"Include Frequency Selectivity Report", "wimax.rep_req.channel_selectivity_report.bit0",
 			FT_BOOLEAN, 8, NULL, REP_REQ_CHANNEL_SELECTIVITY_REPORT_BIT0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_channel_selectivity_rep_bit1_7,
 		{
-			"Reserved", "wimax.rep_req.channel_selectivity_report.bit1_7", 
+			"Reserved", "wimax.rep_req.channel_selectivity_report.bit1_7",
 			FT_UINT8, BASE_HEX, NULL, REP_REQ_CHANNEL_SELECTIVITY_REPORT_BIT1_7, "", HFILL
 		}
 	},
 	{	/* type 1.3 */
 		&hf_rep_req_channel_type_request,
 		{
-			"Channel Type Request", "wimax.rep_req.channel_type.request", 
+			"Channel Type Request", "wimax.rep_req.channel_type.request",
 			FT_UINT8, BASE_DEC, VALS(vals_channel_types), 0x03, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_channel_type_reserved,
 		{
-			"Reserved", "wimax.rep_req.channel_type.reserved", 
+			"Reserved", "wimax.rep_req.channel_type.reserved",
 			FT_UINT8, BASE_HEX, NULL, 0xFC, "", HFILL
 		}
 	},
 	{	/* type 1.7 */
 		&hf_rep_req_preamble_effective_cinr_request,
 		{
-			"Preamble Effective CINR Request", "wimax.rep_req.preamble_effective_cinr_request", 
+			"Preamble Effective CINR Request", "wimax.rep_req.preamble_effective_cinr_request",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_preamble_effective_cinr_req_bit0_1,
 		{
-			"Type Of Preamble Physical CINR Measurement", "wimax.rep_req.preamble_effective_cinr_request.bit0_1", 
+			"Type Of Preamble Physical CINR Measurement", "wimax.rep_req.preamble_effective_cinr_request.bit0_1",
 			FT_UINT8, BASE_DEC, VALS(vals_type_of_measurements), REP_REQ_PREAMBLE_EFFECTIVE_CINR_REQUEST_BIT0_1, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_preamble_effective_cinr_req_bit2_7,
 		{
-			"Reserved", "wimax.rep_req.preamble_effective_cinr_request.bit2_7", 
+			"Reserved", "wimax.rep_req.preamble_effective_cinr_request.bit2_7",
 			FT_UINT8, BASE_HEX, NULL, REP_REQ_PREAMBLE_EFFECTIVE_CINR_REQUEST_BIT2_7, "", HFILL
 		}
 	},
 	{	/* type 1.5 */
 		&hf_rep_req_preamble_phy_cinr_request,
 		{
-			"Preamble Physical CINR Request", "wimax.rep_req.preamble_phy_cinr_request", 
+			"Preamble Physical CINR Request", "wimax.rep_req.preamble_phy_cinr_request",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_preamble_phy_cinr_req_bit0_1,
 		{
-			"Type Of Preamble Physical CINR Measurement", "wimax.rep_req.preamble_phy_cinr_request.bit0_1", 
+			"Type Of Preamble Physical CINR Measurement", "wimax.rep_req.preamble_phy_cinr_request.bit0_1",
 			FT_UINT8, BASE_DEC, VALS(vals_type_of_measurements), REP_REQ_PREAMBLE_PHY_CINR_REQUEST_BIT0_1, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_preamble_phy_cinr_req_bit2_5,
 		{
-			"Alpha (ave) in multiples of 1/16", "wimax.rep_req.preamble_phy_cinr_request.bit2_5", 
+			"Alpha (ave) in multiples of 1/16", "wimax.rep_req.preamble_phy_cinr_request.bit2_5",
 			FT_UINT8, BASE_DEC, NULL, REP_REQ_PREAMBLE_PHY_CINR_REQUEST_BIT2_5, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_preamble_phy_cinr_req_bit6,
 		{
-			"CINR Report Type", "wimax.rep_req.preamble_phy_cinr_request.bit6", 
+			"CINR Report Type", "wimax.rep_req.preamble_phy_cinr_request.bit6",
 			FT_UINT8, BASE_DEC, VALS(vals_cinr_report_types), REP_REQ_PREAMBLE_PHY_CINR_REQUEST_BIT6, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_preamble_phy_cinr_req_bit7,
 		{
-			"Reserved", "wimax.rep_req.preamble_phy_cinr_request.bit7", 
+			"Reserved", "wimax.rep_req.preamble_phy_cinr_request.bit7",
 			FT_UINT8, BASE_HEX, NULL, REP_REQ_PREAMBLE_PHY_CINR_REQUEST_BIT7, "", HFILL
 		}
 	},
 	{	/* report request */
 		&hf_rep_req_report_request,
 		{
-			"Report Request", "wimax.rep_req.report_request", 
+			"Report Request", "wimax.rep_req.report_request",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* type 1.1 */
 		&hf_rep_req_report_type,
 		{
-			"Report Type", "wimax.rep_req.report_type", 
+			"Report Type", "wimax.rep_req.report_type",
 			FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_rep_type_bit0,
 		{
-			"Include DFS Basic Report", "wimax.rep_req.report_type.bit0", 
+			"Include DFS Basic Report", "wimax.rep_req.report_type.bit0",
 			FT_BOOLEAN, 8, NULL, REP_REQ_REPORT_TYPE_BIT0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_rep_type_bit1,
 		{
-			"Include CINR Report", "wimax.rep_req.report_type.bit1", 
+			"Include CINR Report", "wimax.rep_req.report_type.bit1",
 			FT_BOOLEAN, 8, NULL, REP_REQ_REPORT_TYPE_BIT1, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_rep_type_bit2,
 		{
-			"Include RSSI Report", "wimax.rep_req.report_type.bit2", 
+			"Include RSSI Report", "wimax.rep_req.report_type.bit2",
 			FT_BOOLEAN, 8, NULL, REP_REQ_REPORT_TYPE_BIT2, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_rep_type_bit3_6,
 		{
-			"Alpha (ave) in multiples of 1/32", "wimax.rep_req.report_type.bit3_6", 
+			"Alpha (ave) in multiples of 1/32", "wimax.rep_req.report_type.bit3_6",
 			FT_UINT8, BASE_DEC, NULL, REP_REQ_REPORT_TYPE_BIT3_6, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_rep_type_bit7,
 		{
-			"Include Current Transmit Power Report", "wimax.rep_req.report_type.bit7", 
+			"Include Current Transmit Power Report", "wimax.rep_req.report_type.bit7",
 			FT_BOOLEAN, 8, NULL, REP_REQ_REPORT_TYPE_BIT7, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_preamble_effective_cinr_rep_cqich_id,
 		{
-			"The 4 least significant bits of CQICH_ID", "wimax.rep_req.zone_spec_effective_cinr_report.cqich_id_4", 
+			"The 4 least significant bits of CQICH_ID", "wimax.rep_req.zone_spec_effective_cinr_report.cqich_id_4",
 			FT_UINT8, BASE_HEX, NULL, REP_RSP_ZONE_SPEC_EFFECTIVE_CINR_CQICH_ID_4_MASK, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_zone_spec_effective_cinr_rep_cqich_id,
 		{
-			"The 3 least significant bits of CQICH_ID", "wimax.rep_req.zone_spec_effective_cinr_report.cqich_id", 
+			"The 3 least significant bits of CQICH_ID", "wimax.rep_req.zone_spec_effective_cinr_report.cqich_id",
 			FT_UINT8, BASE_HEX, NULL, REP_RSP_ZONE_SPEC_EFFECTIVE_CINR_CQICH_ID_MASK, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr,
 		{
-			"Effective CINR", "wimax.rep_req.zone_spec_effective_cinr_report.effective_cinr", 
+			"Effective CINR", "wimax.rep_req.zone_spec_effective_cinr_report.effective_cinr",
 			FT_UINT8, BASE_DEC, NULL, REP_RSP_ZONE_SPEC_EFFECTIVE_CINR_EFFECTIVE_CINR_MASK, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_zone_spec_effective_cinr_rep_report_type,
 		{
-			"Effective CINR Report", "wimax.rep_req.zone_spec_effective_cinr_report.report_type", 
+			"Effective CINR Report", "wimax.rep_req.zone_spec_effective_cinr_report.report_type",
 			FT_UINT8, BASE_DEC, VALS(vals_data_cinr_measurements), REP_RSP_ZONE_SPEC_EFFECTIVE_CINR_REPORT_TYPE_MASK, "", HFILL
 		}
 	},
 	{	/* type 1.6 */
 		&hf_rep_req_zone_spec_effective_cinr_request,
 		{
-			"Zone-specific Effective CINR Request", "wimax.rep_req.zone_spec_effective_cinr_request", 
+			"Zone-specific Effective CINR Request", "wimax.rep_req.zone_spec_effective_cinr_request",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_zone_spec_effective_cinr_req_bit0_2,
 		{
-			"Type Of Zone On Which CINR Is To Be Reported", "wimax.rep_req.zone_spec_effective_cinr_request.bit0_2", 
+			"Type Of Zone On Which CINR Is To Be Reported", "wimax.rep_req.zone_spec_effective_cinr_request.bit0_2",
 			FT_UINT16, BASE_HEX, VALS(vals_type_of_zones), REP_REQ_TYPE_OF_ZONE_REQUEST_16_BIT0_2, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_zone_spec_effective_cinr_req_bit3,
 		{
-			"STC Zone", "wimax.rep_req.zone_spec_effective_cinr_request.bit3", 
+			"STC Zone", "wimax.rep_req.zone_spec_effective_cinr_request.bit3",
 			FT_BOOLEAN, 16, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_16_BIT3, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_zone_spec_effective_cinr_req_bit4,
 		{
-			"AAS Zone", "wimax.rep_req.zone_spec_effective_cinr_request.bit4", 
+			"AAS Zone", "wimax.rep_req.zone_spec_effective_cinr_request.bit4",
 			FT_BOOLEAN, 16, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_16_BIT4, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_zone_spec_effective_cinr_req_bit5_6,
 		{
-			"PRBS ID", "wimax.rep_req.zone_spec_effective_cinr_request.bit5_6", 
+			"PRBS ID", "wimax.rep_req.zone_spec_effective_cinr_request.bit5_6",
 			FT_UINT16, BASE_HEX, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_16_BIT5_6, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_zone_spec_effective_cinr_req_bit7,
 		{
-			"CINR Measurement Report", "wimax.rep_req.zone_spec_effective_cinr_request.bit7", 
+			"CINR Measurement Report", "wimax.rep_req.zone_spec_effective_cinr_request.bit7",
 			FT_UINT16, BASE_HEX, VALS(vals_data_cinr_measurements), REP_REQ_TYPE_OF_ZONE_REQUEST_16_BIT7, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_zone_spec_effective_cinr_req_bit8_13,
 		{
-			"PUSC Major Group Map", "wimax.rep_req.zone_spec_effective_cinr_request.bit8_13", 
+			"PUSC Major Group Map", "wimax.rep_req.zone_spec_effective_cinr_request.bit8_13",
 			FT_UINT16, BASE_HEX, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_16_BIT8_13, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_zone_spec_effective_cinr_req_bit14_15,
 		{
-			"Reserved", "wimax.rep_req.zone_spec_effective_cinr_request.bit14_15", 
+			"Reserved", "wimax.rep_req.zone_spec_effective_cinr_request.bit14_15",
 			FT_UINT16, BASE_HEX, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_16_BIT14_15, "", HFILL
 		}
 	},
 	{	/* second byte */
 		&hf_rep_rsp_zone_spec_phy_cinr_rep_deviation,
 		{
-			"Standard Deviation of CINR", "wimax.rep_req.zone_spec_phy_cinr_report.deviation", 
+			"Standard Deviation of CINR", "wimax.rep_req.zone_spec_phy_cinr_report.deviation",
 			FT_UINT8, BASE_DEC, NULL, REP_RSP_ZONE_SPEC_PHY_CINR_DEVIATION_MASK, "", HFILL
 		}
 	},
 	{	/* first byte */
 		&hf_rep_rsp_zone_spec_phy_cinr_rep_mean,
 		{
-			"Mean of Physical CINR", "wimax.rep_req.zone_spec_phy_cinr_report.mean", 
+			"Mean of Physical CINR", "wimax.rep_req.zone_spec_phy_cinr_report.mean",
 			FT_UINT8, BASE_DEC, NULL, REP_RSP_ZONE_SPEC_PHY_CINR_MEAN_MASK, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_zone_spec_phy_cinr_rep_report_type,
 		{
-			"CINR Report Type", "wimax.rep_req.zone_spec_phy_cinr_report.report_type", 
+			"CINR Report Type", "wimax.rep_req.zone_spec_phy_cinr_report.report_type",
 			FT_UINT8, BASE_DEC, VALS(vals_data_cinr_measurements), REP_RSP_ZONE_SPEC_PHY_CINR_REP_TYPE_MASK, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_zone_spec_phy_cinr_rep_reserved1,
 		{
-			"Reserved", "wimax.rep_req.zone_spec_phy_cinr_report.reserved1", 
+			"Reserved", "wimax.rep_req.zone_spec_phy_cinr_report.reserved1",
 			FT_UINT8, BASE_HEX, NULL, REP_RSP_ZONE_SPEC_PHY_CINR_RSV1_MASK, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_zone_spec_phy_cinr_rep_reserved2,
 		{
-			"Reserved", "wimax.rep_req.zone_spec_phy_cinr_report.reserved2", 
+			"Reserved", "wimax.rep_req.zone_spec_phy_cinr_report.reserved2",
 			FT_UINT8, BASE_HEX, NULL, REP_RSP_ZONE_SPEC_PHY_CINR_RSV2_MASK, "", HFILL
 		}
 	},
 	{	/* type 1.4 */
 		&hf_rep_req_zone_spec_phy_cinr_request,
 		{
-			"Zone-specific Physical CINR Request", "wimax.rep_req.zone_spec_phy_cinr_request", 
+			"Zone-specific Physical CINR Request", "wimax.rep_req.zone_spec_phy_cinr_request",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_zone_spec_phy_cinr_req_bit0_2,
 		{
-			"Type Of Zone On Which CINR Is To Be Reported", "wimax.rep_req.zone_spec_phy_cinr_request.bit0_2", 
+			"Type Of Zone On Which CINR Is To Be Reported", "wimax.rep_req.zone_spec_phy_cinr_request.bit0_2",
 			FT_UINT24, BASE_HEX, VALS(vals_type_of_zones), REP_REQ_TYPE_OF_ZONE_REQUEST_BIT0_2, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_zone_spec_phy_cinr_req_bit3,
 		{
-			"STC Zone", "wimax.rep_req.zone_spec_phy_cinr_request.bit3", 
+			"STC Zone", "wimax.rep_req.zone_spec_phy_cinr_request.bit3",
 			FT_BOOLEAN, 24, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_BIT3, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_zone_spec_phy_cinr_req_bit4,
 		{
-			"AAS Zone", "wimax.rep_req.zone_spec_phy_cinr_request.bit4", 
+			"AAS Zone", "wimax.rep_req.zone_spec_phy_cinr_request.bit4",
 			FT_BOOLEAN, 24, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_BIT4, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_zone_spec_phy_cinr_req_bit5_6,
 		{
-			"PRBS ID", "wimax.rep_req.zone_spec_phy_cinr_request.bit5_6", 
+			"PRBS ID", "wimax.rep_req.zone_spec_phy_cinr_request.bit5_6",
 			FT_UINT24, BASE_HEX, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_BIT5_6, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_zone_spec_phy_cinr_req_bit7,
 		{
-			"CINR Measurement Report", "wimax.rep_req.zone_spec_phy_cinr_request.bit7", 
+			"CINR Measurement Report", "wimax.rep_req.zone_spec_phy_cinr_request.bit7",
 			FT_UINT24, BASE_HEX, VALS(vals_data_cinr_measurements), REP_REQ_TYPE_OF_ZONE_REQUEST_BIT7, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_zone_spec_phy_cinr_req_bit8_13,
 		{
-			"PUSC Major Group Map", "wimax.rep_req.zone_spec_phy_cinr_request.bit8_13", 
+			"PUSC Major Group Map", "wimax.rep_req.zone_spec_phy_cinr_request.bit8_13",
 			FT_UINT24, BASE_HEX, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_BIT8_13, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_zone_spec_phy_cinr_req_bit14_17,
 		{
-			"Alpha (ave) in multiples of 1/16", "wimax.rep_req.zone_spec_phy_cinr_request.bit14_17", 
+			"Alpha (ave) in multiples of 1/16", "wimax.rep_req.zone_spec_phy_cinr_request.bit14_17",
 			FT_UINT24, BASE_DEC, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_BIT14_17, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_zone_spec_phy_cinr_req_bit18,
 		{
-			"CINR Report Type", "wimax.rep_req.zone_spec_phy_cinr_request.bit18", 
+			"CINR Report Type", "wimax.rep_req.zone_spec_phy_cinr_request.bit18",
 			FT_UINT24, BASE_HEX, VALS(vals_cinr_report_types), REP_REQ_TYPE_OF_ZONE_REQUEST_BIT18, "", HFILL
 		}
 	},
 	{
 		&hf_rep_req_zone_spec_phy_cinr_req_bit19_23,
 		{
-			"Reserved", "wimax.rep_req.zone_spec_phy_cinr_request.bit19_23", 
+			"Reserved", "wimax.rep_req.zone_spec_phy_cinr_request.bit19_23",
 			FT_UINT24, BASE_HEX, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_BIT19_23, "", HFILL
 		}
 	},
@@ -634,119 +634,119 @@ static hf_register_info hf_rep[] =
 	{	/* 6.3 */
 		&hf_rep_rsp_channel_selectivity_report,
 		{
-			"Channel Selectivity Report", "wimax.rep_rsp.channel_selectivity_report", 
+			"Channel Selectivity Report", "wimax.rep_rsp.channel_selectivity_report",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_channel_selectivity_rep_frequency_a,
 		{
-			"Frequency Selectivity Report a", "wimax.rep_rsp.channel_selectivity_report.frequency_a", 
+			"Frequency Selectivity Report a", "wimax.rep_rsp.channel_selectivity_report.frequency_a",
 			FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_channel_selectivity_rep_frequency_b,
 		{
-			"Frequency Selectivity Report b", "wimax.rep_rsp.channel_selectivity_report.frequency_b", 
+			"Frequency Selectivity Report b", "wimax.rep_rsp.channel_selectivity_report.frequency_b",
 			FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_channel_selectivity_rep_frequency_c,
 		{
-			"Frequency Selectivity Report c", "wimax.rep_rsp.channel_selectivity_report.frequency_c", 
+			"Frequency Selectivity Report c", "wimax.rep_rsp.channel_selectivity_report.frequency_c",
 			FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_channel_type_report,
 		{
-			"Channel Type Report", "wimax.rep_rsp.channel_type_report", 
+			"Channel Type Report", "wimax.rep_rsp.channel_type_report",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_channel_type_band_amc,
 		{
-			"Band AMC", "wimax.rep_rsp.channel_type_report.band_amc", 
+			"Band AMC", "wimax.rep_rsp.channel_type_report.band_amc",
 			FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_channel_type_enhanced_band_amc,
 		{
-			"Enhanced Band AMC", "wimax.rep_rsp.channel_type_report.enhanced_band_amc", 
+			"Enhanced Band AMC", "wimax.rep_rsp.channel_type_report.enhanced_band_amc",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_channel_type_safety_channel,
 		{
-			"Safety Channel", "wimax.rep_rsp.channel_type_report.safety_channel", 
+			"Safety Channel", "wimax.rep_rsp.channel_type_report.safety_channel",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_channel_type_sounding,
 		{
-			"Sounding", "wimax.rep_rsp.channel_type_report.sounding", 
+			"Sounding", "wimax.rep_rsp.channel_type_report.sounding",
 			FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_channel_type_subchannel,
 		{
-			"Normal Subchannel", "wimax.rep_rsp.channel_type_report.subchannel", 
+			"Normal Subchannel", "wimax.rep_rsp.channel_type_report.subchannel",
 			FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_preamble_effective_cinr_report,
 		{
-			"Preamble Effective CINR Report", "wimax.rep_rsp.preamble_effective_cinr_report", 
+			"Preamble Effective CINR Report", "wimax.rep_rsp.preamble_effective_cinr_report",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* 6.1 */
 		&hf_rep_rsp_preamble_effective_cinr_rep_configuration_1,
 		{
-			"The Estimation Of Effective CINR Measured From Preamble For Frequency Reuse Configuration=1", "wimax.rep_rsp.preamble_effective_cinr_report.configuration_1", 
+			"The Estimation Of Effective CINR Measured From Preamble For Frequency Reuse Configuration=1", "wimax.rep_rsp.preamble_effective_cinr_report.configuration_1",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* 6.2 */
 		&hf_rep_rsp_preamble_effective_cinr_rep_configuration_3,
 		{
-			"The Estimation Of Effective CINR Measured From Preamble For Frequency Reuse Configuration=3", "wimax.rep_rsp.preamble_effective_cinr_report.configuration_3", 
+			"The Estimation Of Effective CINR Measured From Preamble For Frequency Reuse Configuration=3", "wimax.rep_rsp.preamble_effective_cinr_report.configuration_3",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_preamble_phy_cinr_report,
 		{
-			"Preamble Physical CINR Report", "wimax.rep_rsp.preamble_phy_cinr_report", 
+			"Preamble Physical CINR Report", "wimax.rep_rsp.preamble_phy_cinr_report",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* 4.3 */
 		&hf_rep_rsp_preamble_phy_cinr_rep_band_amc_zone,
 		{
-			"The Estimation Of Physical CINR Measured From Preamble For Band AMC Zone", "wimax.rep_rsp.preamble_phy_cinr_report.band_amc_zone", 
+			"The Estimation Of Physical CINR Measured From Preamble For Band AMC Zone", "wimax.rep_rsp.preamble_phy_cinr_report.band_amc_zone",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* 4.1 */
 		&hf_rep_rsp_preamble_phy_cinr_rep_configuration_1,
 		{
-			"The Estimation Of Physical CINR Measured From Preamble For Frequency Reuse Configuration=1", "wimax.rep_rsp.preamble_phy_cinr_report.configuration_1", 
+			"The Estimation Of Physical CINR Measured From Preamble For Frequency Reuse Configuration=1", "wimax.rep_rsp.preamble_phy_cinr_report.configuration_1",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* 4.2 */
 		&hf_rep_rsp_preamble_phy_cinr_rep_configuration_3,
 		{
-			"The Estimation Of Physical CINR Measured From Preamble For Frequency Reuse Configuration=3", "wimax.rep_rsp.preamble_phy_cinr_report.configuration_3", 
+			"The Estimation Of Physical CINR Measured From Preamble For Frequency Reuse Configuration=3", "wimax.rep_rsp.preamble_phy_cinr_report.configuration_3",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
@@ -754,105 +754,105 @@ static hf_register_info hf_rep[] =
 	{
 		&hf_rep_rsp_report_type,
 		{
-			"Report Type", "wimax.rep_rsp.report_type", 
+			"Report Type", "wimax.rep_rsp.report_type",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_report_type_basic_report,
 		{
-			"Basic Report", "wimax.rep_rsp.report_type.basic_report", 
+			"Basic Report", "wimax.rep_rsp.report_type.basic_report",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_report_type_basic_report_bit0,
 		{
-			"Wireless HUMAN Detected", "wimax.rep_rsp.report_type.basic_report.bit0", 
+			"Wireless HUMAN Detected", "wimax.rep_rsp.report_type.basic_report.bit0",
 			FT_BOOLEAN, 8, NULL, REP_RSP_REPORT_TYPE_BASIC_REPORT_BIT0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_report_type_basic_report_bit1,
 		{
-			"Unknown Transmission Detected", "wimax.rep_rsp.report_type.basic_report.bit1", 
+			"Unknown Transmission Detected", "wimax.rep_rsp.report_type.basic_report.bit1",
 			FT_BOOLEAN, 8, NULL, REP_RSP_REPORT_TYPE_BASIC_REPORT_BIT1, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_report_type_basic_report_bit2,
 		{
-			"Specific Spectrum User Detected", "wimax.rep_rsp.report_type.basic_report.bit2", 
+			"Specific Spectrum User Detected", "wimax.rep_rsp.report_type.basic_report.bit2",
 			FT_BOOLEAN, 8, NULL, REP_RSP_REPORT_TYPE_BASIC_REPORT_BIT2, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_report_type_basic_report_bit3,
 		{
-			"Channel Not Measured", "wimax.rep_rsp.report_type.basic_report.bit3", 
+			"Channel Not Measured", "wimax.rep_rsp.report_type.basic_report.bit3",
 			FT_BOOLEAN, 8, NULL, REP_RSP_REPORT_TYPE_BASIC_REPORT_BIT3, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_report_type_basic_report_reserved,
 		{
-			"Reserved", "wimax.rep_rsp.report_type.basic_report.reserved", 
+			"Reserved", "wimax.rep_rsp.report_type.basic_report.reserved",
 			FT_UINT8, BASE_HEX, NULL, REP_RSP_REPORT_TYPE_BASIC_REPORT_RSV, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_report_type_channel_number,
 		{
-			"Channel Number", "wimax.rep_rsp.report_type.channel_number", 
+			"Channel Number", "wimax.rep_rsp.report_type.channel_number",
 			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_report_type_cinr_report,
 		{
-			"CINR Report", "wimax.rep_rsp.report_type.cinr_report", 
+			"CINR Report", "wimax.rep_rsp.report_type.cinr_report",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_report_type_cinr_report_deviation,
 		{
-			"CINR Standard Deviation", "wimax.rep_rsp.report_type.cinr_report_deviation", 
+			"CINR Standard Deviation", "wimax.rep_rsp.report_type.cinr_report_deviation",
 			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_report_type_cinr_report_mean,
 		{
-			"CINR Mean", "wimax.rep_rsp.report_type.cinr_report_mean", 
+			"CINR Mean", "wimax.rep_rsp.report_type.cinr_report_mean",
 			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_report_type_duration,
 		{
-			"Duration", "wimax.rep_rsp.report_type.duration", 
+			"Duration", "wimax.rep_rsp.report_type.duration",
 			FT_UINT24, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_report_type_frame_number,
 		{
-			"Start Frame", "wimax.rep_rsp.report_type.frame_number", 
+			"Start Frame", "wimax.rep_rsp.report_type.frame_number",
 			FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_report_type_rssi_report,
 		{
-			"RSSI Report", "wimax.rep_rsp.report_type.rssi_report", 
+			"RSSI Report", "wimax.rep_rsp.report_type.rssi_report",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_report_type_rssi_report_deviation,
 		{
-			"RSSI Standard Deviation", "wimax.rep_rsp.report_type.rssi_report_deviation", 
+			"RSSI Standard Deviation", "wimax.rep_rsp.report_type.rssi_report_deviation",
 			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
 		}
 	},
@@ -866,105 +866,105 @@ static hf_register_info hf_rep[] =
 	{
 		&hf_rep_rsp_report_type_rssi_report_mean,
 		{
-			"RSSI Mean", "wimax.rep_rsp.report_type.rssi_report_mean", 
+			"RSSI Mean", "wimax.rep_rsp.report_type.rssi_report_mean",
 			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_zone_spec_effective_cinr_report,
 		{
-			"Zone-specific Effective CINR Report", "wimax.rep_rsp.zone_spec_effective_cinr_report", 
+			"Zone-specific Effective CINR Report", "wimax.rep_rsp.zone_spec_effective_cinr_report",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* 5.5 */
 		&hf_rep_rsp_zone_spec_effective_cinr_rep_amc_aas,
 		{
-			"AMC AAS Zone", "wimax.rep_rsp.zone_spec_effective_cinr_report.amc_aas", 
+			"AMC AAS Zone", "wimax.rep_rsp.zone_spec_effective_cinr_report.amc_aas",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* 5.3 */
 		&hf_rep_rsp_zone_spec_effective_cinr_rep_fusc,
 		{
-			"FUSC Zone", "wimax.rep_rsp.zone_spec_effective_cinr_report.fusc", 
+			"FUSC Zone", "wimax.rep_rsp.zone_spec_effective_cinr_report.fusc",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* 5.4 */
 		&hf_rep_rsp_zone_spec_effective_cinr_rep_optional_fusc,
 		{
-			"Optional FUSC Zone", "wimax.rep_rsp.zone_spec_effective_cinr_report.optional_fusc", 
+			"Optional FUSC Zone", "wimax.rep_rsp.zone_spec_effective_cinr_report.optional_fusc",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* 5.1 */
 		&hf_rep_rsp_zone_spec_effective_cinr_rep_pusc_sc0,
 		{
-			"PUSC Zone (use all SC=0)", "wimax.rep_rsp.zone_spec_effective_cinr_report.pusc_sc0", 
+			"PUSC Zone (use all SC=0)", "wimax.rep_rsp.zone_spec_effective_cinr_report.pusc_sc0",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* 5.2 */
 		&hf_rep_rsp_zone_spec_effective_cinr_rep_pusc_sc1,
 		{
-			"PUSC Zone (use all SC=1)", "wimax.rep_rsp.zone_spec_effective_cinr_report.pusc_sc1", 
+			"PUSC Zone (use all SC=1)", "wimax.rep_rsp.zone_spec_effective_cinr_report.pusc_sc1",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_rsp_zone_spec_phy_cinr_report,
 		{
-			"Zone-specific Physical CINR Report", "wimax.rep_rsp.zone_spec_phy_cinr_report", 
+			"Zone-specific Physical CINR Report", "wimax.rep_rsp.zone_spec_phy_cinr_report",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* 3.6 */
 		&hf_rep_rsp_zone_spec_phy_cinr_rep_amc,
 		{
-			"AMC Zone", "wimax.rep_rsp.zone_spec_phy_cinr_report.amc", 
+			"AMC Zone", "wimax.rep_rsp.zone_spec_phy_cinr_report.amc",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* 3.3 */
 		&hf_rep_rsp_zone_spec_phy_cinr_rep_fusc,
 		{
-			"FUSC Zone", "wimax.rep_rsp.zone_spec_phy_cinr_report.fusc", 
+			"FUSC Zone", "wimax.rep_rsp.zone_spec_phy_cinr_report.fusc",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* 3.4 */
 		&hf_rep_rsp_zone_spec_phy_cinr_rep_optional_fusc,
 		{
-			"Optional FUSC Zone", "wimax.rep_rsp.zone_spec_phy_cinr_report.optional_fusc", 
+			"Optional FUSC Zone", "wimax.rep_rsp.zone_spec_phy_cinr_report.optional_fusc",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* 3.1 */
 		&hf_rep_rsp_zone_spec_phy_cinr_rep_pusc_sc0,
 		{
-			"PUSC Zone (use all SC=0)", "wimax.rep_rsp.zone_spec_phy_cinr_report.pusc_sc0", 
+			"PUSC Zone (use all SC=0)", "wimax.rep_rsp.zone_spec_phy_cinr_report.pusc_sc0",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* 3.2 */
 		&hf_rep_rsp_zone_spec_phy_cinr_rep_pusc_sc1,
 		{
-			"PUSC Zone (use all SC=1)", "wimax.rep_rsp.zone_spec_phy_cinr_report.pusc_sc1", 
+			"PUSC Zone (use all SC=1)", "wimax.rep_rsp.zone_spec_phy_cinr_report.pusc_sc1",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{	/* 3.5 */
 		&hf_rep_rsp_zone_spec_phy_cinr_rep_safety_channel,
 		{
-			"Safety Channel", "wimax.rep_rsp.zone_spec_phy_cinr_report.safety_channel", 
+			"Safety Channel", "wimax.rep_rsp.zone_spec_phy_cinr_report.safety_channel",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	},
 	{
 		&hf_rep_unknown_type,
 		{
-			"Unknown TLV type", "wimax.rep.unknown_tlv_type", 
+			"Unknown TLV type", "wimax.rep.unknown_tlv_type",
 			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
 		}
 	}
@@ -1078,7 +1078,7 @@ void dissect_mac_mgmt_msg_rep_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 						proto_tree_add_item(ti_tree, hf_rep_req_rep_type_bit1, tvb, (offset + tlv_offset), length, FALSE);
 						proto_tree_add_item(ti_tree, hf_rep_req_rep_type_bit2, tvb, (offset + tlv_offset), length, FALSE);
 						proto_tree_add_item(ti_tree, hf_rep_req_rep_type_bit3_6, tvb, (offset + tlv_offset), length, FALSE);
-//						proto_item_append_text(ti, " dB");
+/*						proto_item_append_text(ti, " dB");*/
 						proto_tree_add_item(ti_tree, hf_rep_req_rep_type_bit7, tvb, (offset + tlv_offset), length, FALSE);
 						break;
 						case REP_REQ_CHANNEL_NUMBER:
@@ -1120,7 +1120,7 @@ void dissect_mac_mgmt_msg_rep_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 						proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit3, tvb, (offset + tlv_offset), length, FALSE);
 						proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit4, tvb, (offset + tlv_offset), length, FALSE);
 						proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit5_6, tvb, (offset + tlv_offset), length, FALSE);
-	//					proto_item_append_text(ti, " dB");
+	/*					proto_item_append_text(ti, " dB");*/
 						proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit7, tvb, (offset + tlv_offset), length, FALSE);
 						proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit8_13, tvb, (offset + tlv_offset), length, FALSE);
 						proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit14_15, tvb, (offset + tlv_offset), length, FALSE);
diff --git a/plugins/wimax/msg_ucd.c b/plugins/wimax/msg_ucd.c
index cde80bb403..6059a5e291 100644
--- a/plugins/wimax/msg_ucd.c
+++ b/plugins/wimax/msg_ucd.c
@@ -74,8 +74,9 @@ static gint hf_ucd_ul_burst_reserved = -1;
 static gint hf_ucd_ul_burst_uiuc = -1;
 static gint hf_ucd_burst_fec = -1;
 static gint hf_ucd_burst_ranging_data_ratio = -1;
-//static gint hf_ucd_burst_power_boost = -1;
-//static gint hf_ucd_burst_tcs_enable = -1;
+/*static gint hf_ucd_burst_power_boost = -1;
+*static gint hf_ucd_burst_tcs_enable = -1;
+*/
 
 static gint hf_ucd_tlv_t_159_band_amc_allocation_threshold = -1;
 static gint hf_ucd_tlv_t_158_optional_permutation_ul_allocated_subchannels_bitmap = -1;
@@ -219,91 +220,91 @@ static hf_register_info hf[] =
 	{
 		&hf_ucd_message_type,
 		{
-			"MAC Management Message Type", "wimax.macmgtmsgtype.ucd", 
+			"MAC Management Message Type", "wimax.macmgtmsgtype.ucd",
 			FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_188_allow_aas_beam_select_message,
 		{
-			"Allow AAS Beam Select Message", "wimax.ucd.allow_aas_beam_select_message", 
+			"Allow AAS Beam Select Message", "wimax.ucd.allow_aas_beam_select_message",
 			FT_INT8, BASE_DEC, VALS(vals_yes_no_str), 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_159_band_amc_allocation_threshold,
 		{
-			"Band AMC Allocation Threshold ", "wimax.ucd.band_amc.allocation_threshold", 
+			"Band AMC Allocation Threshold ", "wimax.ucd.band_amc.allocation_threshold",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_161_band_amc_allocation_timer,
 		{
-			"Band AMC Allocation Timer", "wimax.ucd.band_amc.allocation_timer", 
+			"Band AMC Allocation Timer", "wimax.ucd.band_amc.allocation_timer",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_160_band_amc_release_threshold,
 		{
-			"Band AMC Release Threshold", "wimax.ucd.band_amc.release_threshold", 
+			"Band AMC Release Threshold", "wimax.ucd.band_amc.release_threshold",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_162_band_amc_release_timer,
 		{
-			"Band AMC Release Timer", "wimax.ucd.band_amc.release_timer", 
+			"Band AMC Release Timer", "wimax.ucd.band_amc.release_timer",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_164_band_amc_retry_timer,
 		{
-			"Band AMC Retry Timer", "wimax.ucd.band_amc.retry_timer", 
+			"Band AMC Retry Timer", "wimax.ucd.band_amc.retry_timer",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_163_band_status_report_max_period,
 		{
-			"Band Status Report MAC Period", "wimax.ucd.band_status.report_max_period", 
+			"Band Status Report MAC Period", "wimax.ucd.band_status.report_max_period",
 			FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_152_bandwidth_request_codes,
 		{
-			"Bandwidth Request Codes", "wimax.ucd.bandwidth_request", 
+			"Bandwidth Request Codes", "wimax.ucd.bandwidth_request",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
-		&hf_ucd_burst_fec, 
+		&hf_ucd_burst_fec,
 		{
-			"FEC Code Type", "wimax.ucd.burst.fec", 
+			"FEC Code Type", "wimax.ucd.burst.fec",
 			FT_UINT8, BASE_HEX, VALS(vals_dcd_burst_fec), 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_burst_ranging_data_ratio,
 		{
-			"Ranging Data Ratio", "wimax.ucd.burst.ranging_data_ratio", 
+			"Ranging Data Ratio", "wimax.ucd.burst.ranging_data_ratio",
 			FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_ul_burst_reserved,
 		{
-			"Reserved", "wimax.ucd.burst.reserved", 
+			"Reserved", "wimax.ucd.burst.reserved",
 			FT_UINT8, BASE_HEX, NULL, 0xF0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_ul_burst_uiuc,
 		{
-			"UIUC", "wimax.ucd.burst.uiuc", 
+			"UIUC", "wimax.ucd.burst.uiuc",
 			FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL
 		}
 	},
@@ -313,350 +314,350 @@ static hf_register_info hf[] =
 		{"Focused Contention Power Boost", "wimax.ucd.burst.power_boost", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL}
 	},
 	{
-		&hf_ucd_burst_tcs_enable, 
+		&hf_ucd_burst_tcs_enable,
 		{"TCS", "wimax.ucd.burst.tcs", FT_UINT8, BASE_DEC, VALS(vals_dcd_burst_tcs), 0, "", HFILL}
-	},	
+	},
 #endif
 	{
-		&hf_ucd_bw_req_size, 
+		&hf_ucd_bw_req_size,
 		{
-			"Bandwidth Request Opportunity Size", "wimax.ucd.bw_req_size", 
+			"Bandwidth Request Opportunity Size", "wimax.ucd.bw_req_size",
 			FT_UINT16, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_172_cqich_band_amc_transition_delay,
 		{
-			"CQICH Band AMC-Transition Delay", "wimax.ucd.cqich_band_amc_transition_delay", 
+			"CQICH Band AMC-Transition Delay", "wimax.ucd.cqich_band_amc_transition_delay",
 			FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
-		&hf_ucd_freq, 
+		&hf_ucd_freq,
 		{
-			"Frequency", "wimax.ucd.frequency", 
+			"Frequency", "wimax.ucd.frequency",
 			FT_UINT32, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_194_handover_ranging_codes,
 		{
-			"Handover Ranging Codes", "wimax.ucd.handover_ranging_codes", 
+			"Handover Ranging Codes", "wimax.ucd.handover_ranging_codes",
 			FT_INT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_171_harq_ack_delay_dl_burst,
 		{
-			"HARQ ACK Delay for DL Burst", "wimax.ucd.harq_ack_delay_dl_burst", 
+			"HARQ ACK Delay for DL Burst", "wimax.ucd.harq_ack_delay_dl_burst",
 			FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_150_initial_ranging_codes,
 		{
-			"Initial Ranging Codes", "wimax.ucd.initial_ranging_codes", 
+			"Initial Ranging Codes", "wimax.ucd.initial_ranging_codes",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_195_initial_ranging_interval,
 		{
-			"Number of Frames Between Initial Ranging Interval Allocation", "wimax.ucd.initial_ranging_interval", 
+			"Number of Frames Between Initial Ranging Interval Allocation", "wimax.ucd.initial_ranging_interval",
 			FT_INT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_invalid_tlv,
 		{
-			"Invalid TLV", "wimax.ucd.invalid_tlv", 
+			"Invalid TLV", "wimax.ucd.invalid_tlv",
 			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_187_lower_bound_aas_preamble,
 		{
-			"Lower Bound AAS Preamble (in units of 0.25 dB)", "wimax.ucd.lower_bound_aas_preamble", 
+			"Lower Bound AAS Preamble (in units of 0.25 dB)", "wimax.ucd.lower_bound_aas_preamble",
 			FT_INT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_192_min_level_power_offset_adjustment,
 		{
-			"Minimum Level of Power Offset Adjustment (in units of 0.1 dB)", "wimax.ucd.min_level_power_offset_adjustment", 
+			"Minimum Level of Power Offset Adjustment (in units of 0.1 dB)", "wimax.ucd.min_level_power_offset_adjustment",
 			FT_INT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_193_max_level_power_offset_adjustment,
 		{
-			"Maximum Level of Power Offset Adjustment (in units of 0.1 dB)", "wimax.ucd.max_level_power_offset_adjustment", 
+			"Maximum Level of Power Offset Adjustment (in units of 0.1 dB)", "wimax.ucd.max_level_power_offset_adjustment",
 			FT_INT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_174_maximum_retransmission,
 		{
-			"Maximum Number of Retransmission in UL-HARQ", "wimax.ucd.max_number_of_retransmission_in_ul_harq", 
+			"Maximum Number of Retransmission in UL-HARQ", "wimax.ucd.max_number_of_retransmission_in_ul_harq",
 			FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_191_ms_specific_down_power_addjustment_step,
 		{
-			"MS-specific Down Power Offset Adjustment Step (in units of 0.01 dB)", "wimax.ucd.ms_specific_down_power_offset_adjustment_step", 
+			"MS-specific Down Power Offset Adjustment Step (in units of 0.01 dB)", "wimax.ucd.ms_specific_down_power_offset_adjustment_step",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_190_ms_specific_up_power_addjustment_step,
 		{
-			"MS-specific Up Power Offset Adjustment Step (in units of 0.01 dB)", "wimax.ucd.ms_specific_up_power_offset_adjustment_step", 
+			"MS-specific Up Power Offset Adjustment Step (in units of 0.01 dB)", "wimax.ucd.ms_specific_up_power_offset_adjustment_step",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_197_normalized_cn_channel_sounding,
 		{
-			"Normalized C/N for Channel Sounding", "wimax.ucd.normalized_cn.channel_sounding", 
+			"Normalized C/N for Channel Sounding", "wimax.ucd.normalized_cn.channel_sounding",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_177_normalized_cn_override2,
 		{
-			"Normalized C/N Override 2", "wimax.ucd.normalized_cn.override_2", 
+			"Normalized C/N Override 2", "wimax.ucd.normalized_cn.override_2",
 			FT_STRING, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_177_normalized_cn_override2_first_line,
 		{
-			"Normalized C/N Value", "wimax.ucd.normalized_cn.override_first_line", 
+			"Normalized C/N Value", "wimax.ucd.normalized_cn.override_first_line",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_177_normalized_cn_override2_list,
 		{
-			"Normalized C/N Value List", "wimax.ucd.normalized_cn.override_list", 
+			"Normalized C/N Value List", "wimax.ucd.normalized_cn.override_list",
 			FT_STRING, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_158_optional_permutation_ul_allocated_subchannels_bitmap,
 		{
-			"Optional permutation UL allocated subchannels bitmap ", "wimax.ucd.optional_permutation_ul_allocated_subchannels_bitmap", 
+			"Optional permutation UL allocated subchannels bitmap ", "wimax.ucd.optional_permutation_ul_allocated_subchannels_bitmap",
 			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_151_periodic_ranging_codes,
 		{
-			"Periodic Ranging Codes", "wimax.ucd.periodic_ranging_codes", 
+			"Periodic Ranging Codes", "wimax.ucd.periodic_ranging_codes",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_156_permutation_base,
 		{
-			"Permutation Base", "wimax.ucd.permutation_base", 
+			"Permutation Base", "wimax.ucd.permutation_base",
 			FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
-		&hf_ucd_ranging_req_size, 
+		&hf_ucd_ranging_req_size,
 		{
-			"Ranging Request Opportunity Size", "wimax.ucd.ranging_req_size", 
+			"Ranging Request Opportunity Size", "wimax.ucd.ranging_req_size",
 			FT_UINT16, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
-		&hf_ucd_res_timeout, 
+		&hf_ucd_res_timeout,
 		{
-			"Contention-based Reservation Timeout", "wimax.ucd.res_timeout", 
+			"Contention-based Reservation Timeout", "wimax.ucd.res_timeout",
 			FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_170_safety_channel_retry_timer,
 		{
-			"Safety Channel Release Timer", "wimax.ucd.safety_channel_release_timer", 
+			"Safety Channel Release Timer", "wimax.ucd.safety_channel_release_timer",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_176_size_of_cqich_id_field,
 		{
-			"Size of CQICH_ID Field", "wimax.ucd.size_of_cqich_id_field", 
+			"Size of CQICH_ID Field", "wimax.ucd.size_of_cqich_id_field",
 			FT_UINT8, BASE_DEC, VALS(vals_ucd_cqich_size), 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_155_start_of_ranging_codes_group,
 		{
-			"Start of Ranging Codes Group", "wimax.ucd.start_of_ranging_codes_group", 
+			"Start of Ranging Codes Group", "wimax.ucd.start_of_ranging_codes_group",
 			FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
         {
-		&hf_ucd_ul_allocated_subchannles_bitmap, 
+		&hf_ucd_ul_allocated_subchannles_bitmap,
 		{
-			"UL Allocated Subchannels Bitmap", "wimax.ucd.subchan.bitmap", 
+			"UL Allocated Subchannels Bitmap", "wimax.ucd.subchan.bitmap",
 			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_subchan_codes,
 		{
-			"Periodic Ranging Codes", "wimax.ucd.subchan.codes", 
+			"Periodic Ranging Codes", "wimax.ucd.subchan.codes",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
-		&hf_ucd_subchan_params_num_chan, 
+		&hf_ucd_subchan_params_num_chan,
 		{
-			"Number of Subchannels", "wimax.ucd.subchan.num_chan", 
+			"Number of Subchannels", "wimax.ucd.subchan.num_chan",
 			FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
-		&hf_ucd_subchan_params_num_sym, 
+		&hf_ucd_subchan_params_num_sym,
 		{
-			"Number of OFDMA Symbols", "wimax.ucd.subchan.num_sym", 
+			"Number of OFDMA Symbols", "wimax.ucd.subchan.num_sym",
 			FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_196_tx_power_report,
 		{
-			"Tx Power Report", "wimax.ucd.tx_power_report", 
+			"Tx Power Report", "wimax.ucd.tx_power_report",
 			FT_UINT24, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_196_tx_power_report_a_p_avg,
 		{
-			"A p_avg (in multiples of 1/16)", "wimax.ucd.tx_power_report.a_p_avg", 
+			"A p_avg (in multiples of 1/16)", "wimax.ucd.tx_power_report.a_p_avg",
 			FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_196_tx_power_report_a_p_avg_icqch,
 		{
-			"A p_avg (in multiples of 1/16) when ICQCH is allocated", "wimax.ucd.tx_power_report.a_p_avg_icqch", 
+			"A p_avg (in multiples of 1/16) when ICQCH is allocated", "wimax.ucd.tx_power_report.a_p_avg_icqch",
 			FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_196_tx_power_report_interval,
 		{
-			"Interval (expressed as power of 2)", "wimax.ucd.tx_power_report.interval", 
+			"Interval (expressed as power of 2)", "wimax.ucd.tx_power_report.interval",
 			FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_196_tx_power_report_interval_icqch,
 		{
-			"Interval When ICQCH is Allocated (expressed as power of 2)", "wimax.ucd.tx_power_report.interval_icqch", 
+			"Interval When ICQCH is Allocated (expressed as power of 2)", "wimax.ucd.tx_power_report.interval_icqch",
 			FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_196_tx_power_report_threshold,
 		{
-			"Threshold", "wimax.ucd.tx_power_report.threshold", 
+			"Threshold", "wimax.ucd.tx_power_report.threshold",
 			FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_196_tx_power_report_threshold_icqch,
 		{
-			"Threshold When ICQCH is Allocated to SS (in dB)", "wimax.ucd.tx_power_report.threshold_icqch", 
+			"Threshold When ICQCH is Allocated to SS (in dB)", "wimax.ucd.tx_power_report.threshold_icqch",
 			FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_unknown_type,
 		{
-			"Unknown UCD Type", "wimax.ucd.unknown_tlv_type", 
+			"Unknown UCD Type", "wimax.ucd.unknown_tlv_type",
 			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_202_uplink_burst_profile_for_multiple_fec_types,
 		{
-			"Uplink Burst Profile for Multiple FEC Types", "wimax.ucd.uplink_burst_profile.multiple_fec_types", 
+			"Uplink Burst Profile for Multiple FEC Types", "wimax.ucd.uplink_burst_profile.multiple_fec_types",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_203_ul_pusc_subchannel_rotation,
 		{
-			"Uplink PUSC Subchannel Rotation", "wimax.ucd.uplink_burst_profile.ul_pusc_subchannel_rotation", 
+			"Uplink PUSC Subchannel Rotation", "wimax.ucd.uplink_burst_profile.ul_pusc_subchannel_rotation",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_205_relative_power_offset_ul_harq_burst,
 		{
-			"Relative Power Offset UL HARQ Burst", "wimax.ucd.uplink_burst_profile.relative_power_offset_ul_harq_burst", 
+			"Relative Power Offset UL HARQ Burst", "wimax.ucd.uplink_burst_profile.relative_power_offset_ul_harq_burst",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_206_relative_power_offset_ul_burst_containing_mac_mgmt_msg,
 		{
-			"Relative Power Offset UL Burst Containing MAC Mgmt Msg", "wimax.ucd.uplink_burst_profile.relative_power_offset_ul_burst_mac_mgmt_msg", 
+			"Relative Power Offset UL Burst Containing MAC Mgmt Msg", "wimax.ucd.uplink_burst_profile.relative_power_offset_ul_burst_mac_mgmt_msg",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_207_ul_initial_transmit_timing,
 		{
-			"UL Initial Transmit Timing", "wimax.ucd.uplink_burst_profile.ul_initial_transmit_timing", 
+			"UL Initial Transmit Timing", "wimax.ucd.uplink_burst_profile.ul_initial_transmit_timing",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_210_fast_feedback_region,
 		{
-			"Fast Feedback Region", "wimax.ucd.uplink_burst_profile.fast_feedback_region", 
+			"Fast Feedback Region", "wimax.ucd.uplink_burst_profile.fast_feedback_region",
 			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_211_harq_ack_region,
 		{
-			"HARQ ACK Region", "wimax.ucd.uplink_burst_profile.harq_ack_region", 
+			"HARQ ACK Region", "wimax.ucd.uplink_burst_profile.harq_ack_region",
 			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_212_ranging_region,
 		{
-			"Ranging Region", "wimax.ucd.uplink_burst_profile.ranging_region", 
+			"Ranging Region", "wimax.ucd.uplink_burst_profile.ranging_region",
 			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_213_sounding_region,
 		{
-			"Sounding Region", "wimax.ucd.uplink_burst_profile.sounding_region", 
+			"Sounding Region", "wimax.ucd.uplink_burst_profile.sounding_region",
 			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_186_upper_bound_aas_preamble,
 		{
-			"Upper Bound AAS Preamble (in units of 0.25 dB)", "wimax.ucd.upper_bound_aas_preamble", 
+			"Upper Bound AAS Preamble (in units of 0.25 dB)", "wimax.ucd.upper_bound_aas_preamble",
 			FT_INT8, BASE_DEC, NULL, 0, "", HFILL
 		}
 	},
 	{
 		&hf_ucd_tlv_t_189_use_cqich_indication_flag,
 		{
-			"Use CQICH Indication Flag", "wimax.ucd.use_cqich_indication_flag", 
+			"Use CQICH Indication Flag", "wimax.ucd.use_cqich_indication_flag",
 			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
 		}
 	}
@@ -933,7 +934,7 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
 				{
 					tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_158_optional_permutation_ul_allocated_subchannels_bitmap, tvb, offset, tlv_len, FALSE);
 					tlv_item = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_158_optional_permutation_ul_allocated_subchannels_bitmap, tvb, offset, tlv_len, FALSE);
-					
+
 					break;
 				}
 				case UCD_TLV_T_159_BAND_AMC_ALLOCATION_THRESHHOLD:
@@ -1161,7 +1162,7 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
 					utemp = tvb_get_guint8(tvb, offset);
 					proto_tree_add_text(tlv_tree, tvb, offset, tlv_len, "Periodic Ranging Backoff Start: 2^%u = %u", utemp, (1 << utemp));
 					break;
-			
+
 				}
 				case UCD_PERIODIC_RANGING_BACKOFF_END:
 				{
@@ -1175,7 +1176,7 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
 					tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_155_start_of_ranging_codes_group, tvb, offset, tlv_len, FALSE);
 					proto_tree_add_item(tlv_tree,hf_ucd_tlv_t_155_start_of_ranging_codes_group, tvb, offset, tlv_len, FALSE);
 					break;
-			
+
 				}
 				case UCD_PERMUTATION_BASE:
 				{
diff --git a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c
index 76c080e2c2..03f2884a42 100644
--- a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c
+++ b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c
@@ -184,7 +184,7 @@ static gint hf_cdlmap_reserved_1 = -1;
 static gint hf_cdlmap_nep_code_1 = -1;
 static gint hf_cdlmap_nsch_code_1 = -1;
 static gint hf_cdlmap_num_bands_1 = -1;
-//static gint hf_cdlmap_band_index_1 = -1;
+/*static gint hf_cdlmap_band_index_1 = -1;*/
 static gint hf_cdlmap_nb_bitmap_1 = -1;
 
 static gint hf_cdlmap_shortened_diuc = -1;
@@ -1518,7 +1518,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf
 		break;
 		case COMPACT_DL_MAP_TYPE_EXTENSION:/* 6.3.2.3.43.6.6 */
 			/* decode the Compact DL-MAP externsion IE */
-			nibble_length = wimax_cdlmap_extension_ie_decoder(tree, pinfo, tvb, dl_map_offset, nibble_offset);//, cqich_indicator);
+			nibble_length = wimax_cdlmap_extension_ie_decoder(tree, pinfo, tvb, dl_map_offset, nibble_offset);/*, cqich_indicator);*/
 			length = nibble_length;
 		break;
 		default:/* Reserved Type */
@@ -1545,7 +1545,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf
 #define MAX_LOGICAL_BANDS_SHIFT_1     (MAX_LOGICAL_BANDS_SHIFT-NUM_UL_AMC_SYMBOLS_SHIFT)
 #define NUM_BROADCAST_SYMBOLS_SHIFT_1 (NUM_BROADCAST_SYMBOLS_SHIFT-NUM_UL_AMC_SYMBOLS_SHIFT)
 #define NUM_DL_AMC_SYMBOLS_SHIFT_1    (NUM_DL_AMC_SYMBOLS_SHIFT-NUM_UL_AMC_SYMBOLS_SHIFT)
-//#define NUM_UL_AMC_SYMBOLS_SHIFT_1    0
+/*#define NUM_UL_AMC_SYMBOLS_SHIFT_1    0*/
 
 /* Compact DL-MAP Format Configuration IE (6.3.2.3.43.2) decoder */
 static guint wimax_compact_dlmap_format_configuration_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset)
diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
index 8b2ca7b1ec..a0d710b102 100644
--- a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
+++ b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
@@ -158,7 +158,7 @@ static gint hf_culmap_reserved_1 = -1;
 static gint hf_culmap_nep_code_1 = -1;
 static gint hf_culmap_nsch_code_1 = -1;
 static gint hf_culmap_num_bands_1 = -1;
-//static gint hf_culmap_band_index_1 = -1;
+/*static gint hf_culmap_band_index_1 = -1;*/
 static gint hf_culmap_nb_bitmap_1 = -1;
 
 static gint hf_culmap_shortened_uiuc = -1;
@@ -1575,7 +1575,7 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf
 		break;
 		case COMPACT_UL_MAP_TYPE_EXTENSION:/* 6.3.2.3.43.7.7 */
 			/* decode the Compact UL-MAP externsion IE */
-			nibble_length = wimax_culmap_extension_ie_decoder(tree, pinfo, tvb, ul_map_offset, nibble_offset);//, cqich_indicator);
+			nibble_length = wimax_culmap_extension_ie_decoder(tree, pinfo, tvb, ul_map_offset, nibble_offset);/*, cqich_indicator);*/
 			length = nibble_length;
 		break;
 		default:/* Reserved Type */
diff --git a/plugins/wimax/wimax_mac.h b/plugins/wimax/wimax_mac.h
index 855cf7ac94..07e8ba88fa 100644
--- a/plugins/wimax/wimax_mac.h
+++ b/plugins/wimax/wimax_mac.h
@@ -173,7 +173,7 @@
 #define		DCD_BURST_DIUC_EXIT_THRESHOLD	151
 #define		DCD_BURST_DIUC_ENTRY_THRESHOLD	152
 #define		DCD_BURST_TCS_ENABLE		153
-//#define		DCD_MAXIMUM_RETRANSMISSION      20
+/*#define		DCD_MAXIMUM_RETRANSMISSION      20*/
 /* TLV types */
 #define		DCD_TLV_T_19_PERMUTATION_TYPE_FOR_BROADCAST_REGION_IN_HARQ_ZONE 19
 #define		DCD_TLV_T_20_MAXIMUM_RETRANSMISSION    20
@@ -259,8 +259,8 @@
 /* Table 357 */
 #define		UCD_BURST_FEC				150
 #define		UCD_BURST_RANGING_DATA_RATIO		151
-//#define		UCD_BURST_POWER_BOOST		151
-//#define		UCD_BURST_TCS_ENABLE		152
+/*#define		UCD_BURST_POWER_BOOST		151*/
+/*#define		UCD_BURST_TCS_ENABLE		152*/
 
 /* RNG-REQ types (Table 364) */
 /* Sorted these values */
@@ -447,9 +447,9 @@
 #define		REG_MAC_CRC_SUPPORT                     12
 #define		REG_MCA_FLOW_CONTROL                    13
 #define		REG_MCAST_POLLING_CIDS                  14
-#define         REG_NUM_DL_TRANS_CID                    15 
+#define         REG_NUM_DL_TRANS_CID                    15
 #if 0 /* WIMAX_16E_2005 changes this to SBC scope */
-#define         REG_PKM_FLOW_CONTROL                    15 
+#define         REG_PKM_FLOW_CONTROL                    15
 #define         REG_AUTH_POLICY_SUPPORT                 16
 #define         REG_MAX_SECURITY_ASSOCIATIONS           17
 #endif
diff --git a/plugins/wimax/wimax_phy_attributes_decoder.c b/plugins/wimax/wimax_phy_attributes_decoder.c
index 755b4c7fda..c54761db66 100644
--- a/plugins/wimax/wimax_phy_attributes_decoder.c
+++ b/plugins/wimax/wimax_phy_attributes_decoder.c
@@ -144,14 +144,14 @@ static void dissect_wimax_phy_attributes_decoder(tvbuff_t *tvb, packet_info *pin
 {
 	guint offset = 0;
 	guint tvb_len;
-//	guint num_of_slots;
+/*	guint num_of_slots;*/
 	proto_item *phy_item = NULL;
 	proto_tree *phy_tree = NULL;
 
 	/* update the info column */
 	if (check_col(pinfo->cinfo, COL_INFO))
 	{
-		//col_append_str(pinfo->cinfo, COL_INFO, "PDU Burst Physical Attributes:");
+		/*col_append_str(pinfo->cinfo, COL_INFO, "PDU Burst Physical Attributes:");*/
 		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "PHY-attr");
 	}
 	if (tree)
@@ -177,7 +177,7 @@ static void dissect_wimax_phy_attributes_decoder(tvbuff_t *tvb, packet_info *pin
 		/* display the number of slots */
 		proto_tree_add_item(phy_tree, hf_phy_attributes_num_of_slots, tvb, offset, 2, FALSE);
 		/* get the number of slots */
-//		num_of_slots =  tvb_get_guint16(tvb, offset);
+/*		num_of_slots =  tvb_get_guint16(tvb, offset);*/
 		/* move to next field */
 		offset += 2;
 		/* display the physical subchannel list */
diff --git a/plugins/wimax/wimax_utils.c b/plugins/wimax/wimax_utils.c
index 8246a30792..2c7419c2f4 100644
--- a/plugins/wimax/wimax_utils.c
+++ b/plugins/wimax/wimax_utils.c
@@ -77,7 +77,7 @@ static gint ett_vendor_id_encoding_decoder = -1;
 static gint ett_ul_service_flow_decoder = -1;
 static gint ett_dl_service_flow_decoder = -1;
 
-/* The following two variables save the Scheduling Service type for 
+/* The following two variables save the Scheduling Service type for
    the Grant Management subheader dissector and track whether or not
    one has been seen.
    */
@@ -490,7 +490,7 @@ static gint hf_cst_pkt_class_rule_tos_low = -1;
 static gint hf_cst_pkt_class_rule_tos_high = -1;
 static gint hf_cst_pkt_class_rule_tos_mask = -1;
 static gint hf_cst_pkt_class_rule_protocol = -1;
-//static gint hf_cst_pkt_class_rule_protocol_number = -1;
+/*static gint hf_cst_pkt_class_rule_protocol_number = -1;*/
 static gint hf_cst_pkt_class_rule_ip_masked_src_address = -1;
 static gint hf_cst_pkt_class_rule_ip_masked_dest_address = -1;
 static gint hf_cst_pkt_class_rule_src_ipv4 = -1;
@@ -546,7 +546,7 @@ static gint hf_csper_atm_classifier = -1;
 static gint hf_csper_atm_classifier_vpi = -1;
 static gint hf_csper_atm_classifier_vci = -1;
 static gint hf_csper_atm_classifier_id = -1;
-//static gint hf_csper_atm_classifier_dsc_action = -1;
+/*static gint hf_csper_atm_classifier_dsc_action = -1;*/
 static gint hf_csper_unknown_type = -1;
 
 static gint hf_xmac_tuple_rsvd = -1;
@@ -1372,7 +1372,7 @@ static gint hf_pkm_msg_crypto_suite = -1;
 static gint hf_pkm_msg_crypto_suite_msb = -1;
 static gint hf_pkm_msg_crypto_suite_middle = -1;
 static gint hf_pkm_msg_crypto_suite_lsb = -1;
-//static gint hf_pkm_msg_version = -1;
+/*static gint hf_pkm_msg_version = -1;*/
 static gint hf_pkm_attr_push_modes = -1;
 static gint hf_pkm_attr_key_push_counter = -1;
 static gint hf_pkm_attr_gkek = -1;
@@ -1919,7 +1919,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type,
 					proto_tree_add_item(tlv_tree, hf_cst_classifier_dsc_action, tvb, offset, tlv_len, FALSE);
 				break;
 				case CST_CLASSIFIER_ERROR_PARAM_SET:
-				case CST_PHS_ERROR_PARAM_SET: 
+				case CST_PHS_ERROR_PARAM_SET:
 					tlv_tree = add_protocol_subtree(&tlv_info, ett_wimax_cst_encoding_rules, csper_tree, proto_wimax_utility_decoders, tvb, offset, tlv_len, "Classifier Error Parameter Set (%u byte(s))", tlv_len);
 					/* call the error parameter set function */
 					wimax_error_parameter_set_decoder(tvb_new_subset(tvb, offset, tlv_len, tlv_len), pinfo, tlv_tree);
@@ -2051,7 +2051,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type,
 								proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_index, tvb, tlv_offset, length, FALSE);
 							break;
 							case CST_PKT_CLASS_RULE_IPv6_FLOW_LABEL:
-//???								if(ipv6)
+/*???								if(ipv6)*/
 								ti_tree = add_tlv_subtree(&tlv_info, ett_wimax_cst_encoding_rules, tlv_tree, hf_cst_pkt_class_rule_ipv6_flow_label, tvb, tlv_offset, length, FALSE);
 								proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_ipv6_flow_label, tvb, tlv_offset, length, FALSE);
 							break;
@@ -2241,7 +2241,7 @@ void wimax_service_flow_encodings_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 				proto_tree_add_item(tlv_tree, hf_sfe_set_active, tvb, offset, 1, FALSE);
 				proto_tree_add_item(tlv_tree, hf_sfe_set_rsvd, tvb, offset, 1, FALSE);
 			break;
-			case SFE_TRAFFIC_PRIORITY: 
+			case SFE_TRAFFIC_PRIORITY:
 				tlv_tree = add_tlv_subtree(&tlv_info, ett_wimax_service_flow_encodings, tree, hf_sfe_traffic_priority, tvb, offset, tlv_len, FALSE);
 				tlv_item = proto_tree_add_item(tlv_tree, hf_sfe_traffic_priority, tvb, offset, tlv_len, FALSE);
 				proto_item_append_text(tlv_item, " (allowed values are 0-7)");
@@ -2922,7 +2922,7 @@ void wimax_pkm_tlv_encoded_attributes_decoder(tvbuff_t *tvb, packet_info *pinfo,
 #if 0 /* rserved by IEE 802.16E */
 			case PKM_ATTR_VERSION:
 				proto_tree_add_item(tree, hf_pkm_msg_version, tvb, offset, tlv_len, FALSE);
-			break; 
+			break;
 #endif
 			case PKM_ATTR_SA_DESCRIPTOR:
 				tlv_tree = add_protocol_subtree(&tlv_info, ett_pkm_tlv_encoded_attributes_decoder, tree, proto_wimax_utility_decoders, tvb, offset, tlv_len, "SA-Descriptor (%u bytes)", tlv_len);
diff --git a/wiretap/k12text.l b/wiretap/k12text.l
index f69b2d7197..367b6aa38d 100644
--- a/wiretap/k12text.l
+++ b/wiretap/k12text.l
@@ -6,7 +6,7 @@
 /*
  * We don't use unput, so don't generate code for it.
  */
-%option nounput 
+%option nounput
 
 /*
  * We don't read from the terminal.
@@ -43,8 +43,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
- 
- /* 
+
+ /*
   * TODO:
   *   - fix timestamps after midnight
   *   - verify encapsulations
@@ -93,9 +93,9 @@ static FILE_T yy_fh;
 #define SET_ENCAP(text) set_encap(text)
 #define ADD_BYTE(text) do {if (i >= 65536) {KERROR("frame too large");} b[i++] = (guint8)strtoul(text,NULL,16); } while(0)
 #define FINALIZE_FRAME() finalize_frame()
-//~ #define ECHO
+/*~ #define ECHO*/
 #define YY_USER_ACTION cum_offset += yyleng;
-#define YY_INPUT(buf,result,max_size) { int c = file_getc(yy_fh);  result = (c==EOF) ? YY_NULL : (buf[0] = c, 1); } 
+#define YY_INPUT(buf,result,max_size) { int c = file_getc(yy_fh);  result = (c==EOF) ? YY_NULL : (buf[0] = c, 1); }
 
 #define MAX_JUNK 400000
 #define ECHO
@@ -152,13 +152,13 @@ static void finalize_frame(void) {
 
 static gboolean k12text_read(wtap *wth, int *err, const gchar ** err_info _U_, gint64 *data_offset) {
 	gint64 start_offset = cum_offset;
-	
+
 	encap = WTAP_ENCAP_UNKNOWN;
 	ok_frame = FALSE;
-	
+
 	BEGIN(NEXT_FRAME);
 	yylex();
-	
+
 	if (ok_frame == FALSE) {
 		if (at_eof) {
 			*err_info = NULL;
@@ -169,17 +169,17 @@ static gboolean k12text_read(wtap *wth, int *err, const gchar ** err_info _U_, g
 		}
 		return FALSE;
 	}
-	
+
 	wth->data_offset = *data_offset = start_offset ;
-	
-	
+
+
 	wth->phdr.ts.secs = 946681200 + (3600*h) + (60*m) + s;
 	wth->phdr.ts.nsecs = 1000000*ms + 1000*ns;
-	
+
 	wth->phdr.caplen = wth->phdr.len = i;
-	
+
 	wth->phdr.pkt_encap = encap;
-	
+
 	buffer_assure_space(wth->frame_buffer, wth->phdr.caplen);
 	memcpy(buffer_start_ptr(wth->frame_buffer), b, wth->phdr.caplen);
 
@@ -198,7 +198,7 @@ static gboolean k12text_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_
 	if ( file_seek(yy_fh, seek_off, SEEK_SET, err) == -1) {
 		return FALSE;
 	}
-	
+
 	BEGIN(NEXT_FRAME);
 	yylex();
 
@@ -207,7 +207,7 @@ static gboolean k12text_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_
 		*err = WTAP_ERR_BAD_RECORD;
 		return FALSE;
 	}
-		
+
 	memcpy(pd, b, length);
 
 	cum_offset = save_offset ;
@@ -219,16 +219,16 @@ static void k12text_close(wtap *wth _U_) {
 }
 
 int k12text_open(wtap *wth, int *err, gchar **err_info _U_) {
-	
+
 	cum_offset = 0;
-	
+
 	RESET();
 	yy_fh = wth->fh;
 	BEGIN(MAGIC);
 	yylex();
 
 	if (! is_k12text) return 0;
-	
+
 	if ( file_seek(yy_fh, 0, SEEK_SET, err) == -1) {
 		return -1;
 	}
@@ -243,7 +243,7 @@ int k12text_open(wtap *wth, int *err, gchar **err_info _U_) {
 	wth->subtype_seek_read = (void*)k12text_seek_read;
 	wth->subtype_close = k12text_close;
 	wth->capture.generic  = NULL;
-	wth->tsprecision = WTAP_FILE_TSPREC_NSEC;    
+	wth->tsprecision = WTAP_FILE_TSPREC_NSEC;
 
 	return 1;
 }
@@ -269,7 +269,7 @@ static gboolean k12text_dump(wtap_dumper *wdh _U_, const struct wtap_pkthdr *phd
 	guint i;
 	guint ns;
 	guint ms;
-	
+
 	ms = phdr->ts.nsecs / 1000000;
 	ns = (phdr->ts.nsecs - (1000000*ms))/1000;
 
@@ -277,7 +277,7 @@ static gboolean k12text_dump(wtap_dumper *wdh _U_, const struct wtap_pkthdr *phd
 		str_enc = encaps[i].s;
 		if (phdr->pkt_encap == encaps[i].e) break;
 	}
-	
+
 	strftime(p,90,"+---------+---------------+----------+\r\n%H:%M:%S,",gmtime(&phdr->ts.secs));
 	p+= strlen(p);
 	sprintf(p,"%.3d,%.3d   %s\r\n|0   |",ms,ns,str_enc);
@@ -287,11 +287,11 @@ static gboolean k12text_dump(wtap_dumper *wdh _U_, const struct wtap_pkthdr *phd
 		sprintf(p,"%.2x|",pd[i]);
 		p+= 3;
 	}
-	
+
 	sprintf(p,"\r\n\r\n");
-	
+
 	fwrite(buf, 1, strlen(buf), wdh->fh);
-	
+
 	return TRUE;
 }
 
@@ -301,12 +301,12 @@ static gboolean k12text_dump_close(wtap_dumper *wdh _U_ , int *err _U_) {
 }
 
 gboolean k12text_dump_open(wtap_dumper *wdh, gboolean cant_seek, int *err) {
-    
+
     if (cant_seek) {
         *err = WTAP_ERR_CANT_WRITE_TO_PIPE;
         return FALSE;
     }
-    
+
     wdh->subtype_write = k12text_dump;
     wdh->subtype_close = k12text_dump_close;