aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dcom-sysact.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2012-04-26 16:47:37 +0000
committerBill Meier <wmeier@newsguy.com>2012-04-26 16:47:37 +0000
commit557ed5e97175f0eba8e0d0a3b9a90de14cb533cc (patch)
tree8b1de4079e42414a6aa17874917de35a0fa6a3a6 /epan/dissectors/packet-dcom-sysact.c
parent781891bd7bd06316fc6859f02eae107d41fcfc3a (diff)
Minor: reformatting, unneeded #includes, whitespace cleanup;
Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
Diffstat (limited to 'epan/dissectors/packet-dcom-sysact.c')
-rw-r--r--epan/dissectors/packet-dcom-sysact.c55
1 files changed, 29 insertions, 26 deletions
diff --git a/epan/dissectors/packet-dcom-sysact.c b/epan/dissectors/packet-dcom-sysact.c
index 1c771d4b0c..d4a223a492 100644
--- a/epan/dissectors/packet-dcom-sysact.c
+++ b/epan/dissectors/packet-dcom-sysact.c
@@ -46,36 +46,35 @@ static guint16 ver_ISystemActivator = 0;
static int
dissect_remsysact_remotecreateinstance_rqst(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
offset = dissect_dcom_this(tvb, offset, pinfo, tree, drep);
/* XXX - what is this? */
- offset = dissect_dcom_nospec_data(tvb, offset, pinfo, tree, drep,
- 4);
+ offset = dissect_dcom_nospec_data(tvb, offset, pinfo, tree, drep, 4);
- offset = dissect_dcom_PMInterfacePointer(tvb, offset, pinfo, tree, drep,
- hf_sysact_unknown, NULL /* XXX */);
+ offset = dissect_dcom_PMInterfacePointer(tvb, offset, pinfo, tree, drep,
+ hf_sysact_unknown, NULL /* XXX */);
- return offset;
+ return offset;
}
static int
dissect_remsysact_remotecreateinstance_resp(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
{
offset = dissect_dcom_that(tvb, offset, pinfo, tree, drep);
- offset = dissect_dcom_PMInterfacePointer(tvb, offset, pinfo, tree, drep,
- hf_sysact_unknown, NULL /* XXX */);
+ offset = dissect_dcom_PMInterfacePointer(tvb, offset, pinfo, tree, drep,
+ hf_sysact_unknown, NULL /* XXX */);
- offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep,
- NULL /* pu32HResult */);
+ offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep,
+ NULL /* pu32HResult */);
- return offset;
+ return offset;
}
@@ -93,23 +92,27 @@ static dcerpc_sub_dissector ISystemActivator_dissectors[] = {
void
proto_register_ISystemActivator (void)
{
- static hf_register_info hf[] = {
- { &hf_opnum,
- { "Operation", "isystemactivator.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
- { &hf_sysact_unknown,
- { "IUnknown", "isystemactivator.unknown", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
- };
- static gint *ett[] = {
- &ett_ISystemActivator
- };
- proto_ISystemActivator = proto_register_protocol ("ISystemActivator ISystemActivator Resolver", "ISystemActivator", "isystemactivator");
- proto_register_field_array (proto_ISystemActivator, hf, array_length (hf));
- proto_register_subtree_array (ett, array_length (ett));
+ static hf_register_info hf[] = {
+ { &hf_opnum,
+ { "Operation", "isystemactivator.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_sysact_unknown,
+ { "IUnknown", "isystemactivator.unknown", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ };
+ static gint *ett[] = {
+ &ett_ISystemActivator
+ };
+ proto_ISystemActivator = proto_register_protocol ("ISystemActivator ISystemActivator Resolver",
+ "ISystemActivator",
+ "isystemactivator");
+ proto_register_field_array (proto_ISystemActivator, hf, array_length (hf));
+ proto_register_subtree_array (ett, array_length (ett));
}
void
proto_reg_handoff_ISystemActivator (void)
{
- /* Register the protocol as dcerpc */
- dcerpc_init_uuid (proto_ISystemActivator, ett_ISystemActivator, &uuid_ISystemActivator, ver_ISystemActivator, ISystemActivator_dissectors, hf_opnum);
+ /* Register the protocol as dcerpc */
+ dcerpc_init_uuid (proto_ISystemActivator, ett_ISystemActivator,
+ &uuid_ISystemActivator, ver_ISystemActivator,
+ ISystemActivator_dissectors, hf_opnum);
}