From: Katy Feng Date: Fri, 23 Dec 2022 00:25:50 +0000 (-0800) Subject: Inclusive language - "disabled" X-Git-Tag: stable-12.2.0~41 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c4e9964f58d94b31fda5bcc54c976959dd4f339;p=thirdparty%2Fopen-vm-tools.git Inclusive language - "disabled" Use “deactivated” instead of “disabled” in some files used by open-vm-tools. --- diff --git a/open-vm-tools/services/plugins/appInfo/appInfo.c b/open-vm-tools/services/plugins/appInfo/appInfo.c index 0757ace8a..0c0e1f2e9 100644 --- a/open-vm-tools/services/plugins/appInfo/appInfo.c +++ b/open-vm-tools/services/plugins/appInfo/appInfo.c @@ -1,5 +1,5 @@ /********************************************************* - * Copyright (C) 2019-2021 VMware, Inc. All rights reserved. + * Copyright (C) 2019-2022 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 @@ -66,9 +66,9 @@ VM_EMBED_VERSION(VMTOOLSD_VERSION_STRING); * Default value for CONFNAME_APPINFO_DISABLED setting in * tools configuration file. * - * FALSE will enable the plugin. TRUE will disable the plugin. + * FALSE will activate the plugin. TRUE will deactivate the plugin. */ -#define APP_INFO_CONF_DEFAULT_DISABLED_VALUE FALSE +#define APP_INFO_CONF_DEFAULT_DEACTIVATED_VALUE FALSE /** * Default value for CONFNAME_APPINFO_REMOVE_DUPLICATES setting in @@ -425,12 +425,12 @@ AppInfoGather(gpointer data) // IN * Start, stop, reconfigure a AppInfo Gather poll loop. * * This function is responsible for creating, manipulating, and resetting a - * AppInfo Gather loop timeout source. The poll loop will be disabled if + * AppInfo Gather loop timeout source. The poll loop will be deactivated if * the poll interval is 0. * * @param[in] ctx The application context. * @param[in] pollInterval Poll interval in seconds. A value of 0 will - * disable the loop. + * deactivate the loop. * ***************************************************************************** */ @@ -460,7 +460,7 @@ TweakGatherLoopEx(ToolsAppCtx *ctx, // IN AppInfoGather, ctx, NULL); g_source_unref(gAppInfoTimeoutSource); } else if (gAppInfoPollInterval > 0) { - g_info("%s: Poll loop for %s disabled.\n", + g_info("%s: Poll loop for %s deactivated.\n", __FUNCTION__, CONFNAME_APPINFO_POLLINTERVAL); SetGuestInfo(ctx, APP_INFO_GUESTVAR_KEY, ""); } @@ -491,15 +491,15 @@ static void TweakGatherLoop(ToolsAppCtx *ctx, // IN gboolean force) // IN { - gboolean disabled = + gboolean deactivated = VMTools_ConfigGetBoolean(ctx->config, CONFGROUPNAME_APPINFO, CONFNAME_APPINFO_DISABLED, - APP_INFO_CONF_DEFAULT_DISABLED_VALUE); + APP_INFO_CONF_DEFAULT_DEACTIVATED_VALUE); gint pollInterval; - if (gAppInfoEnabledInHost && !disabled) { + if (gAppInfoEnabledInHost && !deactivated) { pollInterval = VMTools_ConfigGetInteger(ctx->config, CONFGROUPNAME_APPINFO, CONFNAME_APPINFO_POLLINTERVAL, @@ -618,7 +618,8 @@ AppInfoServerSetOption(gpointer src, // IN if (retVal) { g_info("%s: State of AppInfo is changed to '%s' at host side.\n", - __FUNCTION__, gAppInfoEnabledInHost ? "enabled" : "disabled"); + __FUNCTION__, gAppInfoEnabledInHost ? "enabled" : "deactivated" ); + TweakGatherLoop(ctx, TRUE); } } @@ -648,7 +649,7 @@ AppInfoServerReset(gpointer src, { /* * gAppInfoTimeoutSource is used to figure out if the poll loop is - * enabled or not. If the poll loop is disabled, then + * enabled or not. If the poll loop is deactivated, then * gAppInfoTimeoutSource will be set to NULL. */ if (gAppInfoTimeoutSource != NULL) { @@ -692,7 +693,7 @@ AppInfoServerReset(gpointer src, gAppInfoEnabledInHost = TRUE; TweakGatherLoop(ctx, TRUE); } else { - g_debug("%s: Poll loop disabled. Ignoring.\n", __FUNCTION__); + g_debug("%s: Poll loop deactivated. Ignoring.\n", __FUNCTION__); } } } @@ -721,7 +722,7 @@ ToolsOnLoad(ToolsAppCtx *ctx) // IN }; /* - * Return NULL to disable the plugin if not running in a VMware VM. + * Return NULL to deactivate the plugin if not running in a VMware VM. */ if (!ctx->isVMware) { g_info("%s: Not running in a VMware VM.\n", __FUNCTION__); @@ -729,7 +730,7 @@ ToolsOnLoad(ToolsAppCtx *ctx) // IN } /* - * Return NULL to disable the plugin if not running in vmsvc daemon. + * Return NULL to deactivate the plugin if not running in vmsvc daemon. */ if (!TOOLS_IS_MAIN_SERVICE(ctx)) { g_info("%s: Not running in vmsvc daemon: container name='%s'.\n", diff --git a/open-vm-tools/services/plugins/guestStore/guestStorePlugin.c b/open-vm-tools/services/plugins/guestStore/guestStorePlugin.c index c7da4481e..5b084ecf2 100644 --- a/open-vm-tools/services/plugins/guestStore/guestStorePlugin.c +++ b/open-vm-tools/services/plugins/guestStore/guestStorePlugin.c @@ -1,5 +1,5 @@ /********************************************************* - * Copyright (C) 2019-2021 VMware, Inc. All rights reserved. + * Copyright (C) 2019-2022 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 @@ -222,7 +222,7 @@ GetCurrentUtcStr(void) * * IsFeatureDisabled -- * - * Check if guest admin/root has disabled GuestStore access. + * Check if guest admin/root has deactivated GuestStore access. * * Results: * Return the configured boolean value, default is FALSE. @@ -2757,7 +2757,7 @@ GuestStoreAccessEnable(void) ASSERT(!pluginData.guestStoreAccessEnabled); if (!CreateVmxListenSocket() || !CreateClientListenSocket()) { - g_warning("GuestStore access is disabled " + g_warning("GuestStore access is deactivated " "due to initialization error.\n"); GuestStoreAccessDisable(); return; @@ -2816,7 +2816,7 @@ GetVmxGuestStoreAccessEnabledState(void) * * GuestStoreShutdown -- * - * Disable GuestStore access before shutdown. + * Deactivate GuestStore access before shutdown. * * Results: * None @@ -2981,7 +2981,7 @@ GuestStoreSetOption(gpointer src, // IN if (strcmp(value, "1") == 0 && !pluginData.guestStoreAccessEnabled) { if (CheckAndUpdateFeatureDisabled()) { - g_info("GuestStore access is disabled on guest side.\n"); + g_info("GuestStore access is deactivated on guest side.\n"); } else { GuestStoreAccessEnable(); retVal = TRUE; @@ -3035,7 +3035,7 @@ ToolsOnLoad(ToolsAppCtx *ctx) // IN }; /* - * Return NULL to disable the plugin if not running in vmsvc daemon. + * Return NULL to deactivate the plugin if not running in vmsvc daemon. */ if (!TOOLS_IS_MAIN_SERVICE(ctx)) { g_info("Not running in vmsvc daemon: container name='%s'.\n", @@ -3044,7 +3044,7 @@ ToolsOnLoad(ToolsAppCtx *ctx) // IN } /* - * Return NULL to disable the plugin if not running in a VMware VM. + * Return NULL to deactivate the plugin if not running in a VMware VM. */ if (!ctx->isVMware) { g_info("Not running in a VMware VM.\n"); @@ -3052,7 +3052,7 @@ ToolsOnLoad(ToolsAppCtx *ctx) // IN } /* - * Return NULL to disable the plugin if VM is not running on ESX host. + * Return NULL to deactivate the plugin if VM is not running on ESX host. */ if (!VmCheck_GetVersion(&vmxVersion, &vmxType) || vmxType != VMX_TYPE_SCALABLE_SERVER) { diff --git a/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c b/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c index 7f32f2191..be9499348 100644 --- 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-2020 VMware, Inc. All rights reserved. + * Copyright (C) 2008-2022 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 @@ -1090,7 +1090,7 @@ ToolsOnLoad(ToolsAppCtx *ctx) } /* - * If not running in a VMware VM, return NULL to disable the plugin. + * If not running in a VMware VM, return NULL to deactivate the plugin. */ if (!ctx->isVMware) { return NULL; diff --git a/open-vm-tools/services/plugins/resolutionSet/resolutionRandR12.c b/open-vm-tools/services/plugins/resolutionSet/resolutionRandR12.c index abd5045a0..d4a5e683f 100644 --- a/open-vm-tools/services/plugins/resolutionSet/resolutionRandR12.c +++ b/open-vm-tools/services/plugins/resolutionSet/resolutionRandR12.c @@ -1,5 +1,5 @@ /********************************************************* - * Copyright (C) 2010-2017,2019-2021 VMware, Inc. All rights reserved. + * Copyright (C) 2010-2017,2019-2022 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 @@ -361,17 +361,17 @@ RandR12GetInfo(Display *display, // IN: Pointer to our display connection * * RandR12CrtcDisable -- * - * Disable crtcs and associated outputs before an fb size change. - * The function disables crtcs and associated outputs + * Deactivate crtcs and associated outputs before an fb size change. + * The function deactivates crtcs and associated outputs * 1) whose scanout area is too big for the new fb size. - * 2) that are going to be disabled with the new topology. + * 2) that are going to be deactivated with the new topology. * * Results: * TRUE on success, FALSE on failure. * * Side effects: * The RandR12info context is modified. - * The current mode of disabled outputs is set to "None". + * The current mode of deactivated outputs is set to "None". * *----------------------------------------------------------------------------- */