From d2290555498e85a87a4e48225c59942befdd4814 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 28 May 2026 23:50:52 +0200 Subject: [PATCH] tidy-up: miscellaneous - drop more uses of the word "just". (not enforced here) - drop some uses of the "will" word. - "then" -> "than". - tests/http/testenv/curl.py: fix copy-paste typo in error message. - pytest: replace `shutdownh` with `shutdown` in test names. Spotted by GitHub Code Quality. - comment typos. - whitespace and newlines fixes. Closes #21830 --- .github/stale.yml | 2 +- .github/workflows/macos.yml | 2 +- CMake/FindGSS.cmake | 4 ++-- CMake/PickyWarnings.cmake | 4 ++-- CMakeLists.txt | 2 +- REUSE.toml | 4 ++-- acinclude.m4 | 2 +- configure.ac | 12 ++++++------ lib/cf-h3-proxy.c | 2 +- lib/config-os400.h | 2 +- lib/request.c | 2 +- lib/sendf.h | 2 +- lib/setopt.c | 2 +- lib/url.c | 2 +- lib/urlapi.c | 2 +- lib/vquic/curl_ngtcp2.c | 2 +- m4/curl-compilers.m4 | 4 ++-- m4/curl-gnutls.m4 | 2 +- projects/OS400/.checksrc | 2 +- projects/vms/build_gnv_curl_pcsi_desc.com | 2 +- projects/vms/build_vms.com | 2 +- projects/vms/config_h.com | 2 +- projects/vms/curl_gnv_build_steps.txt | 2 +- projects/vms/curl_release_note_start.txt | 2 +- projects/vms/make_gnv_curl_install.sh | 2 +- projects/vms/make_pcsi_curl_kit_name.com | 2 +- projects/vms/stage_curl_install.com | 2 +- scripts/cd2nroff | 2 +- scripts/checksrc.pl | 2 +- scripts/managen | 4 ++-- scripts/mdlinkcheck | 2 +- scripts/mk-ca-bundle.pl | 4 ++-- scripts/nroff2cd | 6 +++--- scripts/wcurl | 4 ++-- src/tool_getparam.c | 14 +++++++------- src/tool_operate.c | 1 + tests/certs/Makefile.am | 2 +- tests/data/DISABLED | 4 ++-- tests/data/test1075 | 2 +- tests/data/test1144 | 2 +- tests/data/test1152 | 2 +- tests/data/test1400 | 2 +- tests/data/test1401 | 2 +- tests/data/test1402 | 2 +- tests/data/test1403 | 2 +- tests/data/test1404 | 2 +- tests/data/test1405 | 4 ++-- tests/data/test1406 | 2 +- tests/data/test1407 | 2 +- tests/data/test1420 | 2 +- tests/data/test1465 | 2 +- tests/data/test1481 | 2 +- tests/data/test157 | 2 +- tests/data/test2027 | 2 +- tests/data/test2030 | 2 +- tests/data/test218 | 4 ++-- tests/data/test2304 | 2 +- tests/data/test306 | 2 +- tests/data/test341 | 2 +- tests/data/test583 | 2 +- tests/data/test750 | 2 +- tests/data/test950 | 2 +- tests/ech_tests.sh | 4 ++-- tests/ftpserver.pl | 8 ++++---- tests/getpart.pm | 2 +- tests/globalconfig.pm | 2 +- tests/http-server.pl | 2 +- tests/http/test_02_download.py | 4 ++-- tests/http/test_05_errors.py | 2 +- tests/http/test_14_auth.py | 2 +- tests/http/test_30_vsftpd.py | 4 ++-- tests/http/test_31_vsftpds.py | 4 ++-- tests/http/test_32_ftps_vsftpd.py | 4 ++-- tests/http/test_60_h3_proxy.py | 2 +- tests/http/testenv/curl.py | 2 +- tests/http/testenv/mod_curltest/mod_curltest.c | 8 ++++---- tests/libtest/first.c | 2 +- tests/libtest/first.h | 4 ++-- tests/libtest/lib1518.c | 2 +- tests/libtest/lib1537.c | 2 +- tests/libtest/lib1592.c | 6 +++--- tests/libtest/lib1908.c | 2 +- tests/libtest/lib1911.c | 2 +- tests/libtest/lib1939.c | 2 +- tests/libtest/lib1977.c | 2 +- tests/libtest/lib3027.c | 2 +- tests/libtest/lib501.c | 2 +- tests/libtest/lib505.c | 2 +- tests/libtest/lib518.c | 4 ++-- tests/libtest/lib537.c | 4 ++-- tests/libtest/test613.pl | 2 +- tests/negtelnetserver.py | 2 +- tests/rtspserver.pl | 2 +- tests/runtests.pl | 9 ++++----- tests/secureserver.pl | 6 +++--- tests/server/getpart.c | 4 ++-- tests/server/rtspd.c | 4 ++-- tests/server/sockfilt.c | 17 ++++++++--------- tests/server/sws.c | 6 +++--- tests/server/tftpd.c | 12 ++++++------ tests/serverhelp.pm | 2 +- tests/servers.pm | 12 ++++++------ tests/smbserver.py | 2 +- tests/sshserver.pl | 2 +- tests/test1119.pl | 4 ++-- tests/test1173.pl | 2 +- tests/tftpserver.pl | 2 +- tests/unit/unit1303.c | 2 +- tests/unit/unit1609.c | 2 +- tests/unit/unit1615.c | 2 +- tests/unit/unit1625.c | 2 +- tests/unit/unit1652.c | 6 +++--- tests/unit/unit1655.c | 2 +- tests/unit/unit1660.c | 2 +- tests/unit/unit1666.c | 2 +- tests/unit/unit2600.c | 2 +- 116 files changed, 184 insertions(+), 185 deletions(-) diff --git a/.github/stale.yml b/.github/stale.yml index 69a822e78b..1c2b57c2cf 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -15,7 +15,7 @@ staleLabel: stale # Comment to post when marking an issue as stale. Set to `false` to disable markComment: > This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you + recent activity. It is closed if no further activity occurs. Thank you for your contributions. # Comment to post when closing a stale issue. Set to `false` to disable closeComment: false diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b47af0a6aa..e1471fcc68 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -658,7 +658,7 @@ jobs: # Reduce build combinations, by dropping less interesting ones - { image: macos-26, compiler: 'gcc-13' } - { compiler: 'gcc-14' , build: cmake } - # Reduce autotools to just one job that is also build with cmake + # Reduce autotools to only one job that is also build with cmake - { compiler: 'gcc-13' , build: autotools } - { compiler: 'gcc-14' , build: autotools } - { compiler: 'gcc-15' , build: autotools } diff --git a/CMake/FindGSS.cmake b/CMake/FindGSS.cmake index 9237fb30b1..283aeefba9 100644 --- a/CMake/FindGSS.cmake +++ b/CMake/FindGSS.cmake @@ -121,7 +121,7 @@ if(NOT _gss_FOUND) # Not found by pkg-config. Let us take more traditional appr RESULT_VARIABLE _gss_configure_failed OUTPUT_STRIP_TRAILING_WHITESPACE) - # Older versions may not have the "--version" parameter. In this case we just do not care. + # Older versions may not have the "--version" parameter. In this case we do not care. if(_gss_configure_failed) set(_gss_version 0) else() @@ -134,7 +134,7 @@ if(NOT _gss_FOUND) # Not found by pkg-config. Let us take more traditional appr RESULT_VARIABLE _gss_configure_failed OUTPUT_STRIP_TRAILING_WHITESPACE) - # Older versions may not have the "--vendor" parameter. In this case we just do not care. + # Older versions may not have the "--vendor" parameter. In this case we do not care. if(NOT _gss_configure_failed AND NOT _gss_vendor MATCHES "Heimdal|heimdal") set(_gss_flavour "MIT") # assume a default, should not really matter endif() diff --git a/CMake/PickyWarnings.cmake b/CMake/PickyWarnings.cmake index 2de72a6d84..b326345c1a 100644 --- a/CMake/PickyWarnings.cmake +++ b/CMake/PickyWarnings.cmake @@ -407,7 +407,7 @@ if(PICKY_COMPILER) list(APPEND _picky "-wd4746") list(APPEND _picky "-wd4820") # 'A': 'N' bytes padding added after data member 'B' if(MSVC_VERSION GREATER_EQUAL 1900) - list(APPEND _picky "-wd5045") # Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified + list(APPEND _picky "-wd5045") # Compiler inserts Spectre mitigation for memory load if /Qspectre switch specified endif() endif() endif() @@ -437,7 +437,7 @@ if(CMAKE_C_STANDARD STREQUAL 90) endif() if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 3.9) OR (CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 8.1)) - list(APPEND _picky "-Wno-comma") # Just silly + list(APPEND _picky "-Wno-comma") # Silly endif() endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 362cc8ab90..198f18944a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2180,7 +2180,7 @@ if(NOT CURL_DISABLE_INSTALL) set(_explicit_libs "") get_target_property(_imported "${_lib}" IMPORTED) if(NOT _imported) - # Reading the LOCATION property on non-imported target does error out. + # Reading the LOCATION property on non-imported target errors out. # Assume the user does not need this information in the .pc file. continue() endif() diff --git a/REUSE.toml b/REUSE.toml index c2e8b79288..87be5825cc 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -2,8 +2,8 @@ # SPDX-FileCopyrightText: Daniel Stenberg, , et al. # This file describes the licensing and copyright situation for files that -# cannot be annotated directly, for example because of being -# uncommentable. Unless this is the case, a file should be annotated directly. +# cannot be annotated directly, for example because of being uncommentable. +# Unless this is the case, a file should be annotated directly. # # This follows the REUSE specification: https://reuse.software/spec-3.2/#reusetoml diff --git a/acinclude.m4 b/acinclude.m4 index 73afac6e08..11fe68c737 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1040,7 +1040,7 @@ AC_DEFUN([CURL_VERIFY_RUNTIMELIBS], [ dnl this test is of course not sensible if we are cross-compiling! if test "$cross_compiling" != "yes"; then - dnl just run a program to verify that the libs checked for previous to this + dnl run a program to verify that the libs checked for previous to this dnl point also is available runtime! AC_MSG_CHECKING([runtime libs availability]) CURL_RUN_IFELSE([ diff --git a/configure.ac b/configure.ac index 20b4a9d91b..b2a996aa0b 100644 --- a/configure.ac +++ b/configure.ac @@ -227,7 +227,7 @@ exec $CC "$@" EOF dnl ********************************************************************** -dnl See which TLS backend(s) that are requested. Just do all the +dnl See which TLS backend(s) that are requested. Do all the dnl TLS AC_ARG_WITH() invokes here and do the checks later dnl ********************************************************************** OPT_SCHANNEL=no @@ -1610,7 +1610,7 @@ if test "x$OPT_BROTLI" != "xno"; then DIR_BROTLI=`echo $LD_BROTLI | $SED -e 's/^-L//'` ;; off) - dnl no --with-brotli option given, just check default places + dnl no --with-brotli option given, check default places ;; *) dnl use the given --with-brotli spot @@ -1700,7 +1700,7 @@ if test "x$OPT_ZSTD" != "xno"; then ;; off) - dnl no --with-zstd option given, just check default places + dnl no --with-zstd option given, check default places ;; *) dnl use the given --with-zstd spot @@ -1846,7 +1846,7 @@ int main(int argc, char **argv) { #ifdef _WIN32 /* on Windows, writing to the argv does not hide the argument in - process lists so it can just be skipped */ + process lists so it can be skipped */ (void)argc; (void)argv; return 1; @@ -2437,7 +2437,7 @@ if test "x$OPT_LIBSSH2" != "xno"; then ;; off) - dnl no --with-libssh2 option given, just check default places + dnl no --with-libssh2 option given, check default places ;; *) dnl use the given --with-libssh2 spot @@ -2514,7 +2514,7 @@ elif test "x$OPT_LIBSSH" != "xno"; then ;; off) - dnl no --with-libssh option given, just check default places + dnl no --with-libssh option given, check default places ;; *) dnl use the given --with-libssh spot diff --git a/lib/cf-h3-proxy.c b/lib/cf-h3-proxy.c index 4fdaef47d0..d5fb45e73d 100644 --- a/lib/cf-h3-proxy.c +++ b/lib/cf-h3-proxy.c @@ -1404,7 +1404,7 @@ static void cb_ngtcp2_rand(uint8_t *dest, size_t destlen, result = Curl_rand(NULL, dest, destlen); if(result) { /* cb_rand is only used for non-cryptographic context. If Curl_rand - failed, just fill 0 and call it *random*. */ + failed, fill 0 and call it *random*. */ memset(dest, 0, destlen); } } diff --git a/lib/config-os400.h b/lib/config-os400.h index 1bb11c48ac..eacd6e8942 100644 --- a/lib/config-os400.h +++ b/lib/config-os400.h @@ -238,7 +238,7 @@ /* Size of time_t in number of bytes */ #define SIZEOF_TIME_T 4 -/* Define to 1 if all of the C89 standard headers exist (not just the ones +/* Define to 1 if all of the C89 standard headers exist (not only the ones required in a freestanding environment). This macro is provided for backward compatibility; new code need not use it. */ #define STDC_HEADERS 1 diff --git a/lib/request.c b/lib/request.c index c231a63eaa..4ecb462951 100644 --- a/lib/request.c +++ b/lib/request.c @@ -392,7 +392,7 @@ CURLcode Curl_req_send(struct Curl_easy *data, struct dynbuf *req, blen = curlx_dyn_len(req); /* if the sendbuf is empty and the request without body and * the length to send fits info a sendbuf chunk, we send it directly. - * If `blen` is larger then `chunk_size`, we can not. Because we + * If `blen` is larger than `chunk_size`, we can not. Because we * might have to retry a blocked send later from sendbuf and that * would result in retry sends with a shrunken length. That is trouble. */ if(Curl_bufq_is_empty(&data->req.sendbuf) && diff --git a/lib/sendf.h b/lib/sendf.h index 75c6e248ea..787fe7ff69 100644 --- a/lib/sendf.h +++ b/lib/sendf.h @@ -377,7 +377,7 @@ curl_off_t Curl_creader_client_length(struct Curl_easy *data); * values will be ignored. * @return CURLE_OK if offset could be set * CURLE_READ_ERROR if not supported by reader or seek/read failed - * of offset larger then total length + * of offset larger than total length * CURLE_PARTIAL_FILE if offset led to 0 total length */ CURLcode Curl_creader_resume_from(struct Curl_easy *data, curl_off_t offset); diff --git a/lib/setopt.c b/lib/setopt.c index d4c1ca69a4..368548f704 100644 --- a/lib/setopt.c +++ b/lib/setopt.c @@ -2774,7 +2774,7 @@ static CURLcode setopt_offt(struct Curl_easy *data, CURLoption option, break; case CURLOPT_MAX_SEND_SPEED_LARGE: /* - * When transfer uploads are faster then CURLOPT_MAX_SEND_SPEED_LARGE + * When transfer uploads are faster than CURLOPT_MAX_SEND_SPEED_LARGE * bytes per second the transfer is throttled.. */ if(offt < 0) diff --git a/lib/url.c b/lib/url.c index aa151eda7e..d7af1560f9 100644 --- a/lib/url.c +++ b/lib/url.c @@ -980,7 +980,7 @@ static bool url_match_destination(struct connectdata *conn, return FALSE; } } - /* Scheme mismatch is acceptable, just compare hostname/port */ + /* Scheme mismatch is acceptable, compare hostname/port */ return Curl_peer_same_destination(m->needle->origin, conn->origin); } diff --git a/lib/urlapi.c b/lib/urlapi.c index 9fd08890f3..08e29aa513 100644 --- a/lib/urlapi.c +++ b/lib/urlapi.c @@ -480,7 +480,7 @@ static CURLUcode hostname_check(struct Curl_URL *u, char *hostname, /* more than one trailing dot is not allowed */ return CURLUE_BAD_HOSTNAME; else if((hlen == 1) && (hostname[0] == '.')) - /* just a single dot is not allowed */ + /* a single dot alone is not allowed */ return CURLUE_BAD_HOSTNAME; } return CURLUE_OK; diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c index a5e0ea2cf9..deb21e882d 100644 --- a/lib/vquic/curl_ngtcp2.c +++ b/lib/vquic/curl_ngtcp2.c @@ -1697,7 +1697,7 @@ static CURLcode h3_stream_open(struct Curl_cfilter *cf, stream->upload_left = -1; /* unknown */ break; default: - /* there is not request body */ + /* there is no request body */ stream->upload_left = 0; /* no request body */ break; } diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4 index 27500c879b..3c96093abb 100644 --- a/m4/curl-compilers.m4 +++ b/m4/curl-compilers.m4 @@ -174,7 +174,7 @@ dnl ------------------------------------------------- dnl Verify if compiler being used is GNU C dnl dnl $compiler_num is set to MAJOR * 100 + MINOR for gcc less than version -dnl 7 and just $MAJOR * 100 for gcc version 7 and later. +dnl 7 and $MAJOR * 100 for gcc version 7 and later. dnl dnl Examples: dnl Version 1.2.3 => 102 @@ -966,7 +966,7 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ tmp_CFLAGS="$tmp_CFLAGS -Wno-c99-extensions" # Avoid: warning: '_Bool' is a C99 extension fi if test "$compiler_num" -ge "309"; then - tmp_CFLAGS="$tmp_CFLAGS -Wno-comma" # Just silly + tmp_CFLAGS="$tmp_CFLAGS -Wno-comma" # Silly fi ;; esac diff --git a/m4/curl-gnutls.m4 b/m4/curl-gnutls.m4 index 93e1e1b9c0..3eab1c5d31 100644 --- a/m4/curl-gnutls.m4 +++ b/m4/curl-gnutls.m4 @@ -72,7 +72,7 @@ if test "x$OPT_GNUTLS" != "xno"; then addlib=-lgnutls addld=-L$OPT_GNUTLS/lib$libsuff addcflags=-I$OPT_GNUTLS/include - dnl we just do not know + dnl we do not know version="" gtlslib=$OPT_GNUTLS/lib$libsuff fi diff --git a/projects/OS400/.checksrc b/projects/OS400/.checksrc index 3bd88ff1e7..e27d5729de 100644 --- a/projects/OS400/.checksrc +++ b/projects/OS400/.checksrc @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: curl -# Possibly not what we want, but cannot test, just silence the warnings +# Possibly not what we want, but cannot test, thus silence the warnings allowfunc calloc allowfunc free allowfunc malloc diff --git a/projects/vms/build_gnv_curl_pcsi_desc.com b/projects/vms/build_gnv_curl_pcsi_desc.com index cbdd637969..7726b4aa9f 100644 --- a/projects/vms/build_gnv_curl_pcsi_desc.com +++ b/projects/vms/build_gnv_curl_pcsi_desc.com @@ -425,7 +425,7 @@ $ destname = "[gnv.beta" + destname - "[gnv.usr" $ endif $ endif $! -$! It should be just a directory then. +$! It should be a directory then. $!------------------------------------- $ filedir = f$edit(f$parse(filename,,,"DIRECTORY"), "lowercase") $! If this is not a directory then start processing files. diff --git a/projects/vms/build_vms.com b/projects/vms/build_vms.com index 283e39ecf4..d79fdb5940 100644 --- a/projects/vms/build_vms.com +++ b/projects/vms/build_vms.com @@ -723,7 +723,7 @@ $ endif $ 'vo_c' " SSLLIB = ''ssllib'" $! $! TODO: Why are we translating the logical name? -$! The logical aname used to find the shared image should just be used +$! The logical aname used to find the shared image should be used $! as translating it could result in the wrong location at run time. $ if (openssl .eq. 1) $ then diff --git a/projects/vms/config_h.com b/projects/vms/config_h.com index e42ecd9d78..0b23cc6633 100644 --- a/projects/vms/config_h.com +++ b/projects/vms/config_h.com @@ -10,7 +10,7 @@ $! The CONFIGURE shell script will be examined for hints and a few symbols $! but most of the tests will not produce valid results on OpenVMS. Some $! will produce false positives and some will produce false negatives. $! -$! It is easier to just read the config.h_in file and make up tests based +$! It is easier to read the config.h_in file and make up tests based $! on what is in it! $! $! This file will create an empty config_vms.h file if one does not exist. diff --git a/projects/vms/curl_gnv_build_steps.txt b/projects/vms/curl_gnv_build_steps.txt index 687b7b63f4..88af34f580 100644 --- a/projects/vms/curl_gnv_build_steps.txt +++ b/projects/vms/curl_gnv_build_steps.txt @@ -268,7 +268,7 @@ branding the PCSI kit based on who is making the kit. This compares the VMS specific source with the backup staging directory for it and updates with any changes. - Leave off "UPDATE" to just check without doing any changes. + Leave off "UPDATE" to check without doing any changes. If you are not using NFS mounted disks and do not want to have a separate directory for staging the sources for backup make sure diff --git a/projects/vms/curl_release_note_start.txt b/projects/vms/curl_release_note_start.txt index 1a67b36020..184b458dd6 100644 --- a/projects/vms/curl_release_note_start.txt +++ b/projects/vms/curl_release_note_start.txt @@ -36,7 +36,7 @@ the GNV$LIBCURL shared image and create logical names GNV$LIBCURL to reference it. It will create the GNV$CURL_INCLUDE logical name for build procedures to access the header files. -Normally to use curl from DCL, just create a foreign command as: +Normally to use curl from DCL, create a foreign command as: curl :== $gnv$gnu:[usr.bin]gnv$curl.exe If you need to work around having the older HP SSL kit installed, then diff --git a/projects/vms/make_gnv_curl_install.sh b/projects/vms/make_gnv_curl_install.sh index 4723070387..623fcc3a6b 100755 --- a/projects/vms/make_gnv_curl_install.sh +++ b/projects/vms/make_gnv_curl_install.sh @@ -37,7 +37,7 @@ export GNV_CC_MAIN_POSIX_EXIT=1 make cd ../.. # adjust the libcurl.pc file, GNV currently ignores the Lib: line. -# but is noisy about it, so we just remove it. +# but is noisy about it, so we remove it. sed -e 's/^Libs:/#Libs:/g' libcurl.pc > libcurl.pc_new rm libcurl.pc mv libcurl.pc_new libcurl.pc diff --git a/projects/vms/make_pcsi_curl_kit_name.com b/projects/vms/make_pcsi_curl_kit_name.com index 956f7c1677..c7c2b26ada 100644 --- a/projects/vms/make_pcsi_curl_kit_name.com +++ b/projects/vms/make_pcsi_curl_kit_name.com @@ -67,7 +67,7 @@ $ write sys$output "*****" $! $! $! Base is one of 'VMS', 'AXPVMS', 'I64VMS', 'VAXVMS' and indicates what -$! binaries are in the kit. A kit with just 'VMS' can be installed on all +$! binaries are in the kit. A kit with only 'VMS' can be installed on all $! architectures. $! $ base = "VMS" diff --git a/projects/vms/stage_curl_install.com b/projects/vms/stage_curl_install.com index 10ae17adcb..48f6514e5f 100644 --- a/projects/vms/stage_curl_install.com +++ b/projects/vms/stage_curl_install.com @@ -96,7 +96,7 @@ $ this_dir = f$element(i, ",", dest_dirs) $ i = i + 1 $ if this_dir .eqs. "" then goto curl_dir_loop $ if this_dir .eqs. "," then goto curl_dir_loop_end -$! Just create the directories, do not delete them. +$! Create the directories, do not delete them. $! -------------------------------------------------- $ if remove_files .eq. 0 $ then diff --git a/scripts/cd2nroff b/scripts/cd2nroff index 62c9df025a..d051433a72 100755 --- a/scripts/cd2nroff +++ b/scripts/cd2nroff @@ -426,7 +426,7 @@ sub single { print STDERR "$f:$line:1:ERROR: un-escaped < or > used\n"; $errors++; } - # convert backslash-'<' or '> to just the second character + # convert backslash-'<' or '> to the second character $d =~ s/\\([<>])/$1/g; # mentions of curl symbols with man pages use italics by default diff --git a/scripts/checksrc.pl b/scripts/checksrc.pl index 64b1da9a85..41bf846bcd 100755 --- a/scripts/checksrc.pl +++ b/scripts/checksrc.pl @@ -879,7 +879,7 @@ sub scanfile { } } - # check for "return" with parentheses around just a value/name + # check for "return" with parentheses around a value/name if($l =~ /^(.*\W)return \(\w*\);/) { checkwarn("RETURNPAREN", $line, length($1)+7, $file, $l, "return with paren"); diff --git a/scripts/managen b/scripts/managen index e9b5d6157e..2b82e74a8b 100755 --- a/scripts/managen +++ b/scripts/managen @@ -494,7 +494,7 @@ sub render { } } - # convert backslash-'<' or '> to just the second character + # convert backslash-'<' or '> to the second character $d =~ s/\\([><])/$1/g; # convert single backslash to double-backslash $d =~ s/\\/\\\\/g if($manpage); @@ -916,7 +916,7 @@ sub single { push @ex, "[0q]Example$s:\n"; # # long ASCII examples are wrapped. Preferably at the last space - # before the margin. Or at a colon. Otherwise it just cuts at the + # before the margin. Or at a colon. Otherwise it cuts at the # exact boundary. # foreach my $e (@examples) { diff --git a/scripts/mdlinkcheck b/scripts/mdlinkcheck index 4569b764d7..3c86ddb75a 100755 --- a/scripts/mdlinkcheck +++ b/scripts/mdlinkcheck @@ -108,7 +108,7 @@ sub storelink { #print "-- whitelisted: $link\n"; $whitelist{$link}++; } - # example.com is just example + # example.com is used as example elsif($link =~ /^https:\/\/(.*)example.(com|org|net)/) { #print "-- example: $link\n"; } diff --git a/scripts/mk-ca-bundle.pl b/scripts/mk-ca-bundle.pl index f36c16892d..6ef5d55e83 100755 --- a/scripts/mk-ca-bundle.pl +++ b/scripts/mk-ca-bundle.pl @@ -421,7 +421,7 @@ print CRT <) { # # The latter is for certificates that have already been removed and are not # included. Not all explicitly distrusted certificates are ignored at this - # point, just those without an actual certificate. + # point, only those without an actual certificate. elsif(!$main_block && !$trust_block) { next; } diff --git a/scripts/nroff2cd b/scripts/nroff2cd index 51b6974b8d..6b2e3226a9 100755 --- a/scripts/nroff2cd +++ b/scripts/nroff2cd @@ -30,7 +30,7 @@ This script converts an nroff file to curldown Example: cd2nroff [options] > Note: when converting .nf sections, this tool does not know if the -section is code or just regular quotes. It then assumes and uses ~~~c +section is code or regular quotes. It then assumes and uses ~~~c for code. =end comment @@ -116,7 +116,7 @@ HEAD # if there are enclosing quotes, remove them first $word =~ s/[\"\'](.*)[\"\']\z/$1/; if($word eq "SEE ALSO") { - # we just slurp up this section + # we slurp up this section next; } push @desc, "\n# $word\n\n"; @@ -131,7 +131,7 @@ HEAD push @desc, "\n## $word\n\n"; } elsif($d =~ /^\.IP/) { - # .IP with no text we just skip + # .IP with no text we skip } elsif($d =~ /^\.BR (.*)/) { # only used for SEE ALSO diff --git a/scripts/wcurl b/scripts/wcurl index c39806cf94..a5c1f95e1c 100755 --- a/scripts/wcurl +++ b/scripts/wcurl @@ -67,7 +67,7 @@ Options: --no-decode-filename: Do not percent-decode the output filename, even if the percent-encoding in the URL was done by wcurl, e.g.: The URL contained whitespace. - --dry-run: Do not actually execute curl, just print what would be invoked. + --dry-run: Do not actually execute curl, only print what would be invoked. -V, --version: Print version information. @@ -197,7 +197,7 @@ get_url_filename() # sed to also replace ':' with the percent_encoded %3A */*) percent_decode "$(printf %s "${hostname_and_path}" | sed -e 's,^.*/,,' -e 's,:,%3A,g')" ;; esac - # No slash means there was just a hostname and no path; return empty string. + # No slash means there was only a hostname and no path; return empty string. } # Execute curl with the list of URLs provided by the user. diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 05642e7a83..00fd8515a5 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -539,11 +539,11 @@ struct sizeunit { static const struct sizeunit *getunit(char unit) { static const struct sizeunit list[] = { - {'p', (curl_off_t)1125899906842624, 16 }, /* Peta */ - {'t', (curl_off_t)1099511627776, 13 }, /* Tera */ - {'g', 1073741824, 10 }, /* Giga */ - {'m', 1048576, 7 }, /* Mega */ - {'k', 1024, 4 }, /* Kilo */ + { 'p', (curl_off_t)1125899906842624, 16 }, /* Peta */ + { 't', (curl_off_t)1099511627776, 13 }, /* Tera */ + { 'g', 1073741824, 10 }, /* Giga */ + { 'm', 1048576, 7 }, /* Mega */ + { 'k', 1024, 4 }, /* Kilo */ }; size_t i; @@ -1627,12 +1627,12 @@ static ParameterError parse_time_cond(struct OperationConfig *config, config->timecond = CURL_TIMECOND_IFMODSINCE; break; case '-': - /* If-Unmodified-Since: (section 14.24 in RFC2068) */ + /* If-Unmodified-Since: (section 14.24 in RFC2068) */ config->timecond = CURL_TIMECOND_IFUNMODSINCE; nextarg++; break; case '=': - /* Last-Modified: (section 14.29 in RFC2068) */ + /* Last-Modified: (section 14.29 in RFC2068) */ config->timecond = CURL_TIMECOND_LASTMOD; nextarg++; break; diff --git a/src/tool_operate.c b/src/tool_operate.c index a8d928f496..dbf4ceea73 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -722,6 +722,7 @@ static CURLcode post_close_output(struct per_transfer *per, } return result; } + /* * Call this after a transfer has completed. */ diff --git a/tests/certs/Makefile.am b/tests/certs/Makefile.am index d28b1674da..078b4490b6 100644 --- a/tests/certs/Makefile.am +++ b/tests/certs/Makefile.am @@ -35,7 +35,7 @@ all-am: test-ca.cacert # Rebuild the certificates -# Generate all certs in a single shot, but declare just a single target file +# Generate all certs in a single shot, but declare only a single target file # to support GNU Make <4.3 without the "grouped explicit targets" feature. test-ca.cacert: $(CERTCONFIG_CA) $(CERTCONFIGS) genserv.pl @PERL@ $(srcdir)/genserv.pl test $(CERTCONFIGS) diff --git a/tests/data/DISABLED b/tests/data/DISABLED index b6fe06d795..60dca3ca6a 100644 --- a/tests/data/DISABLED +++ b/tests/data/DISABLED @@ -23,7 +23,7 @@ ########################################################################### # # This file can be used to specify test cases that should not run when all -# test cases are run by runtests.pl. Just add the plain test case numbers, one +# test cases are run by runtests.pl. Add the plain test case numbers, one # per line. # Lines starting with '#' letters are treated as comments. # @@ -43,7 +43,7 @@ 1184 1209 1211 -# fnmatch differences are just too common to make testing them sensible +# fnmatch differences are too common to make testing them sensible 1307 1316 1512 diff --git a/tests/data/test1075 b/tests/data/test1075 index f543192703..6f2a21bba1 100644 --- a/tests/data/test1075 +++ b/tests/data/test1075 @@ -13,7 +13,7 @@ HTTP Basic auth # The test server provides no way to respond differently to a subsequent # Basic authenticated request (we really want to respond with 200 for -# the second), so just respond with 401 for both and let curl deal with it. +# the second), so respond with 401 for both and let curl deal with it. HTTP/1.1 401 Authorization Required Server: testcurl diff --git a/tests/data/test1144 b/tests/data/test1144 index a7baf6ef0e..4446e63212 100644 --- a/tests/data/test1144 +++ b/tests/data/test1144 @@ -11,7 +11,7 @@ HTTP/0.9 # Server-side -No headers at all, just data swsclose +No headers at all, only data swsclose Let's get diff --git a/tests/data/test1152 b/tests/data/test1152 index ad548e64f1..692f51faa0 100644 --- a/tests/data/test1152 +++ b/tests/data/test1152 @@ -9,7 +9,7 @@ FAILURE # Server-side -REPLY PWD 257 "just one +REPLY PWD 257 "Only one diff --git a/tests/data/test1400 b/tests/data/test1400 index cf4aabbb87..d3279a9e7c 100644 --- a/tests/data/test1400 +++ b/tests/data/test1400 @@ -51,7 +51,7 @@ Accept: */* # CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with # CURLOPT_INTERLEAVEDATA requires RTSP protocol -# configurations - just ignore them +# configurations - ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ $_ = '' if /CURLOPT_HTTP_VERSION/ diff --git a/tests/data/test1401 b/tests/data/test1401 index 3f84805e00..74d1748339 100644 --- a/tests/data/test1401 +++ b/tests/data/test1401 @@ -62,7 +62,7 @@ X-Men: cyclops, iceman # CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with -# configurations - just ignore them +# configurations - ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ $_ = '' if /CURLOPT_HTTP_VERSION/ diff --git a/tests/data/test1402 b/tests/data/test1402 index 82061a385c..6dd608458a 100644 --- a/tests/data/test1402 +++ b/tests/data/test1402 @@ -54,7 +54,7 @@ foo=bar%AMPbaz=quux # CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with -# configurations - just ignore them +# configurations - ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ $_ = '' if /CURLOPT_HTTP_VERSION/ diff --git a/tests/data/test1403 b/tests/data/test1403 index c3416a3305..14383314d4 100644 --- a/tests/data/test1403 +++ b/tests/data/test1403 @@ -51,7 +51,7 @@ Accept: */* # CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with -# configurations - just ignore them +# configurations - ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ $_ = '' if /CURLOPT_HTTP_VERSION/ diff --git a/tests/data/test1404 b/tests/data/test1404 index 9fbd55526f..d1a1d5217c 100644 --- a/tests/data/test1404 +++ b/tests/data/test1404 @@ -96,7 +96,7 @@ dummy data # CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with -# configurations - just ignore them +# configurations - ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ $_ = '' if /CURLOPT_HTTP_VERSION/ diff --git a/tests/data/test1405 b/tests/data/test1405 index 853c967ba7..611dbf720f 100644 --- a/tests/data/test1405 +++ b/tests/data/test1405 @@ -65,11 +65,11 @@ QUIT # CURLOPT_USERAGENT and CURLOPT_MAXREDIRS requires HTTP protocol # CURLOPT_INTERLEAVEDATA requires RTSP (HTTP) protocol -# support, IOW depends on configuration - just ignore these. +# support, IOW depends on configuration - ignore these. $_ = '' if /CURLOPT_USERAGENT/ $_ = '' if /CURLOPT_MAXREDIRS/ # CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with -# configurations - just ignore them +# configurations - ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ $_ = '' if /CURLOPT_HTTP_VERSION/ diff --git a/tests/data/test1406 b/tests/data/test1406 index 26ad1c7998..d7c4adcfa9 100644 --- a/tests/data/test1406 +++ b/tests/data/test1406 @@ -61,7 +61,7 @@ body . -# These options vary with configurations - just ignore them +# These options vary with configurations - ignore them # CURLOPT_INTERLEAVEDATA requires RTSP (HTTP) protocol $_ = '' if /CURLOPT_MAXREDIRS/ $_ = '' if /CURLOPT_SSL_VERIFYPEER/ diff --git a/tests/data/test1407 b/tests/data/test1407 index 1436786115..599eb1d3e4 100644 --- a/tests/data/test1407 +++ b/tests/data/test1407 @@ -48,7 +48,7 @@ LIST %TESTNUMBER QUIT -# These options vary with configurations - just ignore them +# These options vary with configurations - ignore them # CURLOPT_USERAGENT and CURLOPT_MAXREDIRS requires HTTP protocol # CURLOPT_INTERLEAVEDATA requires RTSP (HTTP) protocol $_ = '' if /CURLOPT_USERAGENT/ diff --git a/tests/data/test1420 b/tests/data/test1420 index 57fdbe18d8..cdf51cd0cf 100644 --- a/tests/data/test1420 +++ b/tests/data/test1420 @@ -54,7 +54,7 @@ A004 FETCH 1 BODY[] A005 LOGOUT -# These options vary with configurations - just ignore them +# These options vary with configurations - ignore them # CURLOPT_INTERLEAVEDATA requires RTSP (HTTP) protocol $_ = '' if /CURLOPT_MAXREDIRS/ $_ = '' if /CURLOPT_SSL_VERIFYPEER/ diff --git a/tests/data/test1465 b/tests/data/test1465 index 2c4804d519..d8d6115b1f 100644 --- a/tests/data/test1465 +++ b/tests/data/test1465 @@ -58,7 +58,7 @@ Content-Type: application/x-www-form-urlencoded # CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with -# configurations - just ignore them +# configurations - ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ $_ = '' if /CURLOPT_HTTP_VERSION/ diff --git a/tests/data/test1481 b/tests/data/test1481 index 98c018bc26..8a0d310785 100644 --- a/tests/data/test1481 +++ b/tests/data/test1481 @@ -54,7 +54,7 @@ Proxy-Connection: Keep-Alive # CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with # CURLOPT_INTERLEAVEDATA requires RTSP protocol -# configurations - just ignore them +# configurations - ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ $_ = '' if /CURLOPT_HTTP_VERSION/ diff --git a/tests/data/test157 b/tests/data/test157 index 422d88f69a..fe9c9bdd92 100644 --- a/tests/data/test157 +++ b/tests/data/test157 @@ -16,7 +16,7 @@ Server: Apache/1.3.27 (Darwin) PHP/4.1.2 Content-Type: text/html; charset=iso-8859-1 Connection: close -GET received and served just fine. Thank you very much +GET received and served fine. Thank you very much diff --git a/tests/data/test2027 b/tests/data/test2027 index 2a5fa6e3db..dfcefa302a 100644 --- a/tests/data/test2027 +++ b/tests/data/test2027 @@ -16,7 +16,7 @@ Explanation for the duplicate 400 requests: libcurl does not detect that a given Digest password is wrong already on the first 401 response (as the data400 gives). libcurl will instead consider the -new response just as a duplicate and it sends another and detects the auth +new response as a duplicate and it sends another and detects the auth problem on the second 401 response! --> diff --git a/tests/data/test2030 b/tests/data/test2030 index e0d7ba5513..5027fd45da 100644 --- a/tests/data/test2030 +++ b/tests/data/test2030 @@ -21,7 +21,7 @@ Explanation for the duplicate 400 requests: libcurl does not detect that a given Digest password is wrong already on the first 401 response (as the data400 gives). libcurl will instead consider the -new response just as a duplicate and it sends another and detects the auth +new response as a duplicate and it sends another and detects the auth problem on the second 401 response! --> diff --git a/tests/data/test218 b/tests/data/test218 index 41bd83818e..14fc604830 100644 --- a/tests/data/test218 +++ b/tests/data/test218 @@ -31,7 +31,7 @@ HTTP PUT from a file but enforce chunked transfer-encoding -T %LOGDIR/file%TESTNUMBER -H "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -just some tiny teeny contents +some tiny teeny test contents @@ -45,7 +45,7 @@ Accept: */*%CR Transfer-Encoding: chunked%CR %CR 1e%CR -just some tiny teeny contents +some tiny teeny test contents %CR 0%CR %CR diff --git a/tests/data/test2304 b/tests/data/test2304 index 26bbda187e..aab6dc822b 100644 --- a/tests/data/test2304 +++ b/tests/data/test2304 @@ -62,7 +62,7 @@ Connection: Upgrade # This test used to check that "connection closed" was output, but -# that is flaky since the outgoing PING just before might fail already +# that is flaky since the outgoing PING before might fail already # and then the test exists before the output gets to be written diff --git a/tests/data/test306 b/tests/data/test306 index 5ef7a59010..b0974a77a3 100644 --- a/tests/data/test306 +++ b/tests/data/test306 @@ -10,7 +10,7 @@ HTTP GET # Server-side -No headers at all, just data swsclose +No headers at all, data swsclose Let's get diff --git a/tests/data/test341 b/tests/data/test341 index 8aea4fbb7c..0d204a4f13 100644 --- a/tests/data/test341 +++ b/tests/data/test341 @@ -35,7 +35,7 @@ chunky-trailer: header data http -A non existing file with --etag-compare is just a blank +A non existing file with --etag-compare is a blank http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER diff --git a/tests/data/test583 b/tests/data/test583 index 9463cd887f..8428d31395 100644 --- a/tests/data/test583 +++ b/tests/data/test583 @@ -25,7 +25,7 @@ lib%TESTNUMBER SFTP with multi interface, remove handle early -# The command here uses 'localhost' just to make sure that curl_multi_perform +# The command here uses 'localhost' to make sure that curl_multi_perform # does not reach too far in the first invoke. When using c-ares at least, the # name resolve causes it to return rather quickly and thus we could trigger # the problem we are looking to verify. diff --git a/tests/data/test750 b/tests/data/test750 index 8e4d220c74..03352ece66 100644 --- a/tests/data/test750 +++ b/tests/data/test750 @@ -32,7 +32,7 @@ http proxy -HTTP CONNECT with proxy returning just HTML and closing +HTTP CONNECT with proxy returning HTML and closing http://test.example --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -sS diff --git a/tests/data/test950 b/tests/data/test950 index 3ea2cb7b51..6d6fcc3033 100644 --- a/tests/data/test950 +++ b/tests/data/test950 @@ -24,7 +24,7 @@ smtp SMTP VRFY with custom request -# the custom request just does it lowercase to remain the same command +# the custom request does it lowercase to remain the same command smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient --request "vrfy" diff --git a/tests/ech_tests.sh b/tests/ech_tests.sh index e1246dae18..e5b413fa82 100755 --- a/tests/ech_tests.sh +++ b/tests/ech_tests.sh @@ -31,7 +31,7 @@ # TODO: Translate this into something that approximates a valid curl test:-) # Should be useful though even before such translation and a pile less work # to do this than that. The pile of work required would include making an -# ECH-enabled server and a DoH server. For now, this is just run manually. +# ECH-enabled server and a DoH server. For now, this is run manually. # # set -x @@ -1083,7 +1083,7 @@ else echo "NOT all good, log in $logfile" fi -# send a mail to root (will be forwarded) but just once every 24 hours +# send a mail to root (will be forwarded) but only once every 24 hours # 'cause we only really need "new" news itsnews="yes" age_of_news=0 diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl index 88533019c8..c1a677e400 100755 --- a/tests/ftpserver.pl +++ b/tests/ftpserver.pl @@ -562,8 +562,8 @@ sub protocolsetup { 'LIST' => '150 here comes a directory', 'NLST' => '150 here comes a directory', 'CWD' => '250 CWD command successful.', - 'SYST' => '215 UNIX Type: L8', # just fake something - 'QUIT' => '221 bye bye baby', # just reply something + 'SYST' => '215 UNIX Type: L8', # fake something + 'QUIT' => '221 bye bye baby', # reply something 'MKD' => '257 Created your requested directory', 'REST' => '350 Yeah yeah we set it there for you', 'DELE' => '200 OK OK OK whatever you say', @@ -1143,7 +1143,7 @@ my $cmdid; my $selected; # Any IMAP parameter can come in escaped and in double quotes. -# This function is dumb (so far) and just removes the quotes if present. +# This function is dumb (so far) and removes the quotes if present. sub fix_imap_params { foreach (@_) { $_ = $1 if /^"(.*)"$/; @@ -3289,7 +3289,7 @@ while(1) { my $delay = $delayreply{$FTPCMD}; if($delay) { - # just go sleep this many seconds! + # go sleep this many seconds! logmsg("Sleep for $delay seconds\n"); my $twentieths = $delay * 20; while($twentieths--) { diff --git a/tests/getpart.pm b/tests/getpart.pm index ad52782de0..fd3a99915e 100644 --- a/tests/getpart.pm +++ b/tests/getpart.pm @@ -195,7 +195,7 @@ sub partexists { } # The code currently never calls this more than once per part per file, so -# caching a result that is never used again just slows things down. +# caching a result that is never used again only slows things down. # memoize('partexists', NORMALIZER => 'normalize_part'); # cache each result sub loadtest { diff --git a/tests/globalconfig.pm b/tests/globalconfig.pm index ac636f2748..c9a95427b2 100644 --- a/tests/globalconfig.pm +++ b/tests/globalconfig.pm @@ -124,7 +124,7 @@ our $CURLINFO=dirsepadd("../src/" . ($ENV{'CURL_DIRSUFFIX'} || '')) . our $VCURL=$CURL; # what curl binary to use to verify the servers with # VCURL is handy to set to the system one when the one you - # just built hangs or crashes and thus prevent verification + # built hangs or crashes and thus prevent verification # the path to the script that analyzes the memory debug output file our $memanalyze="$perl " . shell_quote("$srcdir/memanalyze.pl"); our $valgrind; # path to valgrind, or empty if disabled diff --git a/tests/http-server.pl b/tests/http-server.pl index 006b6f3817..14c66a8b42 100755 --- a/tests/http-server.pl +++ b/tests/http-server.pl @@ -40,7 +40,7 @@ use serverhelp qw( ); my $verbose = 0; # set to 1 for debugging -my $port = 8990; # just a default +my $port = 8990; # a default my $unix_socket; # location to place a listening Unix socket my $ipvnum = 4; # default IP version of http server my $idnum = 1; # default http server instance number diff --git a/tests/http/test_02_download.py b/tests/http/test_02_download.py index 6e1352ec3a..69b31183d5 100644 --- a/tests/http/test_02_download.py +++ b/tests/http/test_02_download.py @@ -145,7 +145,7 @@ class TestDownload: ]) r.check_response(http_status=200, count=count) # should have used at most 2 connections only (test servers allow 100 req/conn) - # it may be just 1 on slow systems where request are answered faster than + # it may be 1 on slow systems where request are answered faster than # curl can exhaust the capacity or if curl runs with address-sanitizer speed assert r.total_connects <= 2, "h2 should use fewer connections here" @@ -417,7 +417,7 @@ class TestDownload: assert r.exit_code == 0, f'{client.dump_logs()}' # Special client that tests TLS session reuse in parallel transfers - # TODO: just uses a single connection for h2/h3. Not sure how to prevent that + # TODO: uses a single connection for h2/h3. Not sure how to prevent that @pytest.mark.parametrize("proto", Env.http_protos()) def test_02_26_session_shared_reuse(self, env: Env, proto, httpd, nghttpx): url = f'https://{env.authority_for(env.domain1, proto)}/data-100k' diff --git a/tests/http/test_05_errors.py b/tests/http/test_05_errors.py index 3483a28e8a..19cada0c9e 100644 --- a/tests/http/test_05_errors.py +++ b/tests/http/test_05_errors.py @@ -100,7 +100,7 @@ class TestErrors: assert r.stats[0]['http_version'] == '1.1', r.dump_logs() # On the URL used here, Apache is doing an "unclean" TLS shutdown, - # meaning it sends no shutdown notice and just closes TCP. + # meaning it sends no shutdown notice and closes TCP. # The HTTP response delivers a body without Content-Length. We expect: # - http/1.0 to fail since it relies on a clean connection close to # detect the end of the body diff --git a/tests/http/test_14_auth.py b/tests/http/test_14_auth.py index 7a1bc25c0f..69866baedf 100644 --- a/tests/http/test_14_auth.py +++ b/tests/http/test_14_auth.py @@ -95,7 +95,7 @@ class TestAuth: if proto == 'h3' and not env.curl_uses_lib('ngtcp2'): # See pytest.skip("quiche has problems with large requests") - # just large enough that nghttp2 will submit + # large enough that nghttp2 will submit password = 'x' * (47 * 1024) fdata = os.path.join(env.gen_dir, 'data-10m') curl = CurlClient(env=env) diff --git a/tests/http/test_30_vsftpd.py b/tests/http/test_30_vsftpd.py index adbd6ecc59..a57882f520 100644 --- a/tests/http/test_30_vsftpd.py +++ b/tests/http/test_30_vsftpd.py @@ -148,7 +148,7 @@ class TestVsFTPD: @pytest.mark.skipif(condition=not Env.tcpdump(), reason="tcpdump not available") @pytest.mark.skipif(condition=not Env.curl_is_debug(), reason="needs curl debug") @pytest.mark.skipif(condition=not Env.curl_is_verbose(), reason="needs curl verbose strings") - def test_30_06_shutdownh_download(self, env: Env, vsftpd: VsFTPD): + def test_30_06_shutdown_download(self, env: Env, vsftpd: VsFTPD): docname = 'data-1k' curl = CurlClient(env=env) count = 1 @@ -166,7 +166,7 @@ class TestVsFTPD: @pytest.mark.skipif(condition=not Env.tcpdump(), reason="tcpdump not available") @pytest.mark.skipif(condition=not Env.curl_is_debug(), reason="needs curl debug") @pytest.mark.skipif(condition=not Env.curl_is_verbose(), reason="needs curl verbose strings") - def test_30_07_shutdownh_upload(self, env: Env, vsftpd: VsFTPD): + def test_30_07_shutdown_upload(self, env: Env, vsftpd: VsFTPD): docname = 'upload-1k' curl = CurlClient(env=env) srcfile = os.path.join(env.gen_dir, docname) diff --git a/tests/http/test_31_vsftpds.py b/tests/http/test_31_vsftpds.py index 688d157f8f..5858d9e461 100644 --- a/tests/http/test_31_vsftpds.py +++ b/tests/http/test_31_vsftpds.py @@ -153,7 +153,7 @@ class TestVsFTPD: @pytest.mark.skipif(condition=not Env.tcpdump(), reason="tcpdump not available") @pytest.mark.skipif(condition=not Env.curl_is_debug(), reason="needs curl debug") @pytest.mark.skipif(condition=not Env.curl_is_verbose(), reason="needs curl verbose strings") - def test_31_06_shutdownh_download(self, env: Env, vsftpds: VsFTPD): + def test_31_06_shutdown_download(self, env: Env, vsftpds: VsFTPD): docname = 'data-1k' curl = CurlClient(env=env) count = 1 @@ -170,7 +170,7 @@ class TestVsFTPD: @pytest.mark.skipif(condition=not Env.tcpdump(), reason="tcpdump not available") @pytest.mark.skipif(condition=not Env.curl_is_debug(), reason="needs curl debug") @pytest.mark.skipif(condition=not Env.curl_is_verbose(), reason="needs curl verbose strings") - def test_31_07_shutdownh_upload(self, env: Env, vsftpds: VsFTPD): + def test_31_07_shutdown_upload(self, env: Env, vsftpds: VsFTPD): docname = 'upload-1k' curl = CurlClient(env=env) srcfile = os.path.join(env.gen_dir, docname) diff --git a/tests/http/test_32_ftps_vsftpd.py b/tests/http/test_32_ftps_vsftpd.py index 19eec643c6..b167664661 100644 --- a/tests/http/test_32_ftps_vsftpd.py +++ b/tests/http/test_32_ftps_vsftpd.py @@ -166,7 +166,7 @@ class TestFtpsVsFTPD: @pytest.mark.skipif(condition=not Env.tcpdump(), reason="tcpdump not available") @pytest.mark.skipif(condition=not Env.curl_is_debug(), reason="needs curl debug") @pytest.mark.skipif(condition=not Env.curl_is_verbose(), reason="needs curl verbose strings") - def test_32_06_shutdownh_download(self, env: Env, vsftpds: VsFTPD): + def test_32_06_shutdown_download(self, env: Env, vsftpds: VsFTPD): docname = 'data-1k' curl = CurlClient(env=env) count = 1 @@ -183,7 +183,7 @@ class TestFtpsVsFTPD: @pytest.mark.skipif(condition=not Env.tcpdump(), reason="tcpdump not available") @pytest.mark.skipif(condition=not Env.curl_is_debug(), reason="needs curl debug") @pytest.mark.skipif(condition=not Env.curl_is_verbose(), reason="needs curl verbose strings") - def test_32_07_shutdownh_upload(self, env: Env, vsftpds: VsFTPD): + def test_32_07_shutdown_upload(self, env: Env, vsftpds: VsFTPD): docname = 'upload-1k' curl = CurlClient(env=env) srcfile = os.path.join(env.gen_dir, docname) diff --git a/tests/http/test_60_h3_proxy.py b/tests/http/test_60_h3_proxy.py index 39c6d265f6..9382ef70d9 100644 --- a/tests/http/test_60_h3_proxy.py +++ b/tests/http/test_60_h3_proxy.py @@ -285,7 +285,7 @@ class TestH3Proxy: ) # An HTTP/3 target auto-triggers CONNECT-UDP even without --proxytunnel, - # just as HTTPS targets auto-trigger CONNECT. nghttpx does not support + # as HTTPS targets auto-trigger CONNECT. nghttpx does not support # CONNECT-UDP so this fails, which confirms auto-CONNECT-UDP is active. assert r.exit_code != 0, ( "expected failure: h3 target auto-triggers CONNECT-UDP " diff --git a/tests/http/testenv/curl.py b/tests/http/testenv/curl.py index f5be5ac449..8fb17349ab 100644 --- a/tests/http/testenv/curl.py +++ b/tests/http/testenv/curl.py @@ -1239,7 +1239,7 @@ class CurlClient: def _perf_collapse(self, perf: PerfProfile, file_err): if not os.path.exists(perf.file): - raise Exception(f'dtrace output file does not exist: {perf.file}') + raise Exception(f'perf output file does not exist: {perf.file}') fg_collapse = os.path.join(self._fg_dir, 'stackcollapse-perf.pl') if not os.path.exists(fg_collapse): raise Exception(f'FlameGraph script not found: {fg_collapse}') diff --git a/tests/http/testenv/mod_curltest/mod_curltest.c b/tests/http/testenv/mod_curltest/mod_curltest.c index 5e0f6400fb..bd09c8b377 100644 --- a/tests/http/testenv/mod_curltest/mod_curltest.c +++ b/tests/http/testenv/mod_curltest/mod_curltest.c @@ -339,7 +339,7 @@ static int curltest_tweak_handler(request_rec *r) } } else if(!strcmp("id", arg)) { - /* just an id for repeated requests with curl's URL globbing */ + /* an id for repeated requests with curl's URL globbing */ request_id = val; continue; } @@ -551,7 +551,7 @@ static int curltest_put_handler(request_rec *r) *s = '\0'; val = s + 1; if(!strcmp("id", arg)) { - /* just an id for repeated requests with curl's URL globbing */ + /* an id for repeated requests with curl's URL globbing */ request_id = val; continue; } @@ -748,7 +748,7 @@ static int curltest_sslinfo_handler(request_rec *r) *s = '\0'; val = s + 1; if(!strcmp("id", arg)) { - /* just an id for repeated requests with curl's URL globbing */ + /* an id for repeated requests with curl's URL globbing */ request_id = val; continue; } @@ -862,7 +862,7 @@ static int curltest_limit_handler(request_rec *r) *s = '\0'; val = s + 1; if(!strcmp("id", arg)) { - /* just an id for repeated requests with curl's URL globbing */ + /* an id for repeated requests with curl's URL globbing */ request_id = val; continue; } diff --git a/tests/libtest/first.c b/tests/libtest/first.c index a57277b205..c244e5dc7e 100644 --- a/tests/libtest/first.c +++ b/tests/libtest/first.c @@ -201,7 +201,7 @@ CURLcode ws_recv_pong(CURL *curl, const char *expected_payload) return CURLE_RECV_ERROR; } -/* just close the connection */ +/* close the connection */ void ws_close(CURL *curl) { size_t sent; diff --git a/tests/libtest/first.h b/tests/libtest/first.h index 7c4bb2df46..33191edc59 100644 --- a/tests/libtest/first.h +++ b/tests/libtest/first.h @@ -54,7 +54,7 @@ extern int unitfail; /* for unittests */ #include "curlx/wait.h" /* for curlx_wait_ms() */ #ifdef HAVE_SYS_SELECT_H -/* since so many tests use select(), we can just as well include it here */ +/* since so many tests use select(), we can as well include it here */ #include #endif @@ -99,7 +99,7 @@ extern char *hexdump(const unsigned char *buf, size_t len); #ifndef CURL_DISABLE_WEBSOCKETS CURLcode ws_send_ping(CURL *curl, const char *send_payload); CURLcode ws_recv_pong(CURL *curl, const char *expected_payload); -void ws_close(CURL *curl); /* just close the connection */ +void ws_close(CURL *curl); /* close the connection */ #endif /* diff --git a/tests/libtest/lib1518.c b/tests/libtest/lib1518.c index f6fe44c5e9..f4552f21e6 100644 --- a/tests/libtest/lib1518.c +++ b/tests/libtest/lib1518.c @@ -64,7 +64,7 @@ static CURLcode test_lib1518(const char *URL) } else { test_setopt(curl, CURLOPT_URL, URL); - /* just to make it explicit and visible in this test: */ + /* to make it explicit and visible in this test: */ test_setopt(curl, CURLOPT_FOLLOWLOCATION, 0L); } diff --git a/tests/libtest/lib1537.c b/tests/libtest/lib1537.c index c9668c0ddf..1ef0be9c75 100644 --- a/tests/libtest/lib1537.c +++ b/tests/libtest/lib1537.c @@ -77,7 +77,7 @@ static CURLcode test_lib1537(const char *URL) curl_mprintf("escape -1 length: %s\n", ptr); /* weird input length */ - outlen = 2017; /* just a value */ + outlen = 2017; /* an arbitrary value */ ptr = curl_easy_unescape(NULL, "moahahaha", -1, &outlen); curl_mprintf("unescape -1 length: %s %d\n", ptr, outlen); diff --git a/tests/libtest/lib1592.c b/tests/libtest/lib1592.c index 29dbe0b700..46c2610a3d 100644 --- a/tests/libtest/lib1592.c +++ b/tests/libtest/lib1592.c @@ -61,20 +61,20 @@ static CURLcode test_lib1592(const char *URL) /* Since we could set the DNS server, presume we are working with a resolver that can be cancelled (i.e. c-ares). Thus, curl_multi_remove_handle() should not block even when the resolver - request is outstanding. So, set a request timeout _longer_ than the + request is outstanding. Thus, set a request timeout _longer_ than the test hang timeout so we will fail if the handle removal call incorrectly blocks. */ timeout = TEST_HANG_TIMEOUT * 2; else { /* If we cannot set the DNS server, presume that we are configured to use a resolver that cannot be cancelled (i.e. the threaded resolver or the - non-threaded blocking resolver). So, we just test that the + non-threaded blocking resolver). Thus, we test that the curl_multi_remove_handle() call does finish well within our test timeout. But, it is unlikely that the resolver request will take any time at all because we have not been able to configure the resolver to use an - non-responsive DNS server. At least we exercise the flow. + non-responsive DNS server. At least we exercise the flow. */ curl_mfprintf(stderr, "CURLOPT_DNS_SERVERS not supported; " diff --git a/tests/libtest/lib1908.c b/tests/libtest/lib1908.c index f7ead3406e..9d6a7a1219 100644 --- a/tests/libtest/lib1908.c +++ b/tests/libtest/lib1908.c @@ -52,7 +52,7 @@ static CURLcode test_lib1908(const char *URL) curl_easy_reset(curl); /* using the same filename for the alt-svc cache, this clobbers the - content just written from the 'curldupe' handle */ + content written from the 'curldupe' handle */ curl_easy_cleanup(curl); } curl_global_cleanup(); diff --git a/tests/libtest/lib1911.c b/tests/libtest/lib1911.c index f265174891..a463b0fa16 100644 --- a/tests/libtest/lib1911.c +++ b/tests/libtest/lib1911.c @@ -43,7 +43,7 @@ static CURLcode test_lib1911(const char *URL) return TEST_ERR_EASY_INIT; } - /* make it a null-terminated C string with just As */ + /* make it a null-terminated C string with only As */ memset(testbuf, 'A', MAX_INPUT_LENGTH + 1); testbuf[MAX_INPUT_LENGTH + 1] = 0; diff --git a/tests/libtest/lib1939.c b/tests/libtest/lib1939.c index 502b600517..be1e303beb 100644 --- a/tests/libtest/lib1939.c +++ b/tests/libtest/lib1939.c @@ -51,7 +51,7 @@ static CURLcode test_lib1939(const char *URL) mresult = curl_multi_add_handle(multi, curl); if(!mresult) - /* Run the multi handle once, just enough to start establishing an + /* Run the multi handle once, enough to start establishing an HTTPS connection. */ mresult = curl_multi_perform(multi, &running_handles); diff --git a/tests/libtest/lib1977.c b/tests/libtest/lib1977.c index 608ba4e8b6..a5db34226c 100644 --- a/tests/libtest/lib1977.c +++ b/tests/libtest/lib1977.c @@ -34,7 +34,7 @@ static CURLcode test_lib1977(const char *URL) global_init(CURL_GLOBAL_ALL); easy_init(curl); - /* first transfer: set just the URL in the first CURLU handle */ + /* first transfer: set the URL in the first CURLU handle */ curl_url_set(curlu, CURLUPART_URL, URL, CURLU_DEFAULT_SCHEME); easy_setopt(curl, CURLOPT_CURLU, curlu); diff --git a/tests/libtest/lib3027.c b/tests/libtest/lib3027.c index 845eea239a..013c13f43e 100644 --- a/tests/libtest/lib3027.c +++ b/tests/libtest/lib3027.c @@ -41,7 +41,7 @@ static CURLcode test_lib3027(const char *URL) result = curl_easy_getinfo(curl, CURLINFO_FILETIME, &filetime); /* MTDM fails with 550, so filetime should be -1 */ if((result == CURLE_OK) && (filetime != -1)) { - /* we just need to return something which is not CURLE_OK */ + /* we need to return something which is not CURLE_OK */ result = CURLE_UNSUPPORTED_PROTOCOL; } } diff --git a/tests/libtest/lib501.c b/tests/libtest/lib501.c index 358594c037..355d99e999 100644 --- a/tests/libtest/lib501.c +++ b/tests/libtest/lib501.c @@ -44,7 +44,7 @@ static CURLcode test_lib501(const char *URL) test_setopt(curl, CURLOPT_HEADER, 1L); - /* just verify that setting this to -1 is fine */ + /* verify that setting this to -1 is fine */ test_setopt(curl, CURLOPT_MAXREDIRS, -1L); result = curl_easy_perform(curl); diff --git a/tests/libtest/lib505.c b/tests/libtest/lib505.c index 7ad6894ae8..8eaa12b154 100644 --- a/tests/libtest/lib505.c +++ b/tests/libtest/lib505.c @@ -24,7 +24,7 @@ #include "first.h" /* - * This example shows an FTP upload, with a rename of the file just after + * This example shows an FTP upload, with a rename of the file right after * a successful upload. * * Example based on source code provided by Erick Nuwendam. Thanks! diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c index c961ca3347..b4b4c63ced 100644 --- a/tests/libtest/lib518.c +++ b/tests/libtest/lib518.c @@ -136,7 +136,7 @@ static int t518_test_rlimit(int keep_open) curl_mfprintf(stderr, "raising soft limit up to OPEN_MAX\n"); rl.rlim_cur = OPEN_MAX; if(setrlimit(RLIMIT_NOFILE, &rl) != 0) { - /* on failure do not abort just issue a warning */ + /* on failure do not abort, only issue a warning */ t518_store_errmsg("setrlimit() failed", errno); curl_mfprintf(stderr, "%s\n", t518_msgbuff); t518_msgbuff[0] = '\0'; @@ -147,7 +147,7 @@ static int t518_test_rlimit(int keep_open) curl_mfprintf(stderr, "raising soft limit up to hard limit\n"); rl.rlim_cur = rl.rlim_max; if(setrlimit(RLIMIT_NOFILE, &rl) != 0) { - /* on failure do not abort just issue a warning */ + /* on failure do not abort, only issue a warning */ t518_store_errmsg("setrlimit() failed", errno); curl_mfprintf(stderr, "%s\n", t518_msgbuff); t518_msgbuff[0] = '\0'; diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c index 16e2f1b333..9b99b74899 100644 --- a/tests/libtest/lib537.c +++ b/tests/libtest/lib537.c @@ -137,7 +137,7 @@ static int t537_test_rlimit(int keep_open) curl_mfprintf(stderr, "raising soft limit up to OPEN_MAX\n"); rl.rlim_cur = OPEN_MAX; if(setrlimit(RLIMIT_NOFILE, &rl) != 0) { - /* on failure do not abort just issue a warning */ + /* on failure do not abort, only issue a warning */ t537_store_errmsg("setrlimit() failed", errno); curl_mfprintf(stderr, "%s\n", t537_msgbuff); t537_msgbuff[0] = '\0'; @@ -148,7 +148,7 @@ static int t537_test_rlimit(int keep_open) curl_mfprintf(stderr, "raising soft limit up to hard limit\n"); rl.rlim_cur = rl.rlim_max; if(setrlimit(RLIMIT_NOFILE, &rl) != 0) { - /* on failure do not abort just issue a warning */ + /* on failure do not abort, only issue a warning */ t537_store_errmsg("setrlimit() failed", errno); curl_mfprintf(stderr, "%s\n", t537_msgbuff); t537_msgbuff[0] = '\0'; diff --git a/tests/libtest/test613.pl b/tests/libtest/test613.pl index f653b36c13..bec12b9c5a 100755 --- a/tests/libtest/test613.pl +++ b/tests/libtest/test613.pl @@ -140,7 +140,7 @@ elsif($ARGV[0] eq "postprocess") { my $line = sprintf("%s%s???????%5d U U %15d %s %s\n", $1,$2,$5,$6,$7,$8); push @canondir, $line; } else { - # Unexpected format; just pass it through and let the test fail + # Unexpected format; pass it through and let the test fail push @canondir, $_; } } diff --git a/tests/negtelnetserver.py b/tests/negtelnetserver.py index ae0e3ae941..a9a4880018 100755 --- a/tests/negtelnetserver.py +++ b/tests/negtelnetserver.py @@ -167,7 +167,7 @@ class Negotiator: log.debug("Starting negotiation (IAC)") self.state = self.START_NEG else: - # Just append the incoming byte to the buffer + # Append the incoming byte to the buffer buffer.append(byte_int) def start_neg(self, byte_int): diff --git a/tests/rtspserver.pl b/tests/rtspserver.pl index d23ed7e637..cbe914eee0 100755 --- a/tests/rtspserver.pl +++ b/tests/rtspserver.pl @@ -38,7 +38,7 @@ use serverhelp qw( ); my $verbose = 0; # set to 1 for debugging -my $port = 8990; # just a default +my $port = 8990; # a default my $ipvnum = 4; # default IP version of rtsp server my $idnum = 1; # default rtsp server instance number my $proto = 'rtsp'; # protocol the rtsp server speaks diff --git a/tests/runtests.pl b/tests/runtests.pl index cc8fa51b29..cd0572a59e 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -1724,8 +1724,7 @@ sub singletest_check { my @sout = sort @out; if($hostname) { - # when a hostname is set, we filter out requests to just this - # pattern + # when a hostname is set, we filter out requests to this pattern @sout = grep {/$hostname/} @sout; } @@ -2675,7 +2674,7 @@ if($valgrind) { # since valgrind 2.1.x, '--tool' option is mandatory # use it, if it is supported by the version installed on the system # (this happened in 2003, so we could probably do not need to care about - # that old version any longer and just delete this check) + # that old version any longer and delete this check) runclient("valgrind --help 2>&1 | grep -- --tool >$dev_null 2>&1"); if(($? >> 8)) { $valgrind_tool=""; @@ -2690,7 +2689,7 @@ if($valgrind) { # valgrind 3 renamed the --logfile option to --log-file!!! # (this happened in 2005, so we could probably do not need to care about - # that old version any longer and just delete this check) + # that old version any longer and delete this check) my $ver=join(' ', runclientoutput("valgrind --version")); # cut off all but digits and dots $ver =~ s/[^0-9.]//g; @@ -3212,7 +3211,7 @@ while(1) { $endwaitcnt += $runnerwait; if($endwaitcnt >= 10) { # Once all tests have been scheduled on a runner at the end of a test - # run, we just wait for their results to come in. If we are still + # run, we wait for their results to come in. If we are still # waiting after a couple of minutes ($endwaitcnt multiplied by # $runnerwait, plus $jobs because that number will not time out), display # the same test runner status as we give with a SIGUSR1. This will diff --git a/tests/secureserver.pl b/tests/secureserver.pl index ae7a2c4649..7e64e1d894 100755 --- a/tests/secureserver.pl +++ b/tests/secureserver.pl @@ -24,7 +24,7 @@ #*************************************************************************** # This is the HTTPS, FTPS, POP3S, IMAPS, SMTPS, server used for curl test -# harness. Actually just a layer that runs stunnel properly using the +# harness. Actually a layer that runs stunnel properly using the # non-secure test harness servers. use strict; @@ -50,7 +50,7 @@ my $stunnel = "stunnel"; my $verbose=0; # set to 1 for debugging -my $accept_port = 8991; # just our default, weird enough +my $accept_port = 8991; # our default, weird enough my $target_port = 8999; # default test http-server port my $stuncert; @@ -370,7 +370,7 @@ if($tstunnel_windows) { # new process to the parent waiting perl.exe and sh.exe processes. # exec() should never return back here to this process. We protect - # ourselves by calling die() just in case something goes really bad. + # ourselves by calling die() in case something goes really bad. die "error: exec() has returned"; } diff --git a/tests/server/getpart.c b/tests/server/getpart.c index fe3212a15c..226bbc4412 100644 --- a/tests/server/getpart.c +++ b/tests/server/getpart.c @@ -202,7 +202,7 @@ static int decodedata(char **buf, /* dest buffer */ /* * currently there is no way to tell apart an OOM condition in * curlx_base64_decode() from zero length decoded data. For now, - * let's just assume it is an OOM condition, currently we have + * let's assume it is an OOM condition, currently we have * no input for this function that decodes to zero length data. */ free(buf64); @@ -231,7 +231,7 @@ static int decodedata(char **buf, /* dest buffer */ * and the size of the data is stored at the addresses that caller specifies. * * If the returned data is a string the returned size will be the length of - * the string excluding null-termination. Otherwise it will just be the size + * the string excluding null-termination. Otherwise it will be the size * of the returned binary data. * * Calling function is responsible to free returned buffer. diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index 97b2ba40d9..3684cf0f92 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -97,7 +97,7 @@ struct rtspd_httprequest { #define CMD_AUTH_REQUIRED "auth_required" /* 'idle' means that it will accept the request fine but never respond - any data. Just keep the connection alive. */ + any data. Keep the connection alive. */ #define CMD_IDLE "idle" /* 'stream' means to send a never-ending stream of data */ @@ -890,7 +890,7 @@ static int rtspd_send_doc(curl_socket_t sock, struct rtspd_httprequest *req) responsesize = count; do { - /* Ok, we send no more than 200 bytes at a time, just to make sure that + /* Ok, we send no more than 200 bytes at a time, to make sure that larger chunks are split up so that the client will need to do multiple recv() calls to get it and thus we exercise that code better */ size_t num = count; diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 94d6324251..fabf6864e0 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -68,14 +68,13 @@ * 'exit_signal_handler' for both signals. * * The 'exit_signal_handler' upon the first SIGINT or SIGTERM received signal - * will just set to one the global var 'got_exit_signal' storing in global var + * sets to one the global var 'got_exit_signal' storing in global var * 'exit_signal' the signal that triggered this change. * * Nothing fancy that could introduce problems is used, the program at certain * points in its normal flow checks if var 'got_exit_signal' is set and in - * case this is true it just makes its way out of loops and functions in - * structured and well behaved manner to achieve proper program cleanup and - * termination. + * case this is true it makes its way out of loops and functions in structured + * and well behaved manner to achieve proper program cleanup and termination. * * Even with the above mechanism implemented it is worthwhile to note that * other signals might still be received, or that there might be systems on @@ -172,7 +171,7 @@ static ssize_t write_wincon(int fd, const void *buf, size_t count) #endif /* On Windows, we sometimes get this for a broken pipe, seemingly - * when the client just closed stdin? */ + * when the client closed stdin? */ #define CURL_WIN32_EPIPE 109 /* @@ -897,7 +896,7 @@ static bool disc_handshake(void) return FALSE; } else if(!memcmp("QUIT", buffer, 4)) { - /* just die */ + /* die */ logmsg("quits"); return FALSE; } @@ -945,7 +944,7 @@ static bool juggle(curl_socket_t *sockfdp, } #ifdef HAVE_GETPPID - /* As a last resort, quit if sockfilt process becomes orphan. Just in case + /* As a last resort, quit if sockfilt process becomes orphan. In case parent ftpserver process has died without killing its sockfilt children */ if(getppid() <= 1) { logmsg("process becomes orphan, exiting"); @@ -1055,7 +1054,7 @@ static bool juggle(curl_socket_t *sockfdp, buffer[0], buffer[1], buffer[2], buffer[3]); if(!memcmp("PING", buffer, 4)) { - /* send reply on stdout, just proving we are alive */ + /* send reply on stdout, proving we are alive */ if(!write_stdout("PONG\n", 5)) return FALSE; } @@ -1073,7 +1072,7 @@ static bool juggle(curl_socket_t *sockfdp, return FALSE; } else if(!memcmp("QUIT", buffer, 4)) { - /* just die */ + /* die */ logmsg("quits"); return FALSE; } diff --git a/tests/server/sws.c b/tests/server/sws.c index c2f62384b8..7dfa8b79e2 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -113,7 +113,7 @@ static const char *cmdfile = "log/server.cmd"; #define CMD_AUTH_REQUIRED "auth_required" /* 'idle' means that it will accept the request fine but never respond - any data. Just keep the connection alive. */ + any data. Keep the connection alive. */ #define CMD_IDLE "idle" /* 'stream' means to send a never-ending stream of data */ @@ -304,7 +304,7 @@ static int sws_parse_servercmd(struct sws_httprequest *req) else { logmsg("Unknown instruction found: %s", cmd); } - /* try to deal with CRLF or just LF */ + /* try to deal with CRLF or LF */ check = strchr(cmd, '\r'); if(!check) check = strchr(cmd, '\n'); @@ -966,7 +966,7 @@ static int sws_send_doc(curl_socket_t sock, struct sws_httprequest *req) responsesize = count; do { - /* Ok, we send no more than N bytes at a time, just to make sure that + /* Ok, we send no more than N bytes at a time, to make sure that larger chunks are split up so that the client will need to do multiple recv() calls to get it and thus we exercise that code better */ size_t num = count; diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 44e7976f1c..d81d3d39d2 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -413,7 +413,7 @@ static ssize_t write_behind(struct testcase *test, int convert) b = &bfs[nextone]; if(b->counter < -1) /* anything to flush? */ - return 0; /* just nop if nothing to do */ + return 0; /* nop if nothing to do */ if(!test->ofile) { char outfile[256]; @@ -453,11 +453,11 @@ static ssize_t write_behind(struct testcase *test, int convert) while(ct--) { /* loop over the buffer */ c = (unsigned char)*p++; /* pick up a character */ if(prevchar == '\r') { /* if prev char was cr */ - if(c == '\n') /* if have cr,lf then just */ + if(c == '\n') /* if have cr,lf then */ curl_lseek(test->ofile, -1, SEEK_CUR); /* smash lf on top of the cr */ else if(c == '\0') /* if have cr,nul then */ - goto skipit; /* just skip over the putc */ - /* else just fall through and allow it */ + goto skipit; /* skip over the putc */ + /* else fall through and allow it */ } /* formerly putc(c, file); */ @@ -570,7 +570,7 @@ static int tftpd_parse_servercmd(struct testcase *req) else { logmsg("Unknown instruction found: %s", cmd); } - /* try to deal with CRLF or just LF */ + /* try to deal with CRLF or LF */ check = strchr(cmd, '\r'); if(!check) check = strchr(cmd, '\n'); @@ -858,7 +858,7 @@ send_ack: rap->th_block = htons(recvblock); (void)swrite(peer, &ackbuf.storage[0], 4); #if defined(HAVE_ALARM) && defined(SIGALRM) - mysignal(SIGALRM, justtimeout); /* just abort read on timeout */ + mysignal(SIGALRM, justtimeout); /* abort read on timeout */ alarm(rexmtval); #endif /* normally times out and quits */ diff --git a/tests/serverhelp.pm b/tests/serverhelp.pm index 3f345ad74a..7544c8b62f 100644 --- a/tests/serverhelp.pm +++ b/tests/serverhelp.pm @@ -67,7 +67,7 @@ use testutil qw( our $logfile; # server log filename, for logmsg #*************************************************************************** -# Just for convenience, test harness uses 'https' and 'httptls' literals as +# For convenience, test harness uses 'https' and 'httptls' literals as # values for 'proto' variable in order to differentiate different servers. # 'https' literal is used for stunnel based https test servers, and 'httptls' # is used for non-stunnel https test servers. diff --git a/tests/servers.pm b/tests/servers.pm index db01c1f501..33fcaaa550 100644 --- a/tests/servers.pm +++ b/tests/servers.pm @@ -265,7 +265,7 @@ sub init_serverpidfile_hash { } ####################################################################### -# Check if a given child process has just died. Reaps it if so. +# Check if a given child process has died. Reaps it if so. # sub checkdied { my $pid = $_[0]; @@ -354,7 +354,7 @@ sub startnew { exec("exec $cmd") || die "Cannot exec() $cmd: $!"; # exec() should never return back here to this process. We protect - # ourselves by calling die() just in case something goes really bad. + # ourselves by calling die() in case something goes really bad. die "error: exec() has returned"; } @@ -382,17 +382,17 @@ sub startnew { $pid2 = pidfromfile($pidfile, 0); if(($pid2 > 0) && pidexists($pid2)) { # if $pid2 is valid, then make sure this pid is alive, as - # otherwise it is just likely to be the _previous_ pidfile or + # otherwise it is likely to be the _previous_ pidfile or # similar! last; } if(checkdied($child)) { logmsg "startnew: child process has died, server might start up\n" if($verbose); - # We cannot just abort waiting for the server with a + # We cannot abort waiting for the server with a # return (-1,-1); # because the server might have forked and could still start - # up normally. Instead, just reduce the amount of time we remain + # up normally. Instead, reduce the amount of time we remain # waiting. $count >>= 2; } @@ -1012,7 +1012,7 @@ sub verifytelnet { # particular can take a long time to start if it needs to generate # keys on a slow or loaded host. # -# Just for convenience, test harness uses 'https' and 'httptls' literals +# For convenience, test harness uses 'https' and 'httptls' literals # as values for 'proto' variable in order to differentiate different # servers. 'https' literal is used for stunnel based https test servers, # and 'httptls' is used for non-stunnel https test servers. diff --git a/tests/smbserver.py b/tests/smbserver.py index 000dda76e7..9b38c4695a 100755 --- a/tests/smbserver.py +++ b/tests/smbserver.py @@ -76,7 +76,7 @@ class ShutdownHandler(threading.Thread): signal.signal(signal.SIGTERM, self._sighandler) def __exit__(self, *_): - # Call for shutdown just in case it was not done already + # Call for shutdown in case it was not done already self.shutdown_event.set() # Wait for thread, and therefore also the server, to finish self.join() diff --git a/tests/sshserver.pl b/tests/sshserver.pl index 58e64d2f4e..4133e86db6 100755 --- a/tests/sshserver.pl +++ b/tests/sshserver.pl @@ -1190,7 +1190,7 @@ if($sshdid =~ /OpenSSH-Windows/) { # new process to the parent waiting perl.exe and sh.exe processes. # exec() should never return back here to this process. We protect - # ourselves by calling die() just in case something goes really bad. + # ourselves by calling die() in case something goes really bad. die "error: exec() has returned"; } diff --git a/tests/test1119.pl b/tests/test1119.pl index 0c9ae70ed5..845453d8a1 100755 --- a/tests/test1119.pl +++ b/tests/test1119.pl @@ -165,7 +165,7 @@ close $s; my $ignored=0; for my $e (sort @syms) { - # OBSOLETE - names that are just placeholders for a position where we + # OBSOLETE - names that are placeholders for a position where we # previously had a name, that is now removed. The OBSOLETE names should # never be used for anything. # @@ -176,7 +176,7 @@ for my $e (sort @syms) { # # CURL_TEMP_ - are defined and *undefined* again within the file # - # *_LAST and *_LASTENTRY are just suffix for the placeholders used for the + # *_LAST and *_LASTENTRY are suffix for the placeholders used for the # last entry in many enum series. # diff --git a/tests/test1173.pl b/tests/test1173.pl index 6e2c9141af..baeff85762 100755 --- a/tests/test1173.pl +++ b/tests/test1173.pl @@ -158,7 +158,7 @@ sub scanmanpage { while(<$m>) { chomp; if($_ =~ /^.so /) { - # this man page is just a referral + # this man page is a referral close($m); return; } diff --git a/tests/tftpserver.pl b/tests/tftpserver.pl index bb96bb743e..2ea46dccf9 100755 --- a/tests/tftpserver.pl +++ b/tests/tftpserver.pl @@ -38,7 +38,7 @@ use serverhelp qw( ); my $verbose = 0; # set to 1 for debugging -my $port = 8997; # just a default +my $port = 8997; # a default my $ipvnum = 4; # default IP version of tftp server my $idnum = 1; # default tftp server instance number my $proto = 'tftp'; # protocol the tftp server speaks diff --git a/tests/unit/unit1303.c b/tests/unit/unit1303.c index 8a10af69d6..49c48e3b2c 100644 --- a/tests/unit/unit1303.c +++ b/tests/unit/unit1303.c @@ -44,7 +44,7 @@ static void t1303_stop(struct Curl_easy *easy) curl_global_cleanup(); } -/* BASE is just a define to make us fool around with decently large number so +/* BASE is a define to make us fool around with decently large number so that we are not zero-based */ #define BASE 1000000 diff --git a/tests/unit/unit1609.c b/tests/unit/unit1609.c index 90a75b7e55..356fa2a6c9 100644 --- a/tests/unit/unit1609.c +++ b/tests/unit/unit1609.c @@ -46,7 +46,7 @@ static CURLcode t1609_setup(void) we set address using CURLOPT_RESOLVE, it usually marks as permanent (by setting timestamp to zero). However, if address already exists - in the cache, then it does not mark it, but just leaves it as it is. + in the cache, then it does not mark it, but leaves it as it is. So we fixing this by timestamp to zero if address already exists too. Test: diff --git a/tests/unit/unit1615.c b/tests/unit/unit1615.c index 7e26a158a1..8ea9c3e711 100644 --- a/tests/unit/unit1615.c +++ b/tests/unit/unit1615.c @@ -108,7 +108,7 @@ static CURLcode test_unit1615(const char *arg) }; unsigned char output_buf[CURL_SHA512_256_DIGEST_LENGTH]; - const unsigned char *computed_hash; /* Just to mute compiler warning */ + const unsigned char *computed_hash; /* to mute compiler warning */ /* Mute compiler warnings in 'verify_memory' macros below */ computed_hash = output_buf; diff --git a/tests/unit/unit1625.c b/tests/unit/unit1625.c index be52ba2d83..370b65a4fa 100644 --- a/tests/unit/unit1625.c +++ b/tests/unit/unit1625.c @@ -52,7 +52,7 @@ static CURLcode test_unit1625(const char *arg) { "Encoding: a, chunked, ninja", "Encoding:", "chunked", TRUE }, /* empty incoming header */ { "Encoding:", "Encoding:", "chunked", FALSE }, - /* just spaces in header */ + /* spaces in header */ { "Encoding: ", "Encoding:", "chunked", FALSE }, /* last among several with no spaces */ { "Encoding: ab,cd,ef,gh,ig,kl", "Encoding:", "kl", TRUE }, diff --git a/tests/unit/unit1652.c b/tests/unit/unit1652.c index 7d940df055..3b1a5a99ae 100644 --- a/tests/unit/unit1652.c +++ b/tests/unit/unit1652.c @@ -119,7 +119,7 @@ static CURLcode test_unit1652(const char *arg) * Any input that long or longer will truncated, ending in '...\n'. */ - /* A string just long enough to not be truncated */ + /* A string long enough to not be truncated */ memset(input, '\0', sizeof(input)); memset(input, 'A', 2045); Curl_infof(easy, "%s", input); @@ -130,7 +130,7 @@ static CURLcode test_unit1652(const char *arg) fail_unless(output[sizeof(output) - 1] == '\0', "No truncation of infof input"); - /* Just over the limit without newline for truncation via '...' */ + /* Over the limit without newline for truncation via '...' */ memset(input + 2045, 'A', 4); Curl_infof(easy, "%s", input); curl_mfprintf(stderr, "output len %zu: %s", strlen(output), output); @@ -138,7 +138,7 @@ static CURLcode test_unit1652(const char *arg) fail_unless(output[sizeof(output) - 1] == '\0', "Truncation of infof input 1"); - /* Just over the limit with newline for truncation via '...' */ + /* Over the limit with newline for truncation via '...' */ memset(input + 2045, 'A', 4); memset(input + 2045 + 4, '\n', 1); Curl_infof(easy, "%s", input); diff --git a/tests/unit/unit1655.c b/tests/unit/unit1655.c index 54f930b8b4..78a08a2d8b 100644 --- a/tests/unit/unit1655.c +++ b/tests/unit/unit1655.c @@ -51,7 +51,7 @@ static CURLcode test_unit1655(const char *arg) static const char toolong[] = /* ..|....1.........2.........3.........4.........5.........6... */ /* 3456789012345678901234567890123456789012345678901234567890123 */ - "here.is.a.hostname.which.is.just.barely.too.long." /* 49: 49 */ + "here.is.a.hostname.which.is.only.barely.too.long." /* 49: 49 */ "to.be.encoded.as.a.QNAME.of.the.maximum.allowed.length." /* 55: 104 */ "which.is.256.including.a.final.zero-length.label." /* 49: 153 */ diff --git a/tests/unit/unit1660.c b/tests/unit/unit1660.c index 62b4ea0095..f9259f1c76 100644 --- a/tests/unit/unit1660.c +++ b/tests/unit/unit1660.c @@ -45,7 +45,7 @@ static CURLcode test_unit1660(const char *arg) struct testit { const char *host; const char *chost; /* if non-NULL, use to lookup with */ - const char *hdr; /* if NULL, just do the lookup */ + const char *hdr; /* if NULL, do the lookup */ const CURLcode result; /* parse result */ }; diff --git a/tests/unit/unit1666.c b/tests/unit/unit1666.c index a86dc146a1..362b16b4d5 100644 --- a/tests/unit/unit1666.c +++ b/tests/unit/unit1666.c @@ -146,7 +146,7 @@ static CURLcode test_unit1666(const char *arg) "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" "\x01\x01\x01\x01\x01\x01\x01\x01"), "", CURLE_TOO_LARGE }, - /* one byte shorter than the previous is just below the limit: */ + /* one byte shorter than the previous is below the limit: */ { OID("\x2b\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" diff --git a/tests/unit/unit2600.c b/tests/unit/unit2600.c index 47d91ce553..a28028c52b 100644 --- a/tests/unit/unit2600.c +++ b/tests/unit/unit2600.c @@ -160,7 +160,7 @@ static CURLcode cf_test_adjust_pollset(struct Curl_cfilter *cf, struct easy_pollset *ps) { struct cf_test_ctx *ctx = cf->ctx; - /* just for testing, give one socket with events back */ + /* for testing, give one socket with events back */ return Curl_pollset_set(data, ps, ctx->idx, TRUE, TRUE); }