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 e36b6bb56e0612becb4b56a19b85d2e97af97b01..1a8c00a2ddfaba0fb1f024359da6639587cdd7f2 100644 (file)
--- 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 125cba75c7e254cc6cedd250629fa5c4a52c411d..54cb17655f6224f34f02202396613f7b847852cb 100644 (file)
--- 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