Skip to content

Commit ad35ecb

Browse files
committed
badwords: fix issues found in scripts and other files
Single pass, not enforced. Also: - pyspelling.words: drop `web page` Closes curl#19572
1 parent 42c43f6 commit ad35ecb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+104
-105
lines changed

.github/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# the files fit into the category, and the any-glob-to-any-file ones are added
1212
# as long as any file matches. The first ones are for "major" categories (the
1313
# PR is all about that one topic, like HTTP/3), while the second ones are
14-
# "addendums" that give useful information about a PR that's really mostly
14+
# "addendums" that give useful information about a PR that is really mostly
1515
# something else (e.g. CI if the PR also touches CI jobs).
1616
#
1717
# N.B. any-glob-to-all-files is misnamed; it acts like one-glob-to-all-files.

.github/scripts/cleancmd.pl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
my @asyms;
1717

1818
open(S, "<./docs/libcurl/symbols-in-versions")
19-
|| die "can't find symbols-in-versions";
19+
|| die "cannot find symbols-in-versions";
2020
while(<S>) {
2121
if(/^([^ ]*) /) {
2222
push @asyms, $1;
@@ -30,7 +30,7 @@
3030
);
3131

3232
open(O, "<./docs/options-in-versions")
33-
|| die "can't find options-in-versions";
33+
|| die "cannot find options-in-versions";
3434
while(<O>) {
3535
chomp;
3636
if(/^([^ ]+)/) {
@@ -50,7 +50,7 @@
5050
close(O);
5151

5252
open(C, "<./.github/scripts/spellcheck.curl")
53-
|| die "can't find spellcheck.curl";
53+
|| die "cannot find spellcheck.curl";
5454
while(<C>) {
5555
if(/^\#/) {
5656
next;
@@ -99,7 +99,7 @@ sub process {
9999
# *italics*
100100
$l =~ s/\*(\S.*?)\*//g;
101101

102-
# strip out https URLs, we don't want them spellchecked
102+
# strip out https URLs, we do not want them spellchecked
103103
$l =~ s!https://[a-z0-9\#_/.-]+!!gi;
104104

105105
$out .= $l;

.github/scripts/pyspelling.words

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,6 @@ watchOS
957957
WAV
958958
WB
959959
wcurl
960-
web page
961960
WebDAV
962961
WebOS
963962
webpage

.github/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
daysUntilStale: 180
77
# Number of days of inactivity before a stale issue is closed
88
daysUntilClose: 14
9-
# Issues with these labels will never be considered stale
9+
# Issues with these labels are never considered stale
1010
exemptLabels:
1111
- pinned
1212
- security

.github/workflows/linux-old.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
# is still supported (as of this writing).
1212
# stretch has ELTS support from Freexian until 2027-06-30
1313
# For ELTS info see https://www.freexian.com/lts/extended/docs/how-to-use-extended-lts/
14-
# The Debian key will expire 2025-05-20, after which package signature
14+
# The Debian key expires 2025-05-20, after which package signature
1515
# verification may need to be disabled.
1616
# httrack is one of the smallest downloaders, needed to bootstrap ELTS,
17-
# and won't conflict with the curl we're building.
17+
# and doesn not conflict with the curl we are building.
1818

1919
name: 'Linux Old'
2020

@@ -74,7 +74,7 @@ jobs:
7474
apt-get -o Dpkg::Use-Pty=0 update
7575
apt-get -o Dpkg::Use-Pty=0 install -y --no-install-suggests --no-install-recommends cmake make automake autoconf libtool gcc pkg-config libpsl-dev libzstd-dev zlib1g-dev libgnutls28-dev libc-ares-dev libkrb5-dev libldap2-dev librtmp-dev stunnel4 groff
7676
# GitHub's actions/checkout needs newer glibc and libstdc++. The latter also depends on
77-
# gcc-8-base, but it doesn't actually seem used in our situation and isn't available in
77+
# gcc-8-base, but it does not actually seem used in our situation and is not available in
7878
# the main repo, so force the install.
7979
httrack --get https://deb.freexian.com/extended-lts/pool/main/g/glibc/libc6_2.28-10+deb10u5_amd64.deb
8080
httrack --get https://deb.freexian.com/extended-lts/pool/main/g/gcc-8/libstdc++6_8.3.0-6_amd64.deb

.github/workflows/linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ jobs:
647647
rm ~/rustls/librustls.zip
648648
649649
- name: 'build rustls'
650-
# Note: we don't check cache-hit here. If the cache is hit, we still need to dpkg install the deb.
650+
# Note: we do not check cache-hit here. If the cache is hit, we need to dpkg install the deb.
651651
if: ${{ contains(matrix.build.install_steps, 'rustls') }}
652652
run: sudo dpkg -i ~/rustls/"librustls_${RUSTLS_VERSION}_amd64.deb"
653653

CMake/Macros.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ macro(curl_internal_test _curl_test)
5656
"${_curl_test_add_libraries}"
5757
OUTPUT_VARIABLE CURL_TEST_OUTPUT)
5858
if(${_curl_test})
59-
set(${_curl_test} 1 CACHE INTERNAL "Curl test")
59+
set(${_curl_test} 1 CACHE INTERNAL "curl test")
6060
message(STATUS "Performing Test ${_curl_test} - Success")
6161
else()
62-
set(${_curl_test} "" CACHE INTERNAL "Curl test")
62+
set(${_curl_test} "" CACHE INTERNAL "curl test")
6363
message(STATUS "Performing Test ${_curl_test} - Failed")
6464
endif()
6565
endif()

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1856,7 +1856,7 @@ check_type_size("off_t" SIZEOF_OFF_T)
18561856

18571857
if(NOT WIN32)
18581858
# fseeko may not exist with _FILE_OFFSET_BITS=64 but can exist with
1859-
# _FILE_OFFSET_BITS unset or 32 (e.g. Android ARMv7 with NDK 26b and API level < 24)
1859+
# _FILE_OFFSET_BITS unset or 32 (as in Android ARMv7 with NDK 26b and API level < 24)
18601860
# so we need to test fseeko after testing for _FILE_OFFSET_BITS
18611861
check_symbol_exists("fseeko" "${CURL_INCLUDES};stdio.h" HAVE_FSEEKO)
18621862

packages/OS400/curl.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@
2929

3030
PARM KWD(CMDARGS) TYPE(*CHAR) LEN(5000) VARY(*YES *INT2) +
3131
CASE(*MIXED) EXPR(*YES) MIN(1) +
32-
PROMPT('Curl command arguments')
32+
PROMPT('curl command arguments')

packages/OS400/make-lib.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ fi
7979
if [ -n "${LINK}" ]
8080
then rm -rf "${LIBIFSNAME}/${STATBNDDIR}.BNDDIR"
8181
CMD="CRTBNDDIR BNDDIR(${TARGETLIB}/${STATBNDDIR})"
82-
CMD="${CMD} TEXT('LibCurl API static binding directory')"
82+
CMD="${CMD} TEXT('libcurl API static binding directory')"
8383
CLcommand "${CMD}"
8484

8585
for MODULE in ${MODULES}
@@ -173,7 +173,7 @@ fi
173173
if [ -n "${LINK}" ]
174174
then rm -rf "${LIBIFSNAME}/${DYNBNDDIR}.BNDDIR"
175175
CMD="CRTBNDDIR BNDDIR(${TARGETLIB}/${DYNBNDDIR})"
176-
CMD="${CMD} TEXT('LibCurl API dynamic binding directory')"
176+
CMD="${CMD} TEXT('libcurl API dynamic binding directory')"
177177
CLcommand "${CMD}"
178178
CMD="ADDBNDDIRE BNDDIR(${TARGETLIB}/${DYNBNDDIR})"
179179
CMD="${CMD} OBJ((*LIBL/${SRVPGM} *SRVPGM))"

0 commit comments

Comments
 (0)