From: VMware, Inc <>
Date: Sat, 28 May 2011 19:07:30 +0000 (-0700)
Subject: Miscelaneous cleanup of unused tools stuff.
X-Git-Tag: 2011.05.27-420096~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03edbb8e8d2c6733afbb5f6c52ff92934ee1af9a;p=thirdparty%2Fopen-vm-tools.git

Miscelaneous cleanup of unused tools stuff.

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

diff --git a/open-vm-tools/lib/include/conf.h b/open-vm-tools/lib/include/conf.h
index 7a525b042..152c10228 100644
--- a/open-vm-tools/lib/include/conf.h
+++ b/open-vm-tools/lib/include/conf.h
@@ -44,7 +44,6 @@
 #   define CONFVAL_SUSPENDSCRIPT_DEFAULT  "suspend-vm-default.bat"
 #endif
 
-#define CONFNAME_MAX_WIPERSIZE            "max.wiperfile.size"
 #define CONFNAME_POWERONSCRIPT            "poweron-script"
 #define CONFNAME_POWEROFFSCRIPT           "poweroff-script"
 #define CONFNAME_RESUMESCRIPT             "resume-script"
@@ -137,26 +136,9 @@
  */
 
 
-/*
- * Tell the tools to show the wireless icon in the guest.
- */
-
-#define CONFNAME_SHOW_WIRELESS_ICON "wirelessIcon.enable"
-
 /** Where to find Tools data in the Win32 registry. */
 #define CONF_VMWARE_TOOLS_REGKEY    "Software\\VMware, Inc.\\VMware Tools"
 
-/*
- * Directory containing the tools library files.  Currently only intended
- * for vmware-user.
- */
-#if !defined(_WIN32)
-#   define CONFNAME_LIBDIR                        "libdir"
-#endif
-
-/* Default maximum size of wiper file in MB */
-#define CONFVAL_MAX_WIPERSIZE_DEFAULT         "512"
-
 /* Wait 5 seconds between polls to see if the conf file has changed */
 #define CONF_POLL_TIME     500
 
diff --git a/open-vm-tools/lib/include/debug.h b/open-vm-tools/lib/include/debug.h
index 5485587a1..f719a2587 100644
--- a/open-vm-tools/lib/include/debug.h
+++ b/open-vm-tools/lib/include/debug.h
@@ -30,7 +30,5 @@
 #   include "vm_basic_types.h"
 
 void Debug(char const *fmt, ...) PRINTF_DECL(1, 2);
-void Debug_Set(Bool enable, const char *prefix);
-void Debug_EnableToFile(const char *file, Bool backup);
 
 #endif /* __DEBUG_H__ */
diff --git a/open-vm-tools/libvmtools/vmtoolsConfig.c b/open-vm-tools/libvmtools/vmtoolsConfig.c
index 16193715a..12a92a65c 100644
--- a/open-vm-tools/libvmtools/vmtoolsConfig.c
+++ b/open-vm-tools/libvmtools/vmtoolsConfig.c
@@ -110,9 +110,6 @@ VMToolsConfigLoadLegacy(void)
       Warning("Could not get path to Tools installation.\n");
    }
 
-   GuestApp_SetDictEntryDefault(confDict, CONFNAME_MAX_WIPERSIZE,
-                                CONFVAL_MAX_WIPERSIZE_DEFAULT);
-
    /* Load the user-configured values from the conf file if it's there */
    GuestApp_LoadDict(confDict);
 
@@ -193,12 +190,9 @@ VMToolsConfigUpgrade(GuestApp_Dict *old,
       { CONFNAME_RESUMESCRIPT, "powerops", CONFNAME_RESUMESCRIPT, CFG_STRING, NULL },
       { CONFNAME_SUSPENDSCRIPT, "powerops", CONFNAME_SUSPENDSCRIPT, CFG_STRING, NULL },
       /* guestd options. */
-      { CONFNAME_MAX_WIPERSIZE, "vmsvc", CONFNAME_MAX_WIPERSIZE, CFG_INTEGER, NULL },
       { CONFNAME_GUESTINFO_DISABLEQUERYDISKINFO, "guestinfo", CONFNAME_GUESTINFO_DISABLEQUERYDISKINFO, CFG_BOOLEAN, NULL },
       { CONFNAME_DISABLETOOLSVERSION, "vmsvc", CONFNAME_DISABLETOOLSVERSION, CFG_BOOLEAN, NULL },
 #if defined(_WIN32)
-      /* Tray options. */
-      { CONFNAME_SHOW_WIRELESS_ICON, "vmtray", CONFNAME_SHOW_WIRELESS_ICON, CFG_BOOLEAN, NULL },
       { CONFNAME_DISABLEPMTIMERWARNING, "desktopevents", CONFNAME_DISABLEPMTIMERWARNING, CFG_BOOLEAN, NULL },
 #endif
       /* Unity options. */