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 fb65d63912fec844c41e902187b897620063d450..60532474057c6c68cc420f4be3673ce690076746 100644 (file)
--- 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 d4b74f768a8e0a072661a20cf626e8f2c25f322b..b7ce55e90cc748660ef2f3d274d8188df1d96895 100644 (file)
--- 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 8f71460ee018a6a2ff2691a2033172eef04a1f69..49334d65e10bf5142934ffd56975cebb45ac97ad 100644 (file)
--- 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 bf1ef47235c08cb606f1d6fa3a477fb6f50bdb2f..0355a04771592a2212f63480eb705a64d7d2d563 100644 (file)
--- 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 c2210fe6879381a705c8a1f3134629e9b0c3e955..9d72563aa2ee22e21797fb1d003f5db5e78d8629 100644 (file)
--- 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 78667f654c96735389d22b1a14e7b20dfcb64640..198c23d2c158ec1fe3936de403bce46ca80aa31c 100644 (file)
--- 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 238b7c958e1be64e7e7233bd651d66aecf704606..4f8cb4315e9b85ce7ea16d237f31858b6ab1905d 100644 (file)
--- 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 9522b4f268cb1b7144c277702b9793510faeb4a4..a804a51e9d6255cd4de66bfb2442311f8614a245 100644 (file)
--- 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