diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-05-01 20:54:31 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-05-01 20:54:31 +0000 |
| commit | b787f03df35e6ea3112014227b3078affa1768b3 (patch) | |
| tree | e4bbc68759a801777337eb9bb2399f03cf274073 /asn1/cmp | |
| parent | bf579224ae30b015206d602d976998c8bbab06f3 (diff) | |
Remove some global variables in favor of private_data member of asn1_ctx_t. Bug 7060 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7060). This should (mostly) passify the bug, but it appears like this could be done with a lot more ASN.1 dissectors.
svn path=/trunk/; revision=49117
Diffstat (limited to 'asn1/cmp')
| -rw-r--r-- | asn1/cmp/cmp.cnf | 4 | ||||
| -rw-r--r-- | asn1/cmp/packet-cmp-template.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/asn1/cmp/cmp.cnf b/asn1/cmp/cmp.cnf index 4f6c709cd8..5547867297 100644 --- a/asn1/cmp/cmp.cnf +++ b/asn1/cmp/cmp.cnf @@ -84,10 +84,10 @@ RevAnnContent/status pkistatus #.FN_PARS InfoTypeAndValue/infoType - FN_VARIANT = _str HF_INDEX = hf_cmp_type_oid VAL_PTR = &object_identifier_id + FN_VARIANT = _str HF_INDEX = hf_cmp_type_oid VAL_PTR = (const char**)&actx->private_data #.FN_BODY InfoTypeAndValue/infoValue - offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); + offset=call_ber_oid_callback((const char*)actx->private_data, tvb, offset, actx->pinfo, tree); #.FN_PARS PKIBody VAL_PTR = &branch_taken diff --git a/asn1/cmp/packet-cmp-template.c b/asn1/cmp/packet-cmp-template.c index be42981d41..857290b7d8 100644 --- a/asn1/cmp/packet-cmp-template.c +++ b/asn1/cmp/packet-cmp-template.c @@ -71,10 +71,6 @@ static int hf_cmp_tcptrans10_flags = -1; /* Initialize the subtree pointers */ static gint ett_cmp = -1; #include "packet-cmp-ett.c" - -static const char *object_identifier_id; - - #include "packet-cmp-fn.c" static int |