osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Don't cast away constness. 

svn path=/trunk/; revision=54800
This commit is contained in:
Guy Harris 2014-01-14 18:35:36 +00:00
parent d99e0b13d4
commit f862fc40ba
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/ansi_tcap/ansi_tcap.cnf
View File

@ -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

2
asn1/ansi_tcap/packet-ansi_tcap-template.h
View File

@ -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;

6
asn1/tcap/tcap.cnf
View File

@ -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

2
epan/dissectors/packet-ansi_tcap.c
View File

@ -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;

2
epan/dissectors/packet-ansi_tcap.h
View File

@ -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;

6
epan/dissectors/packet-tcap.c
View File

@ -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;

12
epan/oids.c
View File

@ -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) {

4
epan/oids.h
View File

@ -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);
/*