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 79342499439ccf77e111f0fe4fde86e0bf4c8f30..5de7253ec0666ae468502414aa7bc9d6fc812eb3 100644 (file)
--- 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 23fda3b32778a332240c20b1088336ae72586a1f..94eaf1d31df598f55059c72b0305727a3f0aeffa 100644 (file)
--- 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 6f813e3213b6ba0ef58c12b2e4dae1c0f7a9c545..209673d7399f9816b6bcc4c70174c6dcf6139ca6 100644 (file)
--- 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;