Don't cast away constness.

svn path=/trunk/; revision=54800

8 files changed, 18 insertions, 18 deletions

diff --git a/asn1/ansi_tcap/ansi_tcap.cnf b/asn1/ansi_tcap/ansi_tcap.cnf
index 5d9591a133..aa8e1cfe0b 100644
--- a/asn1/ansi_tcap/ansi_tcap.cnf
+++ b/asn1/ansi_tcap/ansi_tcap.cnf
@@ -117,7 +117,7 @@ OperationCode/private    VAL_PTR = &ansi_tcap_private.d.OperationCode_private
  static const char * oid_str;
 
  %(DEFAULT_BODY)s
- 	ansi_tcap_private.objectApplicationId_oid= (void*) oid_str;
+ 	ansi_tcap_private.objectApplicationId_oid= (const void*) oid_str;
 	ansi_tcap_private.oid_is_present=TRUE;
 
 #.FN_HDR PackageType/unidirectional
diff --git a/asn1/ansi_tcap/packet-ansi_tcap-template.h b/asn1/ansi_tcap/packet-ansi_tcap-template.h
index b5bda6caad..4056b2bee2 100644
--- a/asn1/ansi_tcap/packet-ansi_tcap-template.h
+++ b/asn1/ansi_tcap/packet-ansi_tcap-template.h
@@ -32,7 +32,7 @@
 struct ansi_tcap_private_t {
   guint32 signature;
   gboolean oid_is_present; /* Is the Application Context Version present */
-  void * objectApplicationId_oid;
+  const void * objectApplicationId_oid;
   guint32 session_id;
   void * context;
   gchar *TransactionID_str;
diff --git a/asn1/tcap/tcap.cnf b/asn1/tcap/tcap.cnf
index c32c6ae20f..f70521d079 100644
--- a/asn1/tcap/tcap.cnf
+++ b/asn1/tcap/tcap.cnf
@@ -106,17 +106,17 @@ ENDTRY;
 #----------------------------------------------------------------------------------------
 #.FN_BODY AUDT-apdu/_untag/application-context-name  FN_VARIANT = _str  VAL_PTR = &cur_oid
 %(DEFAULT_BODY)s
-	tcap_private.oid= (void*) cur_oid;
+	tcap_private.oid= (const void*) cur_oid;
 	tcap_private.acv=TRUE;
 #----------------------------------------------------------------------------------------
 #.FN_BODY AARQ-apdu/_untag/application-context-name  FN_VARIANT = _str  VAL_PTR = &cur_oid
 %(DEFAULT_BODY)s
-	tcap_private.oid= (void*) cur_oid;
+	tcap_private.oid= (const void*) cur_oid;
 	tcap_private.acv=TRUE;
 #----------------------------------------------------------------------------------------
 #.FN_BODY AARE-apdu/_untag/application-context-name  FN_VARIANT = _str  VAL_PTR = &cur_oid
 %(DEFAULT_BODY)s
-	tcap_private.oid= (void*) cur_oid;
+	tcap_private.oid= (const void*) cur_oid;
 	tcap_private.acv=TRUE;
 #----------------------------------------------------------------------------------------
 #.FN_BODY OrigTransactionID
diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c
index a639b8f4cd..cc6802a8a9 100644
--- a/epan/dissectors/packet-ansi_tcap.c
+++ b/epan/dissectors/packet-ansi_tcap.c
@@ -711,7 +711,7 @@ dissect_ansi_tcap_ObjectIDApplicationContext(gboolean implicit_tag _U_, tvbuff_t
    offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
                                       hf_index, BER_CLASS_PRI, 28, TRUE, dissect_ansi_tcap_OBJECT_IDENTIFIER);
 
- 	ansi_tcap_private.objectApplicationId_oid= (void*) oid_str;
+ 	ansi_tcap_private.objectApplicationId_oid= (const void*) oid_str;
 	ansi_tcap_private.oid_is_present=TRUE;
 
 
diff --git a/epan/dissectors/packet-ansi_tcap.h b/epan/dissectors/packet-ansi_tcap.h
index e0de03b1c1..877eb56251 100644
--- a/epan/dissectors/packet-ansi_tcap.h
+++ b/epan/dissectors/packet-ansi_tcap.h
@@ -40,7 +40,7 @@
 struct ansi_tcap_private_t {
   guint32 signature;
   gboolean oid_is_present; /* Is the Application Context Version present */
-  void * objectApplicationId_oid;
+  const void * objectApplicationId_oid;
   guint32 session_id;
   void * context;
   gchar *TransactionID_str;
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index 39234a7d7c..5a38295374 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -1063,7 +1063,7 @@ dissect_tcap_AUDT_application_context_name(gboolean implicit_tag _U_, tvbuff_t *
 #line 108 "../../asn1/tcap/tcap.cnf"
   offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &cur_oid);
 
-	tcap_private.oid= (void*) cur_oid;
+	tcap_private.oid= (const void*) cur_oid;
 	tcap_private.acv=TRUE;
 
 
@@ -1160,7 +1160,7 @@ dissect_tcap_AARQ_application_context_name(gboolean implicit_tag _U_, tvbuff_t *
 #line 113 "../../asn1/tcap/tcap.cnf"
   offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &cur_oid);
 
-	tcap_private.oid= (void*) cur_oid;
+	tcap_private.oid= (const void*) cur_oid;
 	tcap_private.acv=TRUE;
 
 
@@ -1228,7 +1228,7 @@ dissect_tcap_AARE_application_context_name(gboolean implicit_tag _U_, tvbuff_t *
 #line 118 "../../asn1/tcap/tcap.cnf"
   offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &cur_oid);
 
-	tcap_private.oid= (void*) cur_oid;
+	tcap_private.oid= (const void*) cur_oid;
 	tcap_private.acv=TRUE;
 
 
diff --git a/epan/oids.c b/epan/oids.c
index a1c88a4858..169319bbac 100644
--- a/epan/oids.c
+++ b/epan/oids.c
@@ -1195,16 +1195,16 @@ const gchar *oid_resolved(guint32 num_subids, guint32* subids) {
 	}
 }
 
-extern void oid_both(guint oid_len, guint32 *subids, char** resolved_p, char** numeric_p) {
-	*resolved_p = (char *)oid_resolved(oid_len,subids);
-	*numeric_p = (char *)oid_subid2string(subids,oid_len);
+extern void oid_both(guint oid_len, guint32 *subids, const char** resolved_p, const char** numeric_p) {
+	*resolved_p = oid_resolved(oid_len,subids);
+	*numeric_p = oid_subid2string(subids,oid_len);
 }
 
-extern void oid_both_from_encoded(const guint8 *oid, gint oid_len, char** resolved_p, char** numeric_p) {
+extern void oid_both_from_encoded(const guint8 *oid, gint oid_len, const char** resolved_p, const char** numeric_p) {
 	guint32* subids;
 	guint subids_len = oid_encoded2subid(oid, oid_len, &subids);
-	*resolved_p = (char *)oid_resolved(subids_len,subids);
-	*numeric_p = (char *)oid_subid2string(subids,subids_len);
+	*resolved_p = oid_resolved(subids_len,subids);
+	*numeric_p = oid_subid2string(subids,subids_len);
 }
 
 void oid_both_from_string(const gchar *oid_str, const char** resolved_p, const char** numeric_p) {
diff --git a/epan/oids.h b/epan/oids.h
index 0150c8e24f..760857f579 100644
--- a/epan/oids.h
+++ b/epan/oids.h
@@ -163,8 +163,8 @@ WS_DLL_PUBLIC const gchar *rel_oid_resolved_from_encoded(const guint8 *oid, gint
 WS_DLL_PUBLIC const gchar *oid_resolved_from_string(const gchar *oid_str);
 
 /* these yield two formated strings one resolved and one numeric */
-WS_DLL_PUBLIC void oid_both(guint oid_len, guint32 *subids, char** resolved_p, char** numeric_p);
-WS_DLL_PUBLIC void oid_both_from_encoded(const guint8 *oid, gint oid_len, char** resolved_p, char** numeric_p);
+WS_DLL_PUBLIC void oid_both(guint oid_len, guint32 *subids, const char** resolved_p, const char** numeric_p);
+WS_DLL_PUBLIC void oid_both_from_encoded(const guint8 *oid, gint oid_len, const char** resolved_p, const char** numeric_p);
 WS_DLL_PUBLIC void oid_both_from_string(const gchar *oid_str, const char** resolved_p, const char** numeric_p);
 
 /*