From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 31 Jul 2020 20:36:35 +0000 (-0700)
Subject: Changes to common header files not applicable to open-vm-tools.
X-Git-Tag: stable-11.2.0~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd2b5b4a8dfa4f449cc0afa4262e28bb4db06714;p=thirdparty%2Fopen-vm-tools.git

Changes to common header files not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/vmstdio.h b/open-vm-tools/lib/include/vmstdio.h
index 6102c8e10..f0328bc8e 100644
--- a/open-vm-tools/lib/include/vmstdio.h
+++ b/open-vm-tools/lib/include/vmstdio.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
@@ -37,11 +37,6 @@ typedef enum {
    StdIO_Success,
 } StdIO_Status;
 
-typedef void (*SnowMotionLogger)(char *buf, size_t count);
-
-void
-StdIO_ToggleSnowMotionLogging(SnowMotionLogger logger);
-
 StdIO_Status
 StdIO_ReadNextLine(FILE *stream,         // IN
                    char **buf,           // OUT
diff --git a/open-vm-tools/lib/misc/vmstdio.c b/open-vm-tools/lib/misc/vmstdio.c
index 22a8f3861..0b01330ad 100644
--- a/open-vm-tools/lib/misc/vmstdio.c
+++ b/open-vm-tools/lib/misc/vmstdio.c
@@ -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
@@ -33,35 +33,6 @@
 #include "posixInt.h"
 
 
-static SnowMotionLogger snowMotionLogger = NULL;
-
-/*
- *-----------------------------------------------------------------------------
- *
- * StdIO_ToggleSnowMotionLogging --
- *
- *    SnowMotion-specific log toggling - as per PR#2121674 and 2108730, vmx
- *    corruption appears to occur at some arbitrary point prior to VM powerOn,
- *    but only in CAT - it has not been reproducible locally or via manually
- *    triggered Nimbus testruns.
- *
- *    To try to isolate the corruption point, add a toggled logging mechanism
- *    that will dump the results of SuperFGets for the interval between
- *    main initializing and VM powerOn.
- *
- *    This is a strictly temporary mechanism to provide the necessary logging
- *    to debug this issue.
- *
- *-----------------------------------------------------------------------------
- */
-
-void
-StdIO_ToggleSnowMotionLogging(SnowMotionLogger logger)   // IN:
-{
-   snowMotionLogger = logger;
-}
-
-
 /*
  *-----------------------------------------------------------------------------
  *
@@ -165,10 +136,6 @@ SuperFgets(FILE *stream,   // IN:
 
    *count = size;
 
-   if (snowMotionLogger != NULL) {
-      snowMotionLogger(buf, *count);
-   }
-
    return buf;
 }