diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-03 12:57:58 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-03 12:57:58 +0000 |
| commit | 149de99d6866105dc07b9ec180d4ce0db3b777e1 (patch) | |
| tree | 6533efa45f0acb10d741ffce1f0cfafb658d7c25 /asn1/h450 | |
| parent | 0dc80637daa1990f5b091e33a9b2da0f9e8802e5 (diff) | |
Have rose_ctx_t passed into subdissectors instead of using pinfo->private_data.
svn path=/trunk/; revision=53061
Diffstat (limited to 'asn1/h450')
| -rw-r--r-- | asn1/h450/packet-h450-template.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c index cd0ab0a2e0..003546e9ef 100644 --- a/asn1/h450/packet-h450-template.c +++ b/asn1/h450/packet-h450-template.c @@ -111,16 +111,16 @@ static const h450_err_t *get_err(gint32 errcode) { /*--- dissect_h450_arg ------------------------------------------------------*/ static int -dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { +dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { proto_item *hidden_item; int offset; - rose_ctx_t *rctx; + rose_ctx_t *rctx = get_rose_ctx(data); gint32 opcode; const h450_op_t *op_ptr; const gchar *p; offset = 0; - rctx = get_rose_ctx(pinfo->private_data); + DISSECTOR_ASSERT(rctx); if (rctx->d.pdu != 1) /* invoke */ return offset; @@ -153,16 +153,16 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data /*--- dissect_h450_res ------------------------------------------------------*/ static int -dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { +dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { proto_item *hidden_item; int offset; - rose_ctx_t *rctx; + rose_ctx_t *rctx = get_rose_ctx(data); gint32 opcode; const h450_op_t *op_ptr; const gchar *p; offset = 0; - rctx = get_rose_ctx(pinfo->private_data); + DISSECTOR_ASSERT(rctx); if (rctx->d.pdu != 2) /* returnResult */ return offset; @@ -195,16 +195,16 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data /*--- dissect_h450_err ------------------------------------------------------*/ static int -dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { +dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { proto_item *hidden_item; int offset; - rose_ctx_t *rctx; + rose_ctx_t *rctx = get_rose_ctx(data); gint32 errcode; const h450_err_t *err_ptr; const gchar *p; offset = 0; - rctx = get_rose_ctx(pinfo->private_data); + DISSECTOR_ASSERT(rctx); if (rctx->d.pdu != 3) /* returnError */ return offset; |