aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dcerpc-drsuapi.c
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2013-05-07 01:52:33 +0000
committerJörg Mayer <jmayer@loplof.de>2013-05-07 01:52:33 +0000
commitfe2f036bd90ca32b746d08a3b58c55920a1d6185 (patch)
tree3ecc1dbf4a1dff8ef453a042f030225a1e374ac0 /epan/dissectors/packet-dcerpc-drsuapi.c
parent2771af985128a853f405422c9fbb5e11007f6087 (diff)
Fix a c++ compat warning in the template and copy the resulting
file to packet-dcerpc-drsuapi.c This seems to undo some (warning fix) changes made to the dissector directly instead of fixing the template (or generator). svn path=/trunk/; revision=49192
Diffstat (limited to 'epan/dissectors/packet-dcerpc-drsuapi.c')
-rw-r--r--epan/dissectors/packet-dcerpc-drsuapi.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dcerpc-drsuapi.c b/epan/dissectors/packet-dcerpc-drsuapi.c
index 64fee52774..955dacd76b 100644
--- a/epan/dissectors/packet-dcerpc-drsuapi.c
+++ b/epan/dissectors/packet-dcerpc-drsuapi.c
@@ -552,7 +552,7 @@ ucarray_drsuapi_dissect_DsReplicaSyncRequest1Info_nc_dn(tvbuff_t *tvb, int offse
dcerpc_info *di;
int old_offset;
- di=pinfo->private_data;
+ di=(dcerpc_info *)pinfo->private_data;
if(di->conformant_run){
/*just a run to handle conformant arrays, nothing to dissect
but we need to remember how long this array was.
@@ -1395,14 +1395,12 @@ drsuapi_dissect_DsReplicaSyncRequest1Info_str_len(tvbuff_t *tvb, int offset, pac
}
-#if 0
static int
drsuapi_dissect_uint16(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, int hf_index, guint32 param _U_)
{
offset=dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, NULL);
return offset;
}
-#endif
int
@@ -2901,7 +2899,7 @@ drsuapi_dissect_DsGetNCChangesCtr6(tvbuff_t *tvb, int offset, packet_info *pinfo
}
int
-drsuapi_dissect_DsGetNCChangesCtr7(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *parent_tree, guint8 *drep _U_, int hf_index, guint32 param _U_)
+drsuapi_dissect_DsGetNCChangesCtr7(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint8 *drep, int hf_index, guint32 param _U_)
{
proto_item *item=NULL;
proto_tree *tree=NULL;