From: VMware, Inc <>
Date: Mon, 26 Sep 2011 18:09:12 +0000 (-0700)
Subject: Remove some ancient cruft from vm_assert.h
X-Git-Tag: 2011.09.23-491607~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31421f5dfd15d5d21217378ba22460c138dab02f;p=thirdparty%2Fopen-vm-tools.git

Remove some ancient cruft from vm_assert.h

Two things that we don't need in vm_assert.h; both of
these disappeared >5 years ago.
- LogDB/WarningDB: we don't need special hooks anymore for
logging these. (They weren't hooked up to anything special.)
- FILECODE: we stopped using this ~2005. Six years later, the
warnings probably aren't useful.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/include/loglevel_defs.h b/open-vm-tools/lib/include/loglevel_defs.h
index e36b6bb56..1a8c00a2d 100644
--- a/open-vm-tools/lib/include/loglevel_defs.h
+++ b/open-vm-tools/lib/include/loglevel_defs.h
@@ -133,10 +133,8 @@ int LogLevel_Set(const char *extension, const char *module, int val);
 
 #ifdef VMX86_DEVEL
    #define LOG_DEVEL(_x) (Log _x)
-   #define LOG_DEVEL_DB(_x) (LogDB _x)
 #else
    #define LOG_DEVEL(_x)
-   #define LOG_DEVEL_DB(_x)
 #endif
 
 
diff --git a/open-vm-tools/lib/include/vm_assert.h b/open-vm-tools/lib/include/vm_assert.h
index 125cba75c..54cb17655 100644
--- a/open-vm-tools/lib/include/vm_assert.h
+++ b/open-vm-tools/lib/include/vm_assert.h
@@ -87,17 +87,6 @@
 #include "vm_basic_defs.h"
 
 
-/*
- * XXX old file code
- */
-
-#ifdef FILECODEINT
-#error "Don't define FILECODEINT.  It is obsolete."
-#endif
-#ifdef FILECODE
-#error "Don't define FILECODE.  It is obsolete."
-#endif
-
 /*
  * Internal macros, functions, and strings
  *
@@ -165,12 +154,6 @@ EXTERN void LogThrottled(uint32 *count, const char *fmt, ...)
 EXTERN void WarningThrottled(uint32 *count, const char *fmt, ...)
             PRINTF_DECL(2, 3);
 
-/* DB family:  messages which are parsed by logfile database system */
-#define WarningDB Warning
-#define LogDB Log
-#define WarningThrottledDB WarningThrottled
-#define LogThrottledDB LogThrottled
-
 
 /*
  * Stress testing: redefine ASSERT_IFNOT() to taste