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-oxid.c | |
| parent | a0ce286d8d3aaa5a63f69bb03d15d2d225941169 (diff) | |
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-oxid.c')
| -rw-r--r-- | epan/dissectors/packet-dcom-oxid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dcom-oxid.c b/epan/dissectors/packet-dcom-oxid.c index ceb943acd7..a3417e4390 100644 --- a/epan/dissectors/packet-dcom-oxid.c +++ b/epan/dissectors/packet-dcom-oxid.c @@ -55,7 +55,7 @@ static int hf_oxid_ds_array = -1; static gint ett_oxid = -1; -static e_uuid_t uuid_oxid = { 0x99fcfec4, 0x5260, 0x101b, { 0xbb, 0xcb, 0x00, 0xaa, 0x00, 0x21, 0x34, 0x7a } }; +static e_guid_t uuid_oxid = { 0x99fcfec4, 0x5260, 0x101b, { 0xbb, 0xcb, 0x00, 0xaa, 0x00, 0x21, 0x34, 0x7a } }; static guint16 ver_oxid = 0; @@ -213,7 +213,7 @@ dissect_oxid_resolve_oxid2_resp(tvbuff_t *tvb, int offset, { guint32 u32Pointer; guint32 u32ArraySize; - e_uuid_t ipid; + e_guid_t ipid; guint32 u32AuthnHint; guint16 u16VersionMajor; guint16 u16VersionMinor; |