Have rose_ctx_t passed into subdissectors instead of using pinfo->private_data.

svn path=/trunk/; revision=53061

1 files changed, 9 insertions, 9 deletions

diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c
index 2771b0cfa5..5baa7f339c 100644
--- a/epan/dissectors/packet-qsig.c
+++ b/epan/dissectors/packet-qsig.c
@@ -12380,9 +12380,9 @@ static const qsig_err_t *get_err(gint32 errcode) {
 
 /*--- dissect_qsig_arg ------------------------------------------------------*/
 static int
-dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
+dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) {
   int offset;
-  rose_ctx_t *rctx;
+  rose_ctx_t *rctx = get_rose_ctx(data);
   gint32 opcode = 0, service;
   const qsig_op_t *op_ptr;
   const gchar *p;
@@ -12390,7 +12390,7 @@ dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
   proto_tree *qsig_tree;
 
   offset = 0;
-  rctx = get_rose_ctx(pinfo->private_data);
+
   DISSECTOR_ASSERT(rctx);
   if (rctx->d.pdu != 1)  /* invoke */
     return offset;
@@ -12436,9 +12436,9 @@ dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
 
 /*--- dissect_qsig_res -------------------------------------------------------*/
 static int
-dissect_qsig_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
+dissect_qsig_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) {
   gint offset;
-  rose_ctx_t *rctx;
+  rose_ctx_t *rctx = get_rose_ctx(data);
   gint32 opcode, service;
   const qsig_op_t *op_ptr;
   const gchar *p;
@@ -12446,7 +12446,7 @@ dissect_qsig_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
   proto_tree *qsig_tree;
 
   offset = 0;
-  rctx = get_rose_ctx(pinfo->private_data);
+
   DISSECTOR_ASSERT(rctx);
   if (rctx->d.pdu != 2)  /* returnResult */
     return offset;
@@ -12487,9 +12487,9 @@ dissect_qsig_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
 
 /*--- dissect_qsig_err ------------------------------------------------------*/
 static int
-dissect_qsig_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
+dissect_qsig_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) {
   int offset;
-  rose_ctx_t *rctx;
+  rose_ctx_t *rctx = get_rose_ctx(data);
   gint32 errcode;
   const qsig_err_t *err_ptr;
   const gchar *p;
@@ -12497,7 +12497,7 @@ dissect_qsig_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
   proto_tree *qsig_tree;
 
   offset = 0;
-  rctx = get_rose_ctx(pinfo->private_data);
+
   DISSECTOR_ASSERT(rctx);
   if (rctx->d.pdu != 3)  /* returnError */
     return offset;