diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-03-03 02:47:53 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-03-03 10:55:29 +0000 |
| commit | 499d95964d0d19bbec7f78d6fe4461eb26c552ca (patch) | |
| tree | bf926f264babd15bcbc12456a6985f5fc5969bdb /epan/dissectors/packet-dcom-remact.c | |
| parent | a0ce286d8d3aaa5a63f69bb03d15d2d225941169 (diff) | |
| download | wireshark-499d95964d0d19bbec7f78d6fe4461eb26c552ca.tar.gz | |
Eliminate e_uuid_t in favor of e_guid_t.
That eliminates a redundant and confusing data type, and avoids issues
with one piece of code using e_uuid_t but wanting to use routines
expecting an e_guid_t.
Change-Id: I95e172d46d342ab40f6254300ecbd2a0530cde60
Reviewed-on: https://code.wireshark.org/review/7506
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-dcom-remact.c')
| -rw-r--r-- | epan/dissectors/packet-dcom-remact.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dcom-remact.c b/epan/dissectors/packet-dcom-remact.c index d546d4b582..0fcb98c1ce 100644 --- a/epan/dissectors/packet-dcom-remact.c +++ b/epan/dissectors/packet-dcom-remact.c @@ -50,7 +50,7 @@ static int hf_remact_authn_hint = -1; static int proto_remact = -1; static gint ett_remact = -1; -static e_uuid_t uuid_remact = { 0x4d9f4ab8, 0x7d1c, 0x11cf, { 0x86, 0x1e, 0x00, 0x20, 0xaf, 0x6e, 0x7c, 0x57 } }; +static e_guid_t uuid_remact = { 0x4d9f4ab8, 0x7d1c, 0x11cf, { 0x86, 0x1e, 0x00, 0x20, 0xaf, 0x6e, 0x7c, 0x57 } }; static guint16 ver_remact = 0; @@ -65,8 +65,8 @@ dissect_remact_remote_activation_rqst(tvbuff_t *tvb, int offset, guint32 u32ArraySize; guint32 u32ItemIdx; guint16 u16ProtSeqs; - e_uuid_t clsid; - e_uuid_t iid; + e_guid_t clsid; + e_guid_t iid; gchar szObjName[1000] = { 0 }; guint32 u32ObjNameLen = sizeof(szObjName); @@ -129,7 +129,7 @@ dissect_remact_remote_activation_resp(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep) { guint32 u32Pointer; - e_uuid_t ipid; + e_guid_t ipid; guint32 u32AuthnHint; guint16 u16VersionMajor; guint16 u16VersionMinor; |