Squelch a bunch of compiler warnings.

svn path=/trunk/; revision=31961

9 files changed, 35 insertions, 35 deletions

diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c
index 5352cdd76b..483117df32 100644
--- a/asn1/ansi_map/packet-ansi_map-template.c
+++ b/asn1/ansi_map/packet-ansi_map-template.c
@@ -390,7 +390,7 @@ TransactionId_table_cleanup(gpointer key , gpointer value, gpointer user_data _U
 
 }
 
-void
+static void
 ansi_map_init_transaction_table(void){
 
     /* Destroy any existing memory chunks / hashes. */
@@ -585,7 +585,7 @@ static dgt_set_t Dgt1_9_bcd = {
 };
 /* Assumes the rest of the tvb contains the digits to be turned into a string
  */
-static char*
+static const char*
 unpack_digits2(tvbuff_t *tvb, int offset,dgt_set_t *dgt){
 
     int length;
@@ -686,7 +686,7 @@ static const value_string ansi_map_np_vals[]  = {
 
 static void
 dissect_ansi_map_min_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){
-    char *digit_str;
+    const char *digit_str;
     int   offset = 0;
 
     proto_tree *subtree;
@@ -705,7 +705,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
     guint8 octet , octet_len;
     guint8 b1,b2,b3,b4;
     int    offset = 0;
-    char  *digit_str;
+    const char *digit_str;
 
     proto_tree *subtree;
 
diff --git a/asn1/gsm_map/gsm_map.cnf b/asn1/gsm_map/gsm_map.cnf
index 73480f62d5..6f555563d5 100644
--- a/asn1/gsm_map/gsm_map.cnf
+++ b/asn1/gsm_map/gsm_map.cnf
@@ -195,7 +195,7 @@ MAP-DialoguePDU				B "0.4.0.0.1.1.1.1" "map-DialogueAS"
 
 #.FN_BODY TBCD-STRING VAL_PTR = &parameter_tvb
  tvbuff_t	*parameter_tvb;
- char		*digit_str;
+ const char	*digit_str;
 
  %(DEFAULT_BODY)s
 
diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c
index 55c2a9eb30..5d8e92b24f 100644
--- a/asn1/gsm_map/packet-gsm_map-template.c
+++ b/asn1/gsm_map/packet-gsm_map-template.c
@@ -234,7 +234,7 @@ static const value_string gsm_map_disc_par_vals[] = {
   { 0, NULL }
 };
 
-char *
+const char *
 unpack_digits(tvbuff_t *tvb, int offset) {
 
 	int length;
@@ -245,7 +245,7 @@ unpack_digits(tvbuff_t *tvb, int offset) {
 	length = tvb_length(tvb);
 	if (length < offset)
 		return "";
-	digit_str = ep_alloc((length - offset)*2+1);
+	digit_str = (char *)ep_alloc((length - offset)*2+1);
 
 	while ( offset < length ){
 
@@ -719,7 +719,7 @@ dissect_cbs_data_coding_scheme(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
 void
 dissect_gsm_map_msisdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 {
- char		*digit_str;
+ const char	*digit_str;
  guint8		octet;
  guint8		na;
  guint8		np;
diff --git a/asn1/gsm_map/packet-gsm_map-template.h b/asn1/gsm_map/packet-gsm_map-template.h
index b82af1aea7..6f167adeb8 100644
--- a/asn1/gsm_map/packet-gsm_map-template.h
+++ b/asn1/gsm_map/packet-gsm_map-template.h
@@ -44,7 +44,7 @@ typedef struct _gsm_map_tap_rec_t {
 #define SMS_ENCODING_UCS2_LANG	5
 
 WS_VAR_IMPORT const value_string gsm_map_opr_code_strings[];
-char* unpack_digits(tvbuff_t *tvb, int offset);
+const char* unpack_digits(tvbuff_t *tvb, int offset);
 
 extern const value_string ssCode_vals[];
 extern const value_string gsm_map_PDP_Type_Organisation_vals[];
diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf
index 2c1ae2f89c..ba25509096 100644
--- a/asn1/ldap/ldap.cnf
+++ b/asn1/ldap/ldap.cnf
@@ -322,7 +322,7 @@ ldap_conv_info_t *ldap_info;
 
 #.FN_BODY LDAPString VAL_PTR = &parameter_tvb
   tvbuff_t	*parameter_tvb = NULL;
-  char          *ldapstring = NULL;
+  const char    *ldapstring = NULL;
   gchar		*sc = NULL; /* semi-colon pointer */
 
   %(DEFAULT_BODY)s
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index db2e07a300..741dc3dc1f 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -418,7 +418,7 @@ static int dissect_mscldap_ntver_flags(proto_tree *parent_tree, tvbuff_t *tvb, i
 }
 
 /* This string contains the last LDAPString that was decoded */
-static char *attributedesc_string=NULL;
+static const char *attributedesc_string=NULL;
 
 /* This string contains the last AssertionValue that was decoded */
 static char *ldapvalue_string=NULL;
@@ -542,14 +542,14 @@ finished:
 }
 
 /* This string contains the last Filter item that was decoded */
-static char *Filter_string=NULL;
+static const char *Filter_string=NULL;
 static char *and_filter_string=NULL;
 static char *or_filter_string=NULL;
 static char *substring_value=NULL;
-static char *substring_item_init=NULL;
-static char *substring_item_any=NULL;
-static char *substring_item_final=NULL;
-static char *matching_rule_string=NULL;
+static const char *substring_item_init=NULL;
+static const char *substring_item_any=NULL;
+static const char *substring_item_final=NULL;
+static const char *matching_rule_string=NULL;
 static gboolean matching_rule_dnattr=FALSE;
 
 /* Global variables */
@@ -1234,22 +1234,22 @@ static int dissect_mscldap_netlogon_flags(proto_tree *parent_tree, tvbuff_t *tvb
   proto_item *item;
   proto_tree *tree=NULL;
   guint fields[] = {
-			 hf_mscldap_netlogon_flags_fnc,
-		     hf_mscldap_netlogon_flags_dnc,
-		     hf_mscldap_netlogon_flags_dns,
-		     hf_mscldap_netlogon_flags_wdc,
-		     hf_mscldap_netlogon_flags_rodc,
-			 hf_mscldap_netlogon_flags_ndnc,
-		     hf_mscldap_netlogon_flags_good_timeserv,
-		     hf_mscldap_netlogon_flags_writable,
-		     hf_mscldap_netlogon_flags_closest,
-		     hf_mscldap_netlogon_flags_timeserv,
-		     hf_mscldap_netlogon_flags_kdc,
-		     hf_mscldap_netlogon_flags_ds,
-		     hf_mscldap_netlogon_flags_ldap,
-		     hf_mscldap_netlogon_flags_gc,
-		     hf_mscldap_netlogon_flags_pdc,
-			 0 };
+             hf_mscldap_netlogon_flags_fnc,
+             hf_mscldap_netlogon_flags_dnc,
+             hf_mscldap_netlogon_flags_dns,
+             hf_mscldap_netlogon_flags_wdc,
+             hf_mscldap_netlogon_flags_rodc,
+             hf_mscldap_netlogon_flags_ndnc,
+             hf_mscldap_netlogon_flags_good_timeserv,
+             hf_mscldap_netlogon_flags_writable,
+             hf_mscldap_netlogon_flags_closest,
+             hf_mscldap_netlogon_flags_timeserv,
+             hf_mscldap_netlogon_flags_kdc,
+             hf_mscldap_netlogon_flags_ds,
+             hf_mscldap_netlogon_flags_ldap,
+             hf_mscldap_netlogon_flags_gc,
+             hf_mscldap_netlogon_flags_pdc,
+             0 };
   guint  *field;
   header_field_info *hfi;
   gboolean one_bit_set = FALSE;
diff --git a/asn1/pkcs12/pkcs12.cnf b/asn1/pkcs12/pkcs12.cnf
index 1d7f470fdb..3c182b1221 100644
--- a/asn1/pkcs12/pkcs12.cnf
+++ b/asn1/pkcs12/pkcs12.cnf
@@ -148,7 +148,7 @@ PrivateKeyInfo
 	
 
 	dissector_handle=create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12);
-	dissector_change_string("ber.oid", (gchar*) object_identifier_id, dissector_handle);
+	dissector_change_string("ber.oid", object_identifier_id, dissector_handle);
 	
 	PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, actx->created_item);
 	
diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf
index 9712d5801a..98736bc7d6 100644
--- a/asn1/ranap/ranap.cnf
+++ b/asn1/ranap/ranap.cnf
@@ -177,7 +177,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 
 #.FN_BODY IMSI
   tvbuff_t* imsi_tvb;
-  char		*digit_str;
+  const char	*digit_str;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
                                        3, 8, FALSE, &imsi_tvb);
diff --git a/asn1/rrc/packet-rrc-template.h b/asn1/rrc/packet-rrc-template.h
index 111acdaa45..ef01c1c9ab 100644
--- a/asn1/rrc/packet-rrc-template.h
+++ b/asn1/rrc/packet-rrc-template.h
@@ -34,7 +34,7 @@ enum rrc_message_type {
 	RRC_MESSAGE_TYPE_UL_CCCH,
 	RRC_MESSAGE_TYPE_DL_CCCH,
 	RRC_MESSAGE_TYPE_UL_DCCH,
-	RRC_MESSAGE_TYPE_DL_DCCH,
+	RRC_MESSAGE_TYPE_DL_DCCH
 };
 
 #define MAX_RRC_FRAMES	64