diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 21:22:31 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 21:22:31 +0000 |
| commit | 7c56677cf9e703e6dde30529b24e27dd2a4960a9 (patch) | |
| tree | 5d78d22112806bca22edbc8e069f77503269b381 /asn1/qsig | |
| parent | b8481499646f07512ceddac567887072822dffdb (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48429
Diffstat (limited to 'asn1/qsig')
| -rw-r--r-- | asn1/qsig/packet-qsig-template.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c index 583a7977e4..beb5c4fe3a 100644 --- a/asn1/qsig/packet-qsig-template.c +++ b/asn1/qsig/packet-qsig-template.c @@ -387,7 +387,7 @@ dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data opcode = rctx->d.code_local; op_ptr = get_op(opcode); } else if (rctx->d.code == 1) { /* global */ - op_ptr = g_hash_table_lookup(qsig_oid2op_hashtable, rctx->d.code_global); + op_ptr = (qsig_op_t *)g_hash_table_lookup(qsig_oid2op_hashtable, rctx->d.code_global); if (op_ptr) opcode = op_ptr->opcode; } else { return offset; @@ -603,7 +603,7 @@ static void qsig_init_tables(void) { for (i=0; i<array_length(qsig_op_tab); i++) { opcode = qsig_op_tab[i].opcode; oid = g_strdup_printf("1.3.12.9.%d", opcode); - key = g_malloc(sizeof(gint)); + key = (gint *)g_malloc(sizeof(gint)); *key = opcode; g_hash_table_insert(qsig_opcode2oid_hashtable, key, oid); g_hash_table_insert(qsig_oid2op_hashtable, g_strdup(oid), (gpointer)&qsig_op_tab[i]); @@ -692,7 +692,7 @@ void proto_reg_handoff_qsig(void) { dissector_add_uint("q932.ros.local.arg", qsig_op_tab[i].opcode, qsig_arg_handle); dissector_add_uint("q932.ros.local.res", qsig_op_tab[i].opcode, qsig_res_handle); key = qsig_op_tab[i].opcode; - oid = g_hash_table_lookup(qsig_opcode2oid_hashtable, &key); + oid = (const gchar *)g_hash_table_lookup(qsig_opcode2oid_hashtable, &key); if (oid) { dissector_add_string("q932.ros.global.arg", oid, qsig_arg_handle); dissector_add_string("q932.ros.global.res", oid, qsig_res_handle); |