First round of merging various UUID structures.

This eliminates RPC_UUID.  It creates the following struct:

struct uuid
{
  uint32 time_low;
  uint16 time_mid;
  uint16 time_hi_and_version;
  uint8  clock_seq[2];
  uint8  node[6];
};
which replaces RPC_UUID and various random struct uuid definitions


and a flat version:
#define UUID_FLAT_SIZE 16
typedef struct uuid_flat
{
	uint8 info[UUID_FLAT_SIZE];
} UUID_FLAT;

which pretty much looks like GUID (which I will start eliminating).

I want us to use the FLAT one only on the wire (perhaps in files, too?), and
I want it to be obvious to the coder that it is the FLAT version.

This leaves a couple of compiler warnings, where GUID isn't completely
replaced by FLAT_UUID yet...I'll get to those soon.
(This used to be commit 1532b5d2e3c61df232b16394acedf6eac387588b)

1 files changed, 3 insertions, 3 deletions

diff --git a/source3/rpc_parse/parse_epmapper.c b/source3/rpc_parse/parse_epmapper.c
index 7a5f147c50..89dc0994c6 100644
--- a/source3/rpc_parse/parse_epmapper.c
+++ b/source3/rpc_parse/parse_epmapper.c
@@ -88,9 +88,9 @@ NTSTATUS init_epm_floor(EPM_FLOOR *floor, uint8 protocol)
  inits an EPM_FLOOR structure with a UUID
 ********************************************************************/
 NTSTATUS init_epm_floor_uuid(EPM_FLOOR *floor,
-			     const RPC_UUID *uuid, uint16 version)
+			     const struct uuid uuid, uint16 version)
 {
-	memcpy(&floor->lhs.uuid.uuid, uuid, sizeof(*uuid));
+	memcpy(&floor->lhs.uuid.uuid, &uuid, sizeof(uuid));
 	floor->lhs.uuid.version = version;
 	floor->rhs.unknown = 0;
 	return init_epm_floor(floor, EPM_FLOOR_UUID);
@@ -166,7 +166,7 @@ BOOL epm_io_floor(const char *desc, EPM_FLOOR *floor,
 
 	switch (floor->lhs.protocol) {
 	case EPM_FLOOR_UUID:
-		if (!smb_io_rpc_uuid("uuid", &floor->lhs.uuid.uuid, ps, depth))
+		if (!smb_io_uuid("uuid", &floor->lhs.uuid.uuid, ps, depth))
 			return False;
 		if (!prs_uint16("version", ps, depth, 
 				&floor->lhs.uuid.version))