Various small changes:

- add a missing test on null pointer
- always initialize rrc_nas_sys_info_gsm_map_type with a value from its associated enum
- fix some typo errors
- remove some useless directives from conformance file
- detabify files (ASN.1 generated dissectors are indented with spaces)

svn path=/trunk/; revision=44358

1 files changed, 18 insertions, 18 deletions

diff --git a/asn1/rrc/packet-rrc-template.h b/asn1/rrc/packet-rrc-template.h
index 0b4ce10059..6282aa460d 100644
--- a/asn1/rrc/packet-rrc-template.h
+++ b/asn1/rrc/packet-rrc-template.h
@@ -25,38 +25,38 @@
 #ifndef PACKET_RRC_H
 #define PACKET_RRC_H
 
-#include <epan/asn1.h>	/* Needed for non asn1 dissectors?*/
+#include <epan/asn1.h>    /* Needed for non asn1 dissectors?*/
 
 extern int proto_rrc;
 #include "packet-rrc-exp.h"
 
 enum rrc_message_type {
-	RRC_MESSAGE_TYPE_INVALID	= 0,
-	RRC_MESSAGE_TYPE_PCCH		= 1,
-	RRC_MESSAGE_TYPE_UL_CCCH,
-	RRC_MESSAGE_TYPE_DL_CCCH,
-	RRC_MESSAGE_TYPE_UL_DCCH,
-	RRC_MESSAGE_TYPE_DL_DCCH,
-	RRC_MESSAGE_TYPE_BCCH_FACH
+  RRC_MESSAGE_TYPE_INVALID    = 0,
+  RRC_MESSAGE_TYPE_PCCH        = 1,
+  RRC_MESSAGE_TYPE_UL_CCCH,
+  RRC_MESSAGE_TYPE_DL_CCCH,
+  RRC_MESSAGE_TYPE_UL_DCCH,
+  RRC_MESSAGE_TYPE_DL_DCCH,
+  RRC_MESSAGE_TYPE_BCCH_FACH
 };
 
-#define MAX_RRC_FRAMES	64
+#define MAX_RRC_FRAMES    64
 typedef struct rrc_info
 {
-	enum rrc_message_type msgtype[MAX_RRC_FRAMES];
+  enum rrc_message_type msgtype[MAX_RRC_FRAMES];
 } rrc_info;
 
 /*Struct for storing ciphering information*/
 typedef struct rrc_ciph_info_
 {
-	int seq_no[31][2];	/*Indicates for each Rbid when ciphering starts*/
-	GTree * /*guint32*/ start_cs;	/*Start value for CS counter*/
-	GTree * /*guint32*/ start_ps;	/*Start value for PS counter*/
-	guint32 conf_algo_indicator;	/*Indicates which type of ciphering algorithm used*/
-	guint32 int_algo_indiccator;	/*Indicates which type of integrity algorithm used*/
-	unsigned int setup_frame;	/*Store which frame contained this information*/	
-	guint32 ps_conf_counters[31][2];	/*This should also be made for CS*/
-	
+  int seq_no[31][2];    /*Indicates for each Rbid when ciphering starts*/
+  GTree * /*guint32*/ start_cs;    /*Start value for CS counter*/
+  GTree * /*guint32*/ start_ps;    /*Start value for PS counter*/
+  guint32 conf_algo_indicator;    /*Indicates which type of ciphering algorithm used*/
+  guint32 int_algo_indiccator;    /*Indicates which type of integrity algorithm used*/
+  unsigned int setup_frame;    /*Store which frame contained this information*/    
+  guint32 ps_conf_counters[31][2];    /*This should also be made for CS*/
+  
 } rrc_ciphering_info;
 
 extern GTree * hsdsch_muxed_flows;