diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-03-02 22:54:39 +0000 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-03-02 22:54:39 +0000 |
commit | 0a17799d614a4d0720d98e2ccea3e78502855f82 (patch) | |
tree | 5acbe7b75c477e14b7a7231298247354b4c88688 /epan/dissectors/packet-dcerpc-srvsvc.c | |
parent | 1eb5e1d73970baa2bf0dd603e5da02c9b6a2e617 (diff) |
From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from most of the dcerpc code
svn path=/trunk/; revision=48023
Diffstat (limited to 'epan/dissectors/packet-dcerpc-srvsvc.c')
-rw-r--r-- | epan/dissectors/packet-dcerpc-srvsvc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-dcerpc-srvsvc.c b/epan/dissectors/packet-dcerpc-srvsvc.c index 4bc5bdd414..914eaecf9e 100644 --- a/epan/dissectors/packet-dcerpc-srvsvc.c +++ b/epan/dissectors/packet-dcerpc-srvsvc.c @@ -2078,8 +2078,7 @@ static int srvsvc_dissect_sec_desc_buf(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep) { guint32 len; - dcerpc_info *di; - di=pinfo->private_data; + dcerpc_info *di=(dcerpc_info *)pinfo->private_data; if(di->conformant_run){ /*just a run to handle conformant arrays, nothing to dissect */ return offset; @@ -2119,8 +2118,7 @@ srvsvc_dissect_element_NetShareInfo502_sd_(tvbuff_t *tvb, int offset, packet_inf static int srvsvc_dissect_ServerType(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep) { - dcerpc_info *di; - di=pinfo->private_data; + dcerpc_info *di=(dcerpc_info *)pinfo->private_data; if(di->conformant_run){ /*just a run to handle conformant arrays, nothing to dissect */ return offset; @@ -2142,8 +2140,7 @@ srvsvc_dissect_element_NetSrvInfo102_server_type(tvbuff_t *tvb, int offset, pack static int srvsvc_dissect_secinfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep _U_) { - dcerpc_info *di; - di=pinfo->private_data; + dcerpc_info *di=(dcerpc_info *)pinfo->private_data; if(di->conformant_run){ /*just a run to handle conformant arrays, nothing to dissect */ return offset; |