aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2012-12-14 02:27:05 +0000
committerMartin Kaiser <wireshark@kaiser.cx>2012-12-14 02:27:05 +0000
commit387323569da5dd13a1b2eaa2d4c80d335bce0461 (patch)
tree2aede369b88332c606c90b14478ae691a45116ea
parentca01731e86983b3a41a93ea075a573a9e784d4b8 (diff)
fix
packet-h248_3gpp.c: In function ‘dissect_3gcsd_plmnbc’: packet-h248_3gpp.c:168: error: cast to pointer from integer of different size make[5]: *** [libdissectors_la-packet-h248_3gpp.lo] Error 1 I guess the last parameter of dissect_3gcsd_plmnbc() is a pointer to a boolean variable. Call it implicit_param, not implicit, as there's already a global variable 'implicit'. Feel free to correct the fix if I got it wrong. svn path=/trunk/; revision=46534
-rw-r--r--epan/dissectors/packet-h248_3gpp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-h248_3gpp.c b/epan/dissectors/packet-h248_3gpp.c
index 58f08e66d7..c0e3496e50 100644
--- a/epan/dissectors/packet-h248_3gpp.c
+++ b/epan/dissectors/packet-h248_3gpp.c
@@ -161,11 +161,11 @@ static gint ett_h248_3GCSD_evt_protres = -1;
static gint ett_h248_3GCSD_evt_ratechg = -1;
static gint ett_pkg_3GCSD_sig_actprot = -1;
-static void dissect_3gcsd_plmnbc(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* cu _U_, void* ignored _U_) {
+static void dissect_3gcsd_plmnbc(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* cu _U_, void* implicit_param) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
- dissect_ber_octet_string(implicit ? *((gboolean*)implicit) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, NULL);
+ dissect_ber_octet_string(implicit_param ? *((gboolean*)implicit_param) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, NULL);
de_bearer_cap(tvb, tree, pinfo, 4, tvb_length(tvb)-4, NULL, 0);
}