From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 17 Mar 2020 21:36:56 +0000 (-0700)
Subject: Remove the now unused LOGLEVEL_VARIADIC
X-Git-Tag: stable-11.1.0~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad9247fd5efe7d38f9e61db13eea849f01b21ef6;p=thirdparty%2Fopen-vm-tools.git

Remove the now unused LOGLEVEL_VARIADIC
---

diff --git a/open-vm-tools/lib/asyncsocket/asyncSocketBase.c b/open-vm-tools/lib/asyncsocket/asyncSocketBase.c
index d214e9e11..a6e450ecd 100644
--- a/open-vm-tools/lib/asyncsocket/asyncSocketBase.c
+++ b/open-vm-tools/lib/asyncsocket/asyncSocketBase.c
@@ -46,7 +46,6 @@
 #include "log.h"
 
 #define LOGLEVEL_MODULE asyncsocket
-#define LOGLEVEL_VARIADIC
 #include "loglevel_user.h"
 
 /*
diff --git a/open-vm-tools/lib/asyncsocket/asyncSocketInterface.c b/open-vm-tools/lib/asyncsocket/asyncSocketInterface.c
index a5859ff52..bcde20cc6 100644
--- a/open-vm-tools/lib/asyncsocket/asyncSocketInterface.c
+++ b/open-vm-tools/lib/asyncsocket/asyncSocketInterface.c
@@ -64,7 +64,6 @@
 #include "log.h"
 
 #define LOGLEVEL_MODULE asyncsocket
-#define LOGLEVEL_VARIADIC
 #include "loglevel_user.h"
 
 
diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c
index 483ca6233..fb9d4bdb5 100644
--- a/open-vm-tools/lib/asyncsocket/asyncsocket.c
+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c
@@ -108,7 +108,6 @@
 
 
 #define LOGLEVEL_MODULE asyncsocket
-#define LOGLEVEL_VARIADIC
 #include "loglevel_user.h"
 
 #ifdef VMX86_SERVER
diff --git a/open-vm-tools/lib/auth/authPosix.c b/open-vm-tools/lib/auth/authPosix.c
index 38aacc639..d8d2162ed 100644
--- a/open-vm-tools/lib/auth/authPosix.c
+++ b/open-vm-tools/lib/auth/authPosix.c
@@ -46,7 +46,6 @@
 #endif
 
 #define LOGLEVEL_MODULE auth
-#define LOGLEVEL_VARIADIC
 #include "loglevel_user.h"
 
 typedef struct {
diff --git a/open-vm-tools/lib/file/fileLockPosix.c b/open-vm-tools/lib/file/fileLockPosix.c
index 9fe143825..8dec054ae 100644
--- a/open-vm-tools/lib/file/fileLockPosix.c
+++ b/open-vm-tools/lib/file/fileLockPosix.c
@@ -47,7 +47,6 @@
 #include "unicodeOperations.h"
 
 #define LOGLEVEL_MODULE main
-#define LOGLEVEL_VARIADIC
 #include "loglevel_user.h"
 
 #define LOG_MAX_PROC_NAME  64
diff --git a/open-vm-tools/lib/file/fileLockPrimitive.c b/open-vm-tools/lib/file/fileLockPrimitive.c
index 68e39f5c4..4f0f7801d 100644
--- a/open-vm-tools/lib/file/fileLockPrimitive.c
+++ b/open-vm-tools/lib/file/fileLockPrimitive.c
@@ -58,7 +58,6 @@
 #include "unicodeOperations.h"
 
 #define LOGLEVEL_MODULE main
-#define LOGLEVEL_VARIADIC
 #include "loglevel_user.h"
 
 #define LOCK_SHARED     "S"
diff --git a/open-vm-tools/lib/file/filePosix.c b/open-vm-tools/lib/file/filePosix.c
index 8ad4d14c1..741510def 100644
--- a/open-vm-tools/lib/file/filePosix.c
+++ b/open-vm-tools/lib/file/filePosix.c
@@ -77,7 +77,6 @@
 #endif
 
 #define LOGLEVEL_MODULE main
-#define LOGLEVEL_VARIADIC
 #include "loglevel_user.h"
 
 #include "unicodeOperations.h"
diff --git a/open-vm-tools/lib/file/fileTempPosix.c b/open-vm-tools/lib/file/fileTempPosix.c
index e3a46f9e6..097d1d499 100644
--- a/open-vm-tools/lib/file/fileTempPosix.c
+++ b/open-vm-tools/lib/file/fileTempPosix.c
@@ -54,7 +54,6 @@
 #include "localconfig.h"
 
 #define LOGLEVEL_MODULE util
-#define LOGLEVEL_VARIADIC
 #include "loglevel_user.h"
 
 
diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerInt.h b/open-vm-tools/lib/hgfsServer/hgfsServerInt.h
index 2b322d2f8..75a87f51c 100644
--- a/open-vm-tools/lib/hgfsServer/hgfsServerInt.h
+++ b/open-vm-tools/lib/hgfsServer/hgfsServerInt.h
@@ -44,7 +44,6 @@ struct DirectoryEntry;
 #ifndef VMX86_TOOLS
 
 #define LOGLEVEL_MODULE hgfsServer
-#define LOGLEVEL_VARIADIC
 #include "loglevel_user.h"
 
 #else // VMX86_TOOLS
diff --git a/open-vm-tools/lib/misc/hostinfo.c b/open-vm-tools/lib/misc/hostinfo.c
index e34d210e6..352ee74aa 100644
--- a/open-vm-tools/lib/misc/hostinfo.c
+++ b/open-vm-tools/lib/misc/hostinfo.c
@@ -38,7 +38,6 @@
 #include "backdoor_def.h"
 
 #define LOGLEVEL_MODULE hostinfo
-#define LOGLEVEL_VARIADIC
 #include "loglevel_user.h"
 
 #define LGPFX "HOSTINFO:"
diff --git a/open-vm-tools/lib/misc/hostinfoHV.c b/open-vm-tools/lib/misc/hostinfoHV.c
index 5606df12d..0702efa1b 100644
--- a/open-vm-tools/lib/misc/hostinfoHV.c
+++ b/open-vm-tools/lib/misc/hostinfoHV.c
@@ -37,7 +37,6 @@
 #define LGPFX "HOSTINFO:"
 
 #define LOGLEVEL_MODULE hostinfo
-#define LOGLEVEL_VARIADIC
 #include "loglevel_user.h"
 
 #if !defined(_WIN32)
diff --git a/open-vm-tools/lib/misc/machineID.c b/open-vm-tools/lib/misc/machineID.c
index 9e05ba4ad..7c29a1cb9 100644
--- a/open-vm-tools/lib/misc/machineID.c
+++ b/open-vm-tools/lib/misc/machineID.c
@@ -46,7 +46,6 @@
 #include "vm_atomic.h"
 
 #define LOGLEVEL_MODULE main
-#define LOGLEVEL_VARIADIC
 #include "loglevel_user.h"
 
 #if defined(_WIN32)	// Windows
diff --git a/open-vm-tools/lib/pollGtk/pollGtk.c b/open-vm-tools/lib/pollGtk/pollGtk.c
index da42e189f..4ccaeda64 100644
--- a/open-vm-tools/lib/pollGtk/pollGtk.c
+++ b/open-vm-tools/lib/pollGtk/pollGtk.c
@@ -60,7 +60,6 @@
 #include "err.h"
 
 #define LOGLEVEL_MODULE poll
-#define LOGLEVEL_VARIADIC
 #include "loglevel_user.h"
 
 
diff --git a/open-vm-tools/services/plugins/dndcp/dnd/dndCommon.c b/open-vm-tools/services/plugins/dndcp/dnd/dndCommon.c
index 8bea543de..c42d05b7e 100644
--- a/open-vm-tools/services/plugins/dndcp/dnd/dndCommon.c
+++ b/open-vm-tools/services/plugins/dndcp/dnd/dndCommon.c
@@ -45,7 +45,6 @@
 #include "hostinfo.h"
 
 #define LOGLEVEL_MODULE dnd
-#define LOGLEVEL_VARIADIC
 #include "loglevel_user.h"
 
 #define WIN_DIRSEPC     '\\'
diff --git a/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c b/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c
index 90c11a6ba..219065f74 100644
--- a/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c
+++ b/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c
@@ -46,7 +46,6 @@
 #endif
 
 #define LOGLEVEL_MODULE dnd
-#define LOGLEVEL_VARIADIC
 #include "loglevel_user.h"
 
 #include "unicodeOperations.h"
diff --git a/open-vm-tools/services/plugins/dndcp/dnd/dndMsg.c b/open-vm-tools/services/plugins/dndcp/dnd/dndMsg.c
index 1d4ad55f7..3ad9a847f 100644
--- a/open-vm-tools/services/plugins/dndcp/dnd/dndMsg.c
+++ b/open-vm-tools/services/plugins/dndcp/dnd/dndMsg.c
@@ -37,7 +37,6 @@
 #include "dndInt.h"
 
 #define LOGLEVEL_MODULE dnd
-#define LOGLEVEL_VARIADIC
 #include "loglevel_user.h"
 
 
diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/copyPasteRpcV4.cc b/open-vm-tools/services/plugins/dndcp/dndGuest/copyPasteRpcV4.cc
index e37e27995..e905ece9d 100644
--- a/open-vm-tools/services/plugins/dndcp/dndGuest/copyPasteRpcV4.cc
+++ b/open-vm-tools/services/plugins/dndcp/dndGuest/copyPasteRpcV4.cc
@@ -31,7 +31,6 @@ extern "C" {
    #define LOG(level, ...) Debug(__VA_ARGS__)
 #else
    #define LOGLEVEL_MODULE dnd
-   #define LOGLEVEL_VARIADIC
    #include "loglevel_user.h"
 #endif
 
diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.cpp b/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.cpp
index 90e63761b..0fb28ab5b 100644
--- a/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.cpp
+++ b/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.cpp
@@ -44,7 +44,6 @@ extern "C" {
    #include "tclodefs.h"
 
    #define LOGLEVEL_MODULE dnd
-   #define LOGLEVEL_VARIADIC
    #include "loglevel_user.h"
 #endif
 }
diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/dndRpcV4.cc b/open-vm-tools/services/plugins/dndcp/dndGuest/dndRpcV4.cc
index 9b6551bc8..544da5509 100644
--- a/open-vm-tools/services/plugins/dndcp/dndGuest/dndRpcV4.cc
+++ b/open-vm-tools/services/plugins/dndcp/dndGuest/dndRpcV4.cc
@@ -31,7 +31,6 @@ extern "C" {
    #define LOG(level, ...) Debug(__VA_ARGS__)
 #else
    #define LOGLEVEL_MODULE dnd
-   #define LOGLEVEL_VARIADIC
    #include "loglevel_user.h"
 #endif
 
diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/fileTransferRpcV4.cc b/open-vm-tools/services/plugins/dndcp/dndGuest/fileTransferRpcV4.cc
index 5c90f8352..f6131a6c0 100644
--- a/open-vm-tools/services/plugins/dndcp/dndGuest/fileTransferRpcV4.cc
+++ b/open-vm-tools/services/plugins/dndcp/dndGuest/fileTransferRpcV4.cc
@@ -39,7 +39,6 @@ extern "C" {
    #define LOG(level, ...) Debug(__VA_ARGS__)
 #else
    #define LOGLEVEL_MODULE dnd
-   #define LOGLEVEL_VARIADIC
    #include "loglevel_user.h"
 #endif
 }
diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/rpcV3Util.cpp b/open-vm-tools/services/plugins/dndcp/dndGuest/rpcV3Util.cpp
index 0caebf263..f4ed95b4c 100644
--- a/open-vm-tools/services/plugins/dndcp/dndGuest/rpcV3Util.cpp
+++ b/open-vm-tools/services/plugins/dndcp/dndGuest/rpcV3Util.cpp
@@ -37,7 +37,6 @@ extern "C" {
 }
 #else
    #define LOGLEVEL_MODULE dnd
-   #define LOGLEVEL_VARIADIC
    #include "loglevel_user.h"
 #endif
 
diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/rpcV4Util.cpp b/open-vm-tools/services/plugins/dndcp/dndGuest/rpcV4Util.cpp
index c656a73e5..7f3890f0b 100644
--- a/open-vm-tools/services/plugins/dndcp/dndGuest/rpcV4Util.cpp
+++ b/open-vm-tools/services/plugins/dndcp/dndGuest/rpcV4Util.cpp
@@ -38,7 +38,6 @@ extern "C" {
 }
 #else
    #define LOGLEVEL_MODULE dnd
-   #define LOGLEVEL_VARIADIC
    #include "loglevel_user.h"
 #endif