From caaeaf617d859f96197fad3752f3a660260afff3 Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Mon, 30 Dec 2024 10:02:08 +0000 Subject: [PATCH 01/20] Standardize wording of "vs." over "vs" (comments, messages, docs) to be consistent Signed-off-by: Jim Klimov --- INSTALL.nut.adoc | 2 +- Jenkinsfile-dynamatrix | 42 +++++++++++++++---------------- NEWS.adoc | 4 +-- README.adoc | 2 +- UPGRADING.adoc | 2 +- ci_build.sh | 2 +- clients/nutclient.cpp | 2 +- docs/asciidoc-vars.conf | 2 +- docs/config-prereqs.txt | 8 +++--- drivers/apc-mib.c | 2 +- drivers/bcmxcp_usb.c | 2 +- drivers/blazer_ser.c | 2 +- drivers/blazer_usb.c | 2 +- drivers/delta_ups-hid.c | 2 +- drivers/dstate.c | 2 +- drivers/hidparser.c | 2 +- drivers/nutdrv_qx_voltronic.c | 2 +- scripts/installer/common/shutdown | 2 +- tests/getvaluetest.c | 6 ++--- tests/nutlogtest.c | 16 ++++++------ tools/nut-dumpdiff.sh | 2 +- tools/nut-scanner/nutscan-ip.c | 4 +-- 22 files changed, 56 insertions(+), 56 deletions(-) diff --git a/INSTALL.nut.adoc b/INSTALL.nut.adoc index 64d17fdd0f..331134f832 100644 --- a/INSTALL.nut.adoc +++ b/INSTALL.nut.adoc @@ -99,7 +99,7 @@ ifndef::top_builddir[] endif::top_builddir[] // // -// Address links on GitHub vs docs +// Address links on GitHub vs. docs // (note: 'env-github' attribute is set on GitHub) // // - when generating docs: diff --git a/Jenkinsfile-dynamatrix b/Jenkinsfile-dynamatrix index e55a526ddd..0092ff7607 100644 --- a/Jenkinsfile-dynamatrix +++ b/Jenkinsfile-dynamatrix @@ -514,7 +514,7 @@ set | sort -n """ dynacfgPipeline.axisCombos_WINDOWS ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT_STRICT_C + [dynacfgPipeline.axisCombos_COMPILER_GCC_TOO_OLD] + [dynacfgPipeline.axisCombos_WINDOWS_CROSS] @@ -551,7 +551,7 @@ set | sort -n """ dynacfgPipeline.axisCombos_WINDOWS ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT_STRICT_C + [dynacfgPipeline.axisCombos_WINDOWS_CROSS] ], body) @@ -600,7 +600,7 @@ set | sort -n """ dynacfgPipeline.axisCombos_WINDOWS ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT_STRICT_C + [dynacfgPipeline.axisCombos_WINDOWS_CROSS] ], body) @@ -643,7 +643,7 @@ set | sort -n """ [~/GCCVER=[01234].+/, ~/BUILD_TYPE=default-alldrv/] ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_STRICT_C ], body) }, // getParStages @@ -681,7 +681,7 @@ set | sort -n """ [~/GCCVER=[01234].+/, ~/BUILD_TYPE=default-alldr(v|v:no-distcheck)/] ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_STRICT_C + [dynacfgPipeline.axisCombos_WINDOWS_CROSS] ], body) @@ -718,7 +718,7 @@ set | sort -n """ [~/GCCVER=[01234].+/, ~/BUILD_TYPE=default-alldrv/] ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT_STRICT_C + [dynacfgPipeline.axisCombos_COMPILER_GCC_TOO_OLD] + [dynacfgPipeline.axisCombos_WINDOWS_CROSS] @@ -758,7 +758,7 @@ set | sort -n """ dynacfgPipeline.axisCombos_WINDOWS ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesLabels': 'replace', 'commonLabelExpr': 'replace', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesLabels': 'replace', 'commonLabelExpr': 'replace', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT_STRICT_C + [dynacfgPipeline.axisCombos_COMPILER_GCC_TOO_OLD] + [dynacfgPipeline.axisCombos_WINDOWS_CROSS] @@ -806,7 +806,7 @@ set | sort -n """ dynacfgPipeline.axisCombos_WINDOWS ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesLabels': 'replace', 'commonLabelExpr': 'replace', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesLabels': 'replace', 'commonLabelExpr': 'replace', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT_STRICT_C + [dynacfgPipeline.axisCombos_COMPILER_GCC_TOO_OLD] + [dynacfgPipeline.axisCombos_WINDOWS_CROSS] @@ -847,7 +847,7 @@ set | sort -n """ [~/BUILD_TYPE=default-withdoc:man/] ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesLabels': 'replace', 'commonLabelExpr': 'replace', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesLabels': 'replace', 'commonLabelExpr': 'replace', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT_STRICT_C + [dynacfgPipeline.axisCombos_COMPILER_GCC_TOO_OLD] + [dynacfgPipeline.axisCombos_WINDOWS_CROSS] @@ -884,7 +884,7 @@ set | sort -n """ dynacfgPipeline.axisCombos_WINDOWS ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT_STRICT_C + [dynacfgPipeline.axisCombos_WINDOWS_CROSS] ], body) @@ -921,7 +921,7 @@ set | sort -n """ dynacfgPipeline.axisCombos_WINDOWS ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT_STRICT_C + [dynacfgPipeline.axisCombos_COMPILER_NOT_GCC] + [dynacfgPipeline.axisCombos_WINDOWS_CROSS] @@ -955,7 +955,7 @@ set | sort -n """ dynacfgPipeline.axisCombos_WINDOWS ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT_STRICT_C + [dynacfgPipeline.axisCombos_COMPILER_GCC] + [dynacfgPipeline.axisCombos_WINDOWS_CROSS] @@ -994,7 +994,7 @@ set | sort -n """ [~/OS_FAMILY=.+/] ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace', 'dynamatrixAxesLabels': 'replace', 'commonLabelExpr': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace', 'dynamatrixAxesLabels': 'replace', 'commonLabelExpr': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: [ [~/BITS=32/, ~/ARCH_BITS=64/], [~/BITS=64/, ~/ARCH_BITS=32/], [~/CSTDVARIANT=c/], @@ -1035,7 +1035,7 @@ set | sort -n """ [~/BUILD_WARNOPT=hard/] ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT_STRICT_C + [dynacfgPipeline.axisCombos_COMPILER_GCC_TOO_OLD] + [dynacfgPipeline.axisCombos_WINDOWS_CROSS] @@ -1076,7 +1076,7 @@ set | sort -n """ [~/BUILD_WARNOPT=hard/] ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT_STRICT_C + [ [~/COMPILER=GCC/, ~/CSTDVERSION_KEY=(?!89)/] ] + @@ -1119,7 +1119,7 @@ set | sort -n """ dynacfgPipeline.axisCombos_WINDOWS ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT_STRICT_C + [ [~/COMPILER=(?!GCC)/] ] + @@ -1156,7 +1156,7 @@ set | sort -n """ [~/BUILD_WARNOPT=hard/] ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT + [ dynacfgPipeline.axisCombos_GNU_C, dynacfgPipeline.axisCombos_WINDOWS_CROSS, @@ -1196,7 +1196,7 @@ set | sort -n """ [~/BUILD_WARNOPT=hard/] ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT + [ dynacfgPipeline.axisCombos_GNU_C, dynacfgPipeline.axisCombos_WINDOWS_CROSS, @@ -1233,7 +1233,7 @@ set | sort -n """ [~/BUILD_WARNOPT=hard/] ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT + [ dynacfgPipeline.axisCombos_GNU_C, dynacfgPipeline.axisCombos_WINDOWS_CROSS, @@ -1272,7 +1272,7 @@ set | sort -n """ [~/BUILD_WARNOPT=hard/] ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: [ dynacfgPipeline.axisCombos_ARCH32x64, dynacfgPipeline.axisCombos_ARCH64x32, @@ -1316,7 +1316,7 @@ set | sort -n """ //[~/BUILD_WARNOPT=hard/] ], runAllowedFailure: true, - mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined! + mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined! excludeCombos: [ dynacfgPipeline.axisCombos_ARCH32x64, dynacfgPipeline.axisCombos_ARCH64x32, diff --git a/NEWS.adoc b/NEWS.adoc index a8be705969..d04dc9da37 100644 --- a/NEWS.adoc +++ b/NEWS.adoc @@ -1628,7 +1628,7 @@ refer to this change set (too long in the making) as NUT 2.7.5. autoconf-2.70 releases in 2020 (also works with 2.69 which was the earlier release since 2012) * Dynamic library loading used in certain programs and use-cases improved, - especially for 64-bit vs 32-bit builds on multiple-bitness OSes + especially for 64-bit vs. 32-bit builds on multiple-bitness OSes * Logging routines like `upsdebugx()` were refactored as macros so there is slightly less overhead when logging is disabled [PRs #685 and #1100] * Numerous classes of compilation warnings eradicated, many of those being @@ -1863,7 +1863,7 @@ Release notes for NUT 2.7.2 - what's new since 2.7.1 * Emerson Network Power Liebert PSI 1440 * MicroDowell B.Box LP 500 * Numeric Digital 800 plus - * OptiUPS VS 575C + * OptiUPS vs. 575C * Tripp Lite SU10KRT3/1X - FreeDesktop Hardware Abstraction Layer (HAL) support was removed. diff --git a/README.adoc b/README.adoc index e90bc966cd..22b43ad729 100644 --- a/README.adoc +++ b/README.adoc @@ -99,7 +99,7 @@ ifndef::top_builddir[] endif::top_builddir[] // // -// Address links on GitHub vs docs +// Address links on GitHub vs. docs // (note: 'env-github' attribute is set on GitHub) // // - when generating docs: diff --git a/UPGRADING.adoc b/UPGRADING.adoc index c0b3c7a7cb..3923061c06 100644 --- a/UPGRADING.adoc +++ b/UPGRADING.adoc @@ -252,7 +252,7 @@ Changes from 2.8.0 to 2.8.1 - The `upsd.conf` listing of `LISTEN` addresses was previously inverted (the last listed address was applied first), which was counter-intuitive and fixed for this release. If user configurations somehow relied on this - order (e.g. to prioritize IPv6 vs IPv4 listeners), configuration changes + order (e.g. to prioritize IPv6 vs. IPv4 listeners), configuration changes may be needed. [#2012] - The `upsd` configured to listen on IPv6 addresses should handle only diff --git a/ci_build.sh b/ci_build.sh index 3f60f870f8..b702482423 100755 --- a/ci_build.sh +++ b/ci_build.sh @@ -1991,7 +1991,7 @@ default|default-alldrv|default-alldrv:no-distcheck|default-all-errors|default-sp done # TODO: Similar loops for other variations like TESTING, - # MGE SHUT vs other serial protocols... + # MGE SHUT vs. other serial protocols... if can_clean_check ; then echo "=== One final try for optional_maintainer_clean_check:" diff --git a/clients/nutclient.cpp b/clients/nutclient.cpp index d873e387c0..fd63197c8b 100644 --- a/clients/nutclient.cpp +++ b/clients/nutclient.cpp @@ -295,7 +295,7 @@ void Socket::connect(const std::string& host, uint16_t port) snprintf(sport, sizeof(sport), "%" PRIuMAX, static_cast(port)); memset(&hints, 0, sizeof(hints)); - /* TODO? Port IPv4 vs IPv6 detail from upsclient.c */ + /* TODO? Port IPv4 vs. IPv6 detail from upsclient.c */ hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = IPPROTO_TCP; diff --git a/docs/asciidoc-vars.conf b/docs/asciidoc-vars.conf index 1506cecfeb..75c9003e3d 100644 --- a/docs/asciidoc-vars.conf +++ b/docs/asciidoc-vars.conf @@ -89,7 +89,7 @@ ifndef::top_builddir[] endif::top_builddir[] // // -// Address links on GitHub vs docs +// Address links on GitHub vs. docs // (note: 'env-github' attribute is set on GitHub) // // - when generating docs: diff --git a/docs/config-prereqs.txt b/docs/config-prereqs.txt index ad94fcd0d9..d1d07ba8c2 100644 --- a/docs/config-prereqs.txt +++ b/docs/config-prereqs.txt @@ -18,7 +18,7 @@ of new releases. up the multi-arch Linux LXC container farm for NUT CI] Some of the below are alternatives, e.g. compiler toolkits (gcc vs. clang) -or SSL implementations (OpenSSL vs Mozilla NSS) -- no problem installing +or SSL implementations (OpenSSL vs. Mozilla NSS) -- no problem installing both, at a disk space cost. [NOTE] @@ -869,7 +869,7 @@ that seems to exceed whatever is available on network mirrors; for example, the CD image included `clang` program while it is not available to `pkg_add`, at least not via http://ftp.netbsd.hu/mirrors/openbsd/6.5/packages/amd64/ mirror. The `gcc` version on CD image differed notably from that in the -networked repository (4.2.x vs 4.9.x). +networked repository (4.2.x vs. 4.9.x). You may have to echo a working base URL (part before "6.5/..." into the `/etc/installurl` file, since the old distribution is no longer served by default site. @@ -1515,10 +1515,10 @@ programs. Further TODO for Windows would include: -* MSVCRT (ubiquitous) vs UCRT (more standards compliant, but since Windows 10) +* MSVCRT (ubiquitous) vs. UCRT (more standards compliant, but since Windows 10) https://docs.microsoft.com/en-us/cpp/porting/upgrade-your-code-to-the-universal-crt?view=msvc-160 -* libusb-0.1 vs libusb-1.0 +* libusb-0.1 vs. libusb-1.0 NOTE: Native mingw, MSYS2, etc. builds on Windows are known to suffer from interaction with antivirus software which holds executable files open and diff --git a/drivers/apc-mib.c b/drivers/apc-mib.c index 78924e31c3..2a1b9c3b39 100644 --- a/drivers/apc-mib.c +++ b/drivers/apc-mib.c @@ -29,7 +29,7 @@ #define APCC_MIB_VERSION "1.60" #define APC_UPS_DEVICE_MODEL ".1.3.6.1.4.1.318.1.1.1.1.1.1.0" -/* FIXME: Find a better oid_auto_check vs sysOID for this one? */ +/* FIXME: Find a better oid_auto_check vs. sysOID for this one? */ #define APC_UPS_SYSOID APC_UPS_DEVICE_MODEL /* Other APC sysOID: diff --git a/drivers/bcmxcp_usb.c b/drivers/bcmxcp_usb.c index 9b66aef8e0..ceec60327d 100644 --- a/drivers/bcmxcp_usb.c +++ b/drivers/bcmxcp_usb.c @@ -231,7 +231,7 @@ ssize_t get_answer(unsigned char *data, unsigned char command) /* Now validate XCP frame */ /* Check header */ if ( my_buf[0] != PW_COMMAND_START_BYTE ) { - upsdebugx(2, "get_answer: wrong header 0xab vs %02x", my_buf[0]); + upsdebugx(2, "get_answer: wrong header 0xab vs. %02x", my_buf[0]); /* Sometime we read something wrong. bad cables? bad ports? */ my_buf = memchr(my_buf, PW_COMMAND_START_BYTE, bytes_read); if (!my_buf) diff --git a/drivers/blazer_ser.c b/drivers/blazer_ser.c index e33a455d24..654315d015 100644 --- a/drivers/blazer_ser.c +++ b/drivers/blazer_ser.c @@ -95,7 +95,7 @@ ssize_t blazer_command(const char *cmd, char *buf, size_t buflen) continue; } - /* TODO: Range-check int vs ssize_t values */ + /* TODO: Range-check int vs. ssize_t values */ return (ssize_t)snprintf(buf, buflen, "%s", testing[i].answer); } diff --git a/drivers/blazer_usb.c b/drivers/blazer_usb.c index 826eb78176..a6551f87b1 100644 --- a/drivers/blazer_usb.c +++ b/drivers/blazer_usb.c @@ -544,7 +544,7 @@ ssize_t blazer_command(const char *cmd, char *buf, size_t buflen) continue; } - /* TODO: Range-check int vs ssize_t values */ + /* TODO: Range-check int vs. ssize_t values */ return (ssize_t)snprintf(buf, buflen, "%s", testing[i].answer); } diff --git a/drivers/delta_ups-hid.c b/drivers/delta_ups-hid.c index 49d5af93fb..e544a23b93 100644 --- a/drivers/delta_ups-hid.c +++ b/drivers/delta_ups-hid.c @@ -178,7 +178,7 @@ static hid_info_t delta_ups_hid2nut[] = { { "input.transfer.low.max", 0, 0, "UPS.PowerConverter.Output.DeltaConfigTransferLowMax", NULL, "%.1f", HU_FLAG_STATIC, NULL }, { "input.transfer.high.min", 0, 0, "UPS.PowerConverter.Output.DeltaConfigTransferHighMin", NULL, "%.1f", HU_FLAG_STATIC, NULL }, { "input.transfer.high.max", 0, 0, "UPS.PowerConverter.Output.DeltaConfigTransferHighMax", NULL, "%.1f", HU_FLAG_STATIC, NULL }, - /* FIXME: Check vs hardware, is this an "input" or "outlet/outpu" value after all? */ + /* FIXME: Check vs. hardware, is this an "input" or "outlet/outpu" value after all? */ { "input.source", 0, 0, "UPS.OutletSystem.Outlet.DeltaOutputSource", NULL, "%s", 0, delta_ups_output_source_info }, { "input.frequency", 0, 0, "UPS.PowerConverter.Input.Frequency", NULL, "%.1f", HU_FLAG_QUICK_POLL, NULL }, diff --git a/drivers/dstate.c b/drivers/dstate.c index 933231d979..ab7e3db699 100644 --- a/drivers/dstate.c +++ b/drivers/dstate.c @@ -1737,7 +1737,7 @@ void alarm_set(const char *buf) if (ret < 0) { /* Should we also try to print the potentially unusable buf? * Generally - likely not. But if it is short enough... - * Note: LARGEBUF was the original limit mismatched vs alarm_buf + * Note: LARGEBUF was the original limit mismatched vs. alarm_buf * size before PR #986. */ char alarm_tmp[LARGEBUF]; diff --git a/drivers/hidparser.c b/drivers/hidparser.c index e87addd987..2132dba053 100644 --- a/drivers/hidparser.c +++ b/drivers/hidparser.c @@ -571,7 +571,7 @@ HIDData_t *FindObject_with_ID_Node(HIDDesc_t *pDesc_arg, uint8_t ReportID, HIDNo void GetValue(const unsigned char *Buf, HIDData_t *pData, long *pValue) { /* Note: https://github.com/networkupstools/nut/issues/1023 - This conversion code can easily be sensitive to 32- vs 64- bit + This conversion code can easily be sensitive to 32- vs. 64- bit compilation environments. Consider the possibility of overflow in 32-bit representations when computing with extreme values, for example LogMax-LogMin+1. diff --git a/drivers/nutdrv_qx_voltronic.c b/drivers/nutdrv_qx_voltronic.c index 23e932f5c6..86b4764fe4 100644 --- a/drivers/nutdrv_qx_voltronic.c +++ b/drivers/nutdrv_qx_voltronic.c @@ -1009,7 +1009,7 @@ static item_t voltronic_qx2nut[] = { { "input.voltage.nominal", 0, NULL, "QMD\r", "", 48, '(', "", 32, 34, "%.1f", QX_FLAG_STATIC, NULL, NULL, NULL }, { "output.voltage.nominal", 0, NULL, "QMD\r", "", 48, '(', "", 36, 38, "%.1f", QX_FLAG_STATIC, NULL, NULL, NULL }, /* redundant with value from QRI */ /* { "battery_number", ST_FLAG_RW, voltronic_r_batt_numb, "QMD\r", "", 48, '(', "", 40, 41, "%d", QX_FLAG_SEMI_STATIC | QX_FLAG_RANGE | QX_FLAG_NONUT, NULL, NULL, voltronic_batt_numb }, *//* redundant with value from QBV */ -/* { "battery.voltage.nominal", 0, NULL, "QMD\r", "", 48, '(', "", 43, 46, "%.1f", QX_FLAG_STATIC, NULL, NULL, NULL }, *//* as *per battery* vs *per pack* reported by QRI */ +/* { "battery.voltage.nominal", 0, NULL, "QMD\r", "", 48, '(', "", 43, 46, "%.1f", QX_FLAG_STATIC, NULL, NULL, NULL }, *//* as *per battery* vs. *per pack* reported by QRI */ /* Query UPS for ratings * > [F\r] diff --git a/scripts/installer/common/shutdown b/scripts/installer/common/shutdown index bcd7493c49..bbb223d644 100755 --- a/scripts/installer/common/shutdown +++ b/scripts/installer/common/shutdown @@ -77,7 +77,7 @@ if test -n "$DELAY" && test "$DELAY" -ge 0 ; then true; else DELAY=120; fi DELAYON="`expr $DELAY + 10`" # TODO: Here we want to refine the list to only MONITORed UPSes that power us -# and/or take into account the killpower flag-file (upsmon master vs slave +# and/or take into account the killpower flag-file (upsmon master vs. slave # and/or `upsmon -k` status) # Convert to parsing of "ipp-status -p" which reports all needed details upslist="`"$NUT_UPSC" -l`" diff --git a/tests/getvaluetest.c b/tests/getvaluetest.c index 0d2c445ad6..3ea27aee93 100644 --- a/tests/getvaluetest.c +++ b/tests/getvaluetest.c @@ -9,8 +9,8 @@ * https://github.com/networkupstools/nut/issues/1023 * * Copyright (C) - * 2021 Nick Briggs - * 2022 Jim Klimov + * 2021 Nick Briggs + * 2022-2024 Jim Klimov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -153,7 +153,7 @@ static int RunBuiltInTests(char *argv[]) { bufU[1] = (unsigned char)0x01; /* Check different conversion methods and hope current build CPU, - * C implementation etc. do not mess up bit-shifting vs rotation, + * C implementation etc. do not mess up bit-shifting vs. rotation, * zeroing high bits, int type width extension et al. If something * is mismatched below, the production NUT code may need adaptations * for that platform to count stuff correctly! diff --git a/tests/nutlogtest.c b/tests/nutlogtest.c index b8b51dcf77..06e8ef4844 100644 --- a/tests/nutlogtest.c +++ b/tests/nutlogtest.c @@ -3,7 +3,7 @@ * do not crash). * * Copyright (C) - * 2020-2023 Jim Klimov + * 2020-2024 Jim Klimov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,17 +33,17 @@ int main(void) { #endif upsdebugx(0, "D: checking with libc handling of NULL (can segfault for some libc implementations):"); - upsdebugx(0, "D: '%s' vs '%s'", s1, s2); + upsdebugx(0, "D: '%s' vs. '%s'", s1, s2); /* This explicitly does not work with -Wformat, due to verbatim NULL without a var: * nutlogtest.c:20:5: error: reading through null pointer (argument 4) [-Werror=format=] - * and also due to (void*) vs (char*) in naive case: - * upsdebugx(0, "D: '%s' vs '%s'", NUT_STRARG(NULL), NULL); + * and also due to (void*) vs. (char*) in naive case: + * upsdebugx(0, "D: '%s' vs. '%s'", NUT_STRARG(NULL), NULL); * but with casting the explicit NULL remains: - * upsdebugx(0, "D: '%s' vs '%s'", NUT_STRARG((char *)NULL), (char *)NULL); + * upsdebugx(0, "D: '%s' vs. '%s'", NUT_STRARG((char *)NULL), (char *)NULL); */ - upsdebugx(0, "D: checking with NUT_STRARG macro: '%s' vs '%s'", NUT_STRARG(s2), s2); + upsdebugx(0, "D: checking with NUT_STRARG macro: '%s' vs. '%s'", NUT_STRARG(s2), s2); #ifdef NUT_STRARG #undef NUT_STRARG @@ -56,10 +56,10 @@ int main(void) { * ../include/common.h:155:41: warning: '%s' directive argument is null [-Wformat-overflow=] * <...snip...> * nutlogtest.c:45:63: note: format string is defined here - * 45 | upsdebugx(0, "D: checking with NUT_STRARG macro: '%s' vs '%s'", NUT_STRARG(s2), s2); + * 45 | upsdebugx(0, "D: checking with NUT_STRARG macro: '%s' vs. '%s'", NUT_STRARG(s2), s2); * | ^~ */ - upsdebugx(0, "D: checking that macro wrap trick works: '%s' vs '%s'", NUT_STRARG(s2), s2); + upsdebugx(0, "D: checking that macro wrap trick works: '%s' vs. '%s'", NUT_STRARG(s2), s2); #if (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_PUSH_POP) && (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_OVERFLOW) # pragma GCC diagnostic pop diff --git a/tools/nut-dumpdiff.sh b/tools/nut-dumpdiff.sh index 0dcb4707e2..8219b926ac 100755 --- a/tools/nut-dumpdiff.sh +++ b/tools/nut-dumpdiff.sh @@ -13,7 +13,7 @@ # if [ $# = 2 ] && [ -s "$1" ] && [ -s "$2" ]; then - echo "=== $0: comparing '$1' (-) vs '$2' (+)" >&2 + echo "=== $0: comparing '$1' (-) vs. '$2' (+)" >&2 else echo "=== $0: aborting: requires two filenames to compare as arguments" >&2 exit 1 diff --git a/tools/nut-scanner/nutscan-ip.c b/tools/nut-scanner/nutscan-ip.c index 5c09a15134..d62fb707f1 100644 --- a/tools/nut-scanner/nutscan-ip.c +++ b/tools/nut-scanner/nutscan-ip.c @@ -364,7 +364,7 @@ char * nutscan_ip_iter_init(nutscan_ip_iter_t * ip, const char * startIP, const hints.ai_family = AF_INET; ip->type = IPv4; - /* Detecting IPv4 vs IPv6 */ + /* Detecting IPv4 vs. IPv6 */ if (getaddrinfo(startIP, NULL, &hints, &res) != 0) { /*Try IPv6 detection */ ip->type = IPv6; @@ -578,7 +578,7 @@ int nutscan_cidr_to_ip(const char * cidr, char ** start_ip, char ** stop_ip) /* Note: this freeing invalidates "mask" and "saveptr" pointer targets */ free(cidr_tok); - /* Detecting IPv4 vs IPv6 */ + /* Detecting IPv4 vs. IPv6 */ memset(&hints, 0, sizeof(struct addrinfo)); hints.ai_family = AF_INET; From 4c025312105f5c3a26b2fffa1c74b63ecc2978b0 Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Mon, 30 Dec 2024 10:04:33 +0000 Subject: [PATCH 02/20] scripts/Solaris/nut-driver-enumerator.xml.in: missed one set of documentation links [#722] Signed-off-by: Jim Klimov --- scripts/Solaris/nut-driver-enumerator.xml.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/Solaris/nut-driver-enumerator.xml.in b/scripts/Solaris/nut-driver-enumerator.xml.in index fc5097a410..fbb30cd6c8 100644 --- a/scripts/Solaris/nut-driver-enumerator.xml.in +++ b/scripts/Solaris/nut-driver-enumerator.xml.in @@ -105,10 +105,12 @@ - - + + + + + + From 418e902a5eb2c17ee0011951201a3151d12306c8 Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Mon, 30 Dec 2024 10:11:08 +0000 Subject: [PATCH 03/20] scripts/Solaris/nut-driver-enumerator.xml.in: fix envvar passing to NDE script launch Signed-off-by: Jim Klimov --- scripts/Solaris/nut-driver-enumerator.xml.in | 66 +++++++++++++------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/scripts/Solaris/nut-driver-enumerator.xml.in b/scripts/Solaris/nut-driver-enumerator.xml.in index fbb30cd6c8..f192aee16f 100644 --- a/scripts/Solaris/nut-driver-enumerator.xml.in +++ b/scripts/Solaris/nut-driver-enumerator.xml.in @@ -68,23 +68,35 @@ --> + type='method' + name='start' + exec='@NUT_LIBEXECDIR@/nut-driver-enumerator.sh' + timeout_seconds='0'> + + + + + + + type='method' + name='refresh' + exec='@NUT_LIBEXECDIR@/nut-driver-enumerator.sh' + timeout_seconds='0'> + + + + + + + type='method' + name='stop' + exec='/bin/true' + timeout_seconds='60' /> + type='method' + name='start' + exec='@NUT_LIBEXECDIR@/nut-driver-enumerator.sh --daemon-after' + timeout_seconds='0'> + + + + + + + type='method' + name='refresh' + exec=':kill -SIGHUP' + timeout_seconds='0'/> + type='method' + name='stop' + exec=':kill' + timeout_seconds='60' />