From: Oliver Kurth <okurth@vmware.com>
Date: Mon, 26 Feb 2018 20:29:05 +0000 (-0800)
Subject: Remove uses of header file safetime.h
X-Git-Tag: stable-10.3.0~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=783e87e2a465d28db5233e7d1e284fa9410ffec4;p=thirdparty%2Fopen-vm-tools.git

Remove uses of header file safetime.h

- (many places) replace "safetime.h" with <time.h> and/or <sys/stat.h>,
                occasionally re-ordering this header to top of file
- (many places) remove "safetime.h" as no time functions are used
---

diff --git a/open-vm-tools/lib/file/file.c b/open-vm-tools/lib/file/file.c
index fb65d6391..605324740 100644
--- a/open-vm-tools/lib/file/file.c
+++ b/open-vm-tools/lib/file/file.c
@@ -35,7 +35,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include "safetime.h"
 #if defined(_WIN32)
 #include <io.h>
 #define S_IXUSR    0100
@@ -44,6 +43,7 @@
 #include <unistd.h>
 #endif
 #include <string.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 
diff --git a/open-vm-tools/lib/file/fileStandAlone.c b/open-vm-tools/lib/file/fileStandAlone.c
index d4b74f768..b7ce55e90 100644
--- a/open-vm-tools/lib/file/fileStandAlone.c
+++ b/open-vm-tools/lib/file/fileStandAlone.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2018 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
@@ -31,11 +31,11 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include "safetime.h"
 #if !defined(_WIN32)
 #include <unistd.h>
 #endif
 #include <string.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 
diff --git a/open-vm-tools/lib/lock/ulInt.h b/open-vm-tools/lib/lock/ulInt.h
index 8f71460ee..49334d65e 100644
--- a/open-vm-tools/lib/lock/ulInt.h
+++ b/open-vm-tools/lib/lock/ulInt.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2009-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 2009-2018 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
@@ -35,7 +35,6 @@
 typedef DWORD MXUserThreadID;
 #define MXUSER_INVALID_OWNER 0xFFFFFFFF
 #else
-#include "safetime.h"
 #include <pthread.h>
 typedef pthread_t MXUserThreadID;
 #endif
diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index bf1ef4723..0355a0477 100644
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -35,6 +35,7 @@
 #include <sys/time.h>
 #include <pwd.h>
 #include <pthread.h>
+#include <time.h>
 #include <sys/resource.h>
 #if defined(sun)
 #include <sys/systeminfo.h>
@@ -100,7 +101,6 @@
 #include "hostType.h"
 #include "hostinfo.h"
 #include "hostinfoInt.h"
-#include "safetime.h"
 #include "str.h"
 #include "err.h"
 #include "msg.h"
diff --git a/open-vm-tools/lib/misc/timeutil.c b/open-vm-tools/lib/misc/timeutil.c
index c2210fe68..9d72563aa 100644
--- a/open-vm-tools/lib/misc/timeutil.c
+++ b/open-vm-tools/lib/misc/timeutil.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2018 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
@@ -23,9 +23,9 @@
  */
 
 
-#include "safetime.h"
-#include "unicode.h"
 #include <stdio.h>
+#include <time.h>
+#include "unicode.h"
 
 #if defined(_WIN32)
 #  include <wtypes.h>
diff --git a/open-vm-tools/lib/misc/util_misc.c b/open-vm-tools/lib/misc/util_misc.c
index 78667f654..198c23d2c 100644
--- a/open-vm-tools/lib/misc/util_misc.c
+++ b/open-vm-tools/lib/misc/util_misc.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2018 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
@@ -30,7 +30,6 @@
 #endif
 
 #include "vm_ctype.h"
-#include "safetime.h"
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -49,6 +48,7 @@
 #endif
 
 #if defined(__APPLE__)
+#include <sys/stat.h>
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
diff --git a/open-vm-tools/lib/user/util.c b/open-vm-tools/lib/user/util.c
index 238b7c958..4f8cb4315 100644
--- a/open-vm-tools/lib/user/util.c
+++ b/open-vm-tools/lib/user/util.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2018 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
@@ -29,7 +29,6 @@
 #endif
 
 #include "vm_ctype.h"
-#include "safetime.h"
 
 #if defined(_WIN32)
 # include <winsock2.h> // also includes windows.h
diff --git a/open-vm-tools/lib/user/utilBacktrace.c b/open-vm-tools/lib/user/utilBacktrace.c
index 9522b4f26..a804a51e9 100644
--- a/open-vm-tools/lib/user/utilBacktrace.c
+++ b/open-vm-tools/lib/user/utilBacktrace.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2013-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 2013-2018 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
@@ -29,7 +29,6 @@
 #endif
 
 #include "vm_ctype.h"
-#include "safetime.h"
 
 #if defined(_WIN32)
 # include <winsock2.h> // also includes windows.h