From: Katy Feng Date: Thu, 23 Feb 2023 19:27:13 +0000 (-0800) Subject: Inclusive terminology - "sanity check" X-Git-Tag: stable-12.3.0~109 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=202c4939446da2e251ded55a9566c54d0d9f655a;p=thirdparty%2Fopen-vm-tools.git Inclusive terminology - "sanity check" Address uses of the term "sanity check" in some files used by open-vm-tools. --- diff --git a/open-vm-tools/lib/dataMap/dataMap.c b/open-vm-tools/lib/dataMap/dataMap.c index 72be2949f..aa490a81d 100644 --- a/open-vm-tools/lib/dataMap/dataMap.c +++ b/open-vm-tools/lib/dataMap/dataMap.c @@ -1,5 +1,5 @@ /********************************************************* - * Copyright (C) 2012-2017,2019 VMware, Inc. All rights reserved. + * Copyright (C) 2012-2017,2019, 2023 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 @@ -1403,7 +1403,7 @@ HashMapSerializeEntryCb(void *key, // IN ASSERT(0); /* we do not expect this to happen */ } - /* Update left buffer size so we can do a sanity check at the end */ + /* Update left buffer size so we can do a confidence check at the end. */ clientData->buffLen -= (clientData->buffer - buffPtrOrig); } @@ -1812,7 +1812,7 @@ DataMap_Serialize(const DataMap *that, // IN HashMap_Iterate(that->map, HashMapSerializeEntryCb, FALSE, &clientData); - /* sanity check, make sure the buffer size is just used up*/ + /* confidence check, make sure the buffer size is just used up. */ ASSERT(clientData.buffLen == 0); if (clientData.result != DMERR_SUCCESS) { @@ -2494,7 +2494,7 @@ DataMap_ToString(const DataMap *that, // IN ToBufferString(&clientData, "--> End.\n"); - /* sanity check, make sure the buffer is not overflown. */ + /* confidence check, make sure the buffer is not overflown. */ ASSERT(clientData.buffLen >= 0); ASSERT(buffPtr + maxBuffSize >= clientData.buffer); diff --git a/open-vm-tools/lib/file/filePosix.c b/open-vm-tools/lib/file/filePosix.c index 890e2815e..2b4d2051f 100644 --- a/open-vm-tools/lib/file/filePosix.c +++ b/open-vm-tools/lib/file/filePosix.c @@ -2560,7 +2560,7 @@ FileVMKGetMaxOrSupportsFileSize(const char *pathName, // IN: if (fsAttrs->versionNumber == 3) { maxFileSize = (VMFS3CONST * (uint64) fsAttrs->fileBlockSize * 1024); } else if (fsAttrs->versionNumber >= 5) { - /* Get ready for 64 TB on VMFS5 and perform sanity check on version */ + /* Get ready for 64 TB on VMFS5 and perform confidence check on version */ maxFileSize = (uint64) 0x400000000000ULL; } else { Log(LGPFX" %s: Unsupported filesystem version, %u\n", __func__, diff --git a/open-vm-tools/lib/foundryMsg/foundryMsg.c b/open-vm-tools/lib/foundryMsg/foundryMsg.c index 0303af8eb..2e24573e8 100644 --- a/open-vm-tools/lib/foundryMsg/foundryMsg.c +++ b/open-vm-tools/lib/foundryMsg/foundryMsg.c @@ -1,5 +1,5 @@ /********************************************************* - * Copyright (C) 2004-2016, 2019, 2021 VMware, Inc. All rights reserved. + * Copyright (C) 2004-2016, 2019, 2021, 2023 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 @@ -732,7 +732,7 @@ VixMsg_ValidateMessage(const void *vMsg, // IN } /* - * Sanity check the header. + * Confidence check the header. * Some basic rules: All the length values in the VixMsgHeader * struct are uint32. The headerLength must be large enough to * accomodate the base header: VixMsgHeader. The bodyLength and @@ -788,7 +788,7 @@ VixMsg_ValidateRequestMsg(const void *vMsg, // IN } /* - * Sanity check the parts of the header that are specific to requests. + * Confidence check the parts of the header that are specific to requests. */ message = vMsg; if (message->commonHeader.headerLength < sizeof(VixCommandRequestHeader)) { @@ -848,7 +848,7 @@ VixMsg_ValidateResponseMsg(const void *vMsg, // IN } /* - * Sanity check the parts of the header that are specific to responses. + * Confidence check the parts of the header that are specific to responses. */ message = vMsg; if (message->commonHeader.headerLength < sizeof(VixCommandResponseHeader)) { diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c index fa6e63354..b56d06af9 100644 --- a/open-vm-tools/lib/hgfsServer/hgfsServer.c +++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c @@ -1,5 +1,5 @@ /********************************************************* - * Copyright (C) 1998-2022 VMware, Inc. All rights reserved. + * Copyright (C) 1998-2023 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 @@ -5568,7 +5568,7 @@ HgfsServerStatFs(const char *pathName, // IN: Path we're interested in Wiper_Init(NULL); /* - * Sanity checks. If length is good, assume well-formed drive path + * Confidence checks. If length is good, assume well-formed drive path * (i.e. "C:\..." or "\\abc..."). Note that we throw out shares that * exactly equal p.mountPoint's size because we won't have room for a null * delimiter on copy. Allow 0 length drives so that hidden feature "" can @@ -8711,7 +8711,7 @@ HgfsServerSetattr(HgfsInputParam *input) // IN: Input params * * HgfsServerValidateOpenParameters -- * - * Performs sanity check of the input parameters. + * Performs confidence check of the input parameters. * * Results: * HGFS_ERROR_SUCCESS if the parameters are valid. diff --git a/open-vm-tools/lib/include/vixCommands.h b/open-vm-tools/lib/include/vixCommands.h index 0379a3fbc..3c76e8f04 100644 --- a/open-vm-tools/lib/include/vixCommands.h +++ b/open-vm-tools/lib/include/vixCommands.h @@ -1,5 +1,5 @@ /********************************************************* - * Copyright (C) 2003-2021 VMware, Inc. All rights reserved. + * Copyright (C) 2003-2021, 2023 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 @@ -42,7 +42,7 @@ extern "C" { /* * These give upper bounds for how big any VIX IPC meesage - * should be. There are for sanity checks and to ignore maliciously + * should be. There are for confidence checks and to ignore maliciously * large messages that may be part of an DoS attack. The may need to * be revised if large messages are added to the protocol. */ diff --git a/open-vm-tools/lib/user/util.c b/open-vm-tools/lib/user/util.c index 8a6ed9ce4..dc7f12924 100644 --- a/open-vm-tools/lib/user/util.c +++ b/open-vm-tools/lib/user/util.c @@ -1,5 +1,5 @@ /********************************************************* - * Copyright (C) 1998-2020 VMware, Inc. All rights reserved. + * Copyright (C) 1998-2020, 2023 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 @@ -90,7 +90,7 @@ struct UtilVector { * * Util_Init -- * - * Opportunity to sanity check things + * Opportunity to confidence check things * * Results: * Bool - TRUE (this should never fail) @@ -106,7 +106,7 @@ Util_Init(void) { #ifdef VMX86_DEVEL /* - * Sanity check Str_Snprintf so that we're never thrown off guard + * Confidence check Str_Snprintf so that we're never thrown off guard * by a change in the underlying libraries that Str_Snprintf doesn't * catch and wrap properly. */ diff --git a/open-vm-tools/modules/freebsd/vmblock/subr.c b/open-vm-tools/modules/freebsd/vmblock/subr.c index dd1e8207c..bea822751 100644 --- a/open-vm-tools/modules/freebsd/vmblock/subr.c +++ b/open-vm-tools/modules/freebsd/vmblock/subr.c @@ -432,7 +432,7 @@ VMBlockNodeGet(struct mount *mp, // IN: VMBlock fs info * * VMBlockCheckVp -- * - * Sanity-checking intermediary used for debugging. When module is + * Confidence-checking intermediary used for debugging. When module is * compiled with FreeBSD macro "DIAGNOSTIC", every instance of * VMBVPTOLOWERVP() calls this function to test vnodes' and VMBlockNodes' * values, printing diagnostic information before panicing. If the kernel diff --git a/open-vm-tools/services/plugins/dndcp/dnd/dndMsg.c b/open-vm-tools/services/plugins/dndcp/dnd/dndMsg.c index 3ad9a847f..fc172c5c5 100644 --- a/open-vm-tools/services/plugins/dndcp/dnd/dndMsg.c +++ b/open-vm-tools/services/plugins/dndcp/dnd/dndMsg.c @@ -1,5 +1,5 @@ /********************************************************* - * Copyright (C) 2007-2019 VMware, Inc. All rights reserved. + * Copyright (C) 2007-2019, 2023 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 @@ -381,7 +381,7 @@ DnDMsg_UnserializeHeader(DnDMsg *msg, // IN/OUT: the message DnDReadBuffer(&r, &msg->cmd, sizeof msg->cmd) && DnDReadBuffer(&r, &msg->nargs, sizeof msg->nargs) && DnDReadBuffer(&r, &msg->expectedArgsSz, sizeof msg->expectedArgsSz)) { - /* Sanity checks. */ + /* Confidence checks. */ if (msg->expectedArgsSz < DNDMSG_MAX_ARGSZ && (msg->cmd < DND_MAX || msg->cmd < CP_MAX) && 0 < msg->cmd && diff --git a/open-vm-tools/services/plugins/dndcp/dnd/dndMsg.h b/open-vm-tools/services/plugins/dndcp/dnd/dndMsg.h index 5a604d683..062626c2d 100644 --- a/open-vm-tools/services/plugins/dndcp/dnd/dndMsg.h +++ b/open-vm-tools/services/plugins/dndcp/dnd/dndMsg.h @@ -1,5 +1,5 @@ /********************************************************* - * Copyright (C) 2007-2017 VMware, Inc. All rights reserved. + * Copyright (C) 2007-2017, 2023 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 @@ -46,7 +46,7 @@ typedef enum { DNDMSG_ERR, DNDMSG_NOMEM, DNDMSG_INPUT_TOO_SMALL, /* Input buffer needs to be bigger. */ - DNDMSG_INPUT_ERR, /* Serialize/unserialized failed sanity checks. */ + DNDMSG_INPUT_ERR, /* Serialize/unserialized failed confidence checks. */ } DnDMsgErr; /*