From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 17 Mar 2020 21:36:56 +0000 (-0700)
Subject: LOG variadic: remove LOGLEVEL_VARIADIC [1 of 2]
X-Git-Tag: stable-11.1.0~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fe2a62d8b86c805a1552e1a50dfb75de7b0f696;p=thirdparty%2Fopen-vm-tools.git

LOG variadic: remove LOGLEVEL_VARIADIC [1 of 2]

Mass conversion is complete. It's time to remove the intermediate state.
[1/2]: remove LOGLEVEL_VARIADIC from loglevel_defs.h.  This removes the
backwards-compat path.
---

diff --git a/open-vm-tools/lib/include/loglevel_defs.h b/open-vm-tools/lib/include/loglevel_defs.h
index a06f63ffb..40d7601ae 100644
--- a/open-vm-tools/lib/include/loglevel_defs.h
+++ b/open-vm-tools/lib/include/loglevel_defs.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2020 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
@@ -87,7 +87,6 @@ int LogLevel_Set(const char *extension, const char *module, int val);
 #define DOLOG_BYNAME(_mod, _min) \
         UNLIKELY(LOGLEVEL_BYNAME(_mod) >= (_min))
 
-#ifdef LOGLEVEL_VARIADIC
 /*
  * Variadic macro wrinkle: C99 says "one or more arguments"; some compilers
  * (gcc+clang+msvc) support zero arguments, but differ in tolerating a trailing
@@ -102,11 +101,6 @@ int LogLevel_Set(const char *extension, const char *module, int val);
 #define LOG_BYNAME(_mod, _min, ...) \
         (DOLOG_BYNAME(_mod, _min) ? Log(__VA_ARGS__) : (void) 0)
 
-#else
-#define LOG_BYNAME(_mod, _min, _log) \
-        (DOLOG_BYNAME(_mod, _min) ? (Log _log) : (void) 0)
-#endif
-
 /*
  * Default
  */
@@ -130,11 +124,7 @@ int LogLevel_Set(const char *extension, const char *module, int val);
 
 
 #ifdef VMX86_DEVEL
-   #ifdef LOGLEVEL_VARIADIC
    #define LOG_DEVEL(...) Log(__VA_ARGS__)
-   #else
-   #define LOG_DEVEL(_x) (Log _x)
-   #endif
 #else
    #define LOG_DEVEL(...)
 #endif