From: Oliver Kurth <okurth@vmware.com>
Date: Wed, 7 Feb 2018 00:32:39 +0000 (-0800)
Subject: UUID: Clean up UUID_PackText
X-Git-Tag: stable-10.3.0~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca39511ceb8e88254cad71e98cba5cbfff08a99d;p=thirdparty%2Fopen-vm-tools.git

UUID: Clean up UUID_PackText

Use size_t, not int.
---

diff --git a/open-vm-tools/lib/include/uuid.h b/open-vm-tools/lib/include/uuid.h
index 793424994..5de7253ec 100644
--- a/open-vm-tools/lib/include/uuid.h
+++ b/open-vm-tools/lib/include/uuid.h
@@ -171,7 +171,7 @@ Bool UUID_IsUUIDGeneratedByThatVpxd(const uint8 *id,
 
 char *UUID_PackText(const char *text,
                     char *pack,
-                    int packLen);
+                    size_t packLen);
 
 char *UUID_ProperHostUUID(void);
 
diff --git a/open-vm-tools/lib/include/vm_atomic.h b/open-vm-tools/lib/include/vm_atomic.h
index 23fda3b32..94eaf1d31 100644
--- a/open-vm-tools/lib/include/vm_atomic.h
+++ b/open-vm-tools/lib/include/vm_atomic.h
@@ -3843,7 +3843,6 @@ MAKE_ATOMIC_TYPE(Ptr, 32, void const *, void *, uintptr_t)
 #endif
 MAKE_ATOMIC_TYPE(Int, 32, int, int, int)
 MAKE_ATOMIC_TYPE(Bool, 8, Bool, Bool, Bool)
-MAKE_ATOMIC_TYPE(PageIndex, 32, unsigned, unsigned, unsigned)
 
 /*
  * Define arbitrary sized bit vector to be used by
diff --git a/open-vm-tools/lib/include/vm_basic_types.h b/open-vm-tools/lib/include/vm_basic_types.h
index 6f813e321..209673d73 100644
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2017 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -538,7 +538,6 @@ typedef uint64    BPN;
 #define UINT64_2_BPN(u) ((BPN)(u))
 #define BPN_2_UINT64(b) ((uint64)(b))
 
-typedef uint32    PageCount;
 typedef uint32    PageNum;
 typedef unsigned      MemHandle;
 typedef unsigned int  IoHandle;