Update wording of user visible messages to conform to guidelines.

diff --git a/open-vm-tools/hgfsmounter/hgfsmounter.c b/open-vm-tools/hgfsmounter/hgfsmounter.c
index 03aedf64e1f450c8cce6c414e081793a483d7ccf..9b1e2201efa8801c858a12e46908b8b35fca5fe4 100644 (file)
--- a/open-vm-tools/hgfsmounter/hgfsmounter.c
+++ b/open-vm-tools/hgfsmounter/hgfsmounter.c
@@ -1121,7 +1121,7 @@ main(int argc,          // IN
    canonicalizedPath = malloc(pathMax * sizeof *canonicalizedPath);
    if (canonicalizedPath == NULL) {
       printf("Error: cannot allocate memory for canonicalized path, "
-             "aborting mount\n");
+             "canceling mount\n");
       goto out;
    } else if (!realpath(mountPoint, canonicalizedPath)) {
       perror("Error: cannot canonicalize mount point");
@@ -1130,7 +1130,7 @@ main(int argc,          // IN
    mountPoint = canonicalizedPath;
 
    if (!ParseShareName(shareName, &shareNameHost, &shareNameDir)) {
-      printf("Error: share name is invalid, aborting mount\n");
+      printf("Error: share name is invalid, canceling mount\n");
       goto out;
    }
 

diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
index cdcfcfbbf26128e3fda90f81c28f822bcb571f5c..cc5fa281a9140f39a07648b557c12d329dfaa0e9 100644 (file)
--- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c
+++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2014-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 2014-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
@@ -1171,7 +1171,7 @@ RecordResolverNS(res_state resp, DnsConfigInfo *dnsConfigInfo) // IN
           * Not all expected nameserver entries were collected
           */
          g_warning(
-            "%s: dns update aborted, index=%d, ns=%d, IPv4=%d, IPv6=%d",
+            "%s: dns update canceled, index=%d, ns=%d, IPv4=%d, IPv6=%d",
             __FUNCTION__,
             i, resp->nscount, nscount4, nscount6);
       }

diff --git a/open-vm-tools/lib/procMgr/procMgrPosix.c b/open-vm-tools/lib/procMgr/procMgrPosix.c
index c6099d44904c68632afbad721bc1b6d8092c074b..1a9e3c18c867cccf654417f9d55e38a0055389fc 100644 (file)
--- a/open-vm-tools/lib/procMgr/procMgrPosix.c
+++ b/open-vm-tools/lib/procMgr/procMgrPosix.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
@@ -1891,7 +1891,7 @@ ProcMgrKill(pid_t pid,      // IN
 {
    if (kill(pid, sig) == -1) {
       int savedErrno = errno;
-      Warning("Error trying to kill process %"FMTPID" with signal %d: %s\n",
+      Warning("Error trying to cancel process %"FMTPID" with signal %d: %s\n",
               pid, sig, Msg_ErrString());
       errno = savedErrno;
       return 0;
@@ -1938,7 +1938,7 @@ ProcMgrKill(pid_t pid,      // IN
    /*
     * timed out -- system/process is incredibly unresponsive or unkillable
     */
-   Warning("%s: timed out trying to kill pid %"FMTPID" with signal %d\n",
+   Warning("%s: timed out trying to cancel pid %"FMTPID" with signal %d\n",
            __FUNCTION__, pid, sig);
    return -1;
 }

diff --git a/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c b/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
index 5eefefacbfad57c07b464c09a3bcbe372c3308f3..7f32f21913871195aa5adc7198f46bc78cfcdb3c 100644 (file)
--- a/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
+++ b/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2008-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 2008-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
@@ -1126,7 +1126,7 @@ ToolsOnLoad(ToolsAppCtx *ctx)
                               NULL);      // no rpc callback
 
    if (!HgfsServerManager_Register(mgrData)) {
-      g_warning("HgfsServer_InitState() failed, aborting HGFS server init.\n");
+      g_warning("HgfsServer_InitState() failed, canceling HGFS server init.\n");
       g_free(mgrData);
       return NULL;
    }

diff --git a/open-vm-tools/services/plugins/powerOps/powerOps.c b/open-vm-tools/services/plugins/powerOps/powerOps.c
index 0dccc8584b4bcc4d09caa7564d17da17bcbb3f33..494a05183fed6415b81184802c317d3d02c7fc3a 100644 (file)
--- a/open-vm-tools/services/plugins/powerOps/powerOps.c
+++ b/open-vm-tools/services/plugins/powerOps/powerOps.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2008-2016,2018-2020 VMware, Inc. All rights reserved.
+ * Copyright (C) 2008-2016, 2018-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
@@ -335,7 +335,7 @@ PowerOpsScriptCallback(GPid pid,
       g_message("Script exit code: %d, success = %d\n",
                 WEXITSTATUS(exitStatus), success);
    } else if (WIFSIGNALED(exitStatus)) {
-      g_message("Script killed by signal: %d, success = %d\n",
+      g_message("Script canceled by signal: %d, success = %d\n",
                 WTERMSIG(exitStatus), success);
    } else if (WIFSTOPPED(exitStatus)) {
       g_message("Script stopped by signal: %d, success = %d\n",

diff --git a/open-vm-tools/services/plugins/vmbackup/stateMachine.c b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
index a443b85e6752e92bab9b41cdd0a72a0367063b4e..c0ecbfd0c93ce49304de1d5d996f1c6d2e658cfe 100644 (file)
--- a/open-vm-tools/services/plugins/vmbackup/stateMachine.c
+++ b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
@@ -490,7 +490,7 @@ VmBackupDoAbort(void)
 
    if (gBackupState->machineState != VMBACKUP_MSTATE_SCRIPT_ERROR &&
        gBackupState->machineState != VMBACKUP_MSTATE_SYNC_ERROR) {
-      const char *eventMsg = "Quiesce aborted.";
+      const char *eventMsg = "Quiesce canceled.";
       /* Mark the current operation as cancelled. */
       g_mutex_lock(&gBackupState->opLock);
       if (gBackupState->currentOp != NULL) {
@@ -503,12 +503,12 @@ VmBackupDoAbort(void)
 #ifdef __linux__
       /* If quiescing has been completed, then undo it.  */
       if (gBackupState->machineState == VMBACKUP_MSTATE_SYNC_FREEZE) {
-         g_debug("Aborting with file system already quiesced, undo quiescing "
+         g_debug("Canceling with file system already quiesced, undo quiescing "
                  "operation.\n");
          if (!gBackupState->provider->undo(gBackupState,
                                       gBackupState->provider->clientData)) {
             g_debug("Quiescing undo failed.\n");
-            eventMsg = "Quiesce could not be aborted.";
+            eventMsg = "Quiesce could not be canceled.";
          }
       }
 #endif
@@ -537,7 +537,7 @@ static gboolean
 VmBackupAbortTimer(gpointer data)
 {
    ASSERT(gBackupState != NULL);
-   g_warning("Aborting backup operation due to timeout.");
+   g_warning("Canceling backup operation due to timeout.");
    g_source_unref(gBackupState->abortTimer);
    gBackupState->abortTimer = NULL;
    VmBackupDoAbort();
@@ -678,7 +678,7 @@ VmBackupAsyncCallback(void *clientData)
        * sending backup event to the host.
        */
       if (gBackupState->rpcState == VMBACKUP_RPC_STATE_ERROR) {
-         g_warning("Aborting backup operation due to RPC errors.");
+         g_warning("Canceling backup operation due to RPC errors.");
          VmBackupDoAbort();
 
          /*

diff --git a/open-vm-tools/vgauth/serviceImpl/netPosix.c b/open-vm-tools/vgauth/serviceImpl/netPosix.c
index 3611766e9184b100ae7f0f8ca60c7cc765c912d9..a959b728404de9f411d9b95a6ac9f8aa96db8bec 100644 (file)
--- a/open-vm-tools/vgauth/serviceImpl/netPosix.c
+++ b/open-vm-tools/vgauth/serviceImpl/netPosix.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2011-2017,2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 2011-2017, 2019-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
@@ -68,7 +68,7 @@ ServiceNetworkCreateSocketDir(void)
        g_file_test(socketDir, G_FILE_TEST_IS_SYMLINK))) {
       bRet = FALSE;
       Warning("%s: socket dir path '%s' already exists as a non-directory; "
-              "aborting\n", __FUNCTION__, socketDir);
+              "canceling\n", __FUNCTION__, socketDir);
       goto abort;
    }