1e1ec7f6c2
Viktor Szakats
2025-11-17
Subject
badwords: add more contractions, fix fallouts
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
.github/scripts/badwords.txt +13 -0Makefile.am +1 -1acinclude.m4 +10 -10configure.ac +28 -28docs/examples/simplessl.c +1 -1docs/libcurl/opts/CURLOPT_SSL_OPTIONS.md +1 -1lib/arpa_telnet.h +1 -1lib/asyn-ares.c +1 -1lib/cf-h1-proxy.c +1 -1lib/cookie.c +1 -1lib/ftp.c +2 -2lib/vtls/gtls.c +1 -1m4/curl-compilers.m4 +2 -2m4/curl-functions.m4 +1 -1m4/curl-gnutls.m4 +4 -4m4/curl-mbedtls.m4 +2 -2m4/curl-openssl.m4 +7 -7m4/curl-override.m4 +1 -1m4/curl-reentrant.m4 +2 -2m4/curl-rustls.m4 +3 -3m4/curl-wolfssl.m4 +4 -4m4/xc-val-flgs.m4 +1 -1m4/zz40-xc-ovr.m4 +2 -2m4/zz50-xc-ovr.m4 +1 -1packages/OS400/os400sys.c +1 -1packages/vms/build_vms.com +4 -4packages/vms/curl_crtl_init.c +1 -1scripts/mk-ca-bundle.pl +1 -1src/tool_parsecfg.c +1 -1tests/data/test1425 +1 -1tests/data/test1516 +1 -1tests/data/test1566 +1 -1tests/data/test555 +1 -1tests/dictserver.py +1 -1tests/ftpserver.pl +6 -6tests/getpart.pm +3 -3tests/libtest/lib1308.c +1 -1tests/libtest/lib557.c +2 -2tests/libtest/lib560.c +1 -1tests/negtelnetserver.py +1 -1tests/processhelp.pm +1 -1tests/runtests.pl +1 -1tests/server/sockfilt.c +1 -1tests/server/tftpd.c +2 -2tests/smbserver.py +2 -2tests/test1173.pl +1 -1
.github/scripts/badwords.txt+13 -0
| @@ -18,21 +18,34 @@ couldn't:could not | |
| didn't:did not | |
| doesn't:does not | |
| don't=do not | |
| + | haven't:have not |
| + | i'd:I would |
| + | i'll:I will |
| i'm:I am | |
| + | i've:I have |
| isn't:is not | |
| it'd:it would | |
| + | it'll:it will |
| + | might've:might have |
| + | needn't:need not |
| should've:should have | |
| + | shouldn't:should not |
| that's:that is | |
| there's:there is | |
| they'd:They would | |
| they'll:They will | |
| they're:They are | |
| they've:They have | |
| + | this'll:this will |
| + | wasn't:was not |
| we'd:we would | |
| we'll:we will | |
| we're:we are | |
| we've:we have | |
| + | weren't:were not |
| won't:will not | |
| + | would've:would have |
| + | wouldn't:would not |
| you'd:you would | |
| you'll:you will | |
| you're:you are | |
Makefile.am+1 -1
| @@ -111,7 +111,7 @@ pytest: test | |
| pytest-ci: test | |
| test: | |
| - | @echo "NOTICE: we can't run the tests when cross-compiling!" |
| + | @echo "NOTICE: we cannot run the tests when cross-compiling!" |
| else | |
acinclude.m4+10 -10
| @@ -820,7 +820,7 @@ AC_DEFUN([CURL_CHECK_FUNC_CLOCK_GETTIME_MONOTONIC], [ | |
| ]) | |
| dnl Definition of HAVE_CLOCK_GETTIME_MONOTONIC is intentionally postponed | |
| - | dnl until library linking and run-time checks for clock_gettime succeed. |
| + | dnl until library linking and runtime checks for clock_gettime succeed. |
| ]) | |
| dnl CURL_CHECK_FUNC_CLOCK_GETTIME_MONOTONIC_RAW | |
| @@ -1085,8 +1085,8 @@ AC_DEFUN([CURL_VERIFY_RUNTIMELIBS], [ | |
| if test "x$cross_compiling" != xyes; then | |
| dnl just run a program to verify that the libs checked for previous to this | |
| - | dnl point also is available run-time! |
| - | AC_MSG_CHECKING([run-time libs availability]) |
| + | dnl point also is available runtime! |
| + | AC_MSG_CHECKING([runtime libs availability]) |
| CURL_RUN_IFELSE([ | |
| int main(void) | |
| { | |
| @@ -1095,7 +1095,7 @@ AC_DEFUN([CURL_VERIFY_RUNTIMELIBS], [ | |
| ], | |
| AC_MSG_RESULT([fine]), | |
| AC_MSG_RESULT([failed]) | |
| - | AC_MSG_ERROR([one or more libs available at link-time are not available run-time. Libs used at link-time: $LIBS]) |
| + | AC_MSG_ERROR([one or more libs available at link-time are not available runtime. Libs used at link-time: $LIBS]) |
| ) | |
| dnl if this test fails, configure has already stopped | |
| @@ -1122,7 +1122,7 @@ AC_DEFUN([CURL_CHECK_CA_BUNDLE], [ | |
| AC_ARG_WITH(ca-bundle, | |
| AS_HELP_STRING([--with-ca-bundle=FILE], | |
| [Absolute path to a file containing CA certificates (example: /etc/ca-bundle.crt)]) | |
| - | AS_HELP_STRING([--without-ca-bundle], [Don't use a default CA bundle]), |
| + | AS_HELP_STRING([--without-ca-bundle], [Do not use a default CA bundle]), |
| [ | |
| want_ca="$withval" | |
| if test "x$want_ca" = "xyes"; then | |
| @@ -1136,7 +1136,7 @@ AS_HELP_STRING([--with-ca-path=DIRECTORY], | |
| their filenames in a hash format. This option can be used with the OpenSSL, \ | |
| GnuTLS, mbedTLS and wolfSSL backends. Refer to OpenSSL c_rehash for details. \ | |
| (example: /etc/certificates)]) | |
| - | AS_HELP_STRING([--without-ca-path], [Don't use a default CA path]), |
| + | AS_HELP_STRING([--without-ca-path], [Do not use a default CA path]), |
| [ | |
| want_capath="$withval" | |
| if test "x$want_capath" = "xyes"; then | |
| @@ -1255,7 +1255,7 @@ AS_HELP_STRING([--without-ca-path], [Don't use a default CA path]), | |
| AC_MSG_CHECKING([whether to use OpenSSL's built-in CA store]) | |
| AC_ARG_WITH(ca-fallback, | |
| AS_HELP_STRING([--with-ca-fallback], [Use OpenSSL's built-in CA store]) | |
| - | AS_HELP_STRING([--without-ca-fallback], [Don't use OpenSSL's built-in CA store]), |
| + | AS_HELP_STRING([--without-ca-fallback], [Do not use OpenSSL's built-in CA store]), |
| [ | |
| if test "x$with_ca_fallback" != "xyes" -a "x$with_ca_fallback" != "xno"; then | |
| AC_MSG_ERROR([--with-ca-fallback only allows yes or no as parameter]) | |
| @@ -1283,7 +1283,7 @@ AC_DEFUN([CURL_CHECK_CA_EMBED], [ | |
| AC_ARG_WITH(ca-embed, | |
| AS_HELP_STRING([--with-ca-embed=FILE], | |
| [Absolute path to a file containing CA certificates to embed in the curl tool (example: /etc/ca-bundle.crt)]) | |
| - | AS_HELP_STRING([--without-ca-embed], [Don't embed a default CA bundle in the curl tool]), |
| + | AS_HELP_STRING([--without-ca-embed], [Do not embed a default CA bundle in the curl tool]), |
| [ | |
| want_ca_embed="$withval" | |
| if test "x$want_ca_embed" = "xyes"; then | |
| @@ -1566,7 +1566,7 @@ TEST EINVAL TEST | |
| dnl CURL_DARWIN_CFLAGS | |
| dnl | |
| dnl Set -Werror=partial-availability to detect possible breaking code | |
| - | dnl with very low deployment targets. |
| + | dnl with low deployment targets. |
| dnl | |
| AC_DEFUN([CURL_DARWIN_CFLAGS], [ | |
| @@ -1583,7 +1583,7 @@ AC_DEFUN([CURL_DARWIN_CFLAGS], [ | |
| dnl CURL_SUPPORTS_BUILTIN_AVAILABLE | |
| dnl | |
| dnl Check to see if the compiler supports __builtin_available. This built-in | |
| - | dnl compiler function first appeared in Apple LLVM 9.0.0. It's so new that, at |
| + | dnl compiler function first appeared in Apple LLVM 9.0.0. It is so new that, at |
| dnl the time this macro was written, the function was not yet documented. Its | |
| dnl purpose is to return true if the code is running under a certain OS version | |
| dnl or later. | |
configure.ac+28 -28
| @@ -25,7 +25,7 @@ dnl Process this file with autoconf to produce a configure script. | |
| AC_PREREQ(2.59) | |
| - | dnl We don't know the version number "statically" so we use a dash here |
| + | dnl We do not know the version number "statically" so we use a dash here |
| AC_INIT([curl], [-], [a suitable curl mailing list: https://curl.se/mail/]) | |
| XC_OVR_ZZ50 | |
| @@ -328,7 +328,7 @@ AS_HELP_STRING([--with-test-vsftpd=PATH],[where to find vsftpd for testing]), | |
| ) | |
| AC_SUBST(VSFTPD) | |
| - | dnl we'd like a httpd as test server |
| + | dnl we would like an httpd as test server |
| dnl | |
| HTTPD_ENABLED="maybe" | |
| AC_ARG_WITH(test-httpd, [AS_HELP_STRING([--with-test-httpd=PATH], | |
| @@ -378,7 +378,7 @@ fi | |
| AC_SUBST(HTTPD) | |
| AC_SUBST(APXS) | |
| - | dnl we'd like a dante as test socks server |
| + | dnl we would like a dante as test socks server |
| dnl | |
| DANTED_ENABLED="maybe" | |
| AC_ARG_WITH(test-danted, [AS_HELP_STRING([--with-test-danted=PATH], | |
| @@ -1368,7 +1368,7 @@ else | |
| [ | |
| dnl zlib.h was found | |
| HAVE_ZLIB_H="1" | |
| - | dnl if the lib wasn't found already, try again with the new paths |
| + | dnl if the lib was not found already, try again with the new paths |
| if test "$HAVE_LIBZ" != "1"; then | |
| AC_CHECK_LIB(z, gzread, | |
| [ | |
| @@ -1500,8 +1500,8 @@ if test X"$OPT_BROTLI" != Xno; then | |
| if test "$HAVE_BROTLI" = "1"; then | |
| if test -n "$DIR_BROTLI"; then | |
| - | dnl when the brotli shared libs were found in a path that the run-time |
| - | dnl linker doesn't search through, we need to add it to CURL_LIBRARY_PATH |
| + | dnl when the brotli shared libs were found in a path that the runtime |
| + | dnl linker does not search through, we need to add it to CURL_LIBRARY_PATH |
| dnl to prevent further configure tests to fail due to this | |
| if test "x$cross_compiling" != "xyes"; then | |
| @@ -1589,8 +1589,8 @@ if test X"$OPT_ZSTD" != Xno; then | |
| if test "$HAVE_ZSTD" = "1"; then | |
| if test -n "$DIR_ZSTD"; then | |
| - | dnl when the zstd shared lib were found in a path that the run-time |
| - | dnl linker doesn't search through, we need to add it to |
| + | dnl when the zstd shared lib were found in a path that the runtime |
| + | dnl linker does not search through, we need to add it to |
| dnl CURL_LIBRARY_PATH to prevent further configure tests to fail due to | |
| dnl this | |
| @@ -1836,7 +1836,7 @@ if test x"$want_gss" = xyes; then | |
| CURL_CHECK_PKGCONFIG(mit-krb5-gssapi) | |
| fi | |
| if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then | |
| - | dnl krb5-config doesn't have --libs-only-L or similar, put everything |
| + | dnl krb5-config does not have --libs-only-L or similar, put everything |
| dnl into LIBS | |
| gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi` | |
| LIBS="$gss_libs $LIBS" | |
| @@ -1845,7 +1845,7 @@ if test x"$want_gss" = xyes; then | |
| LIBS="$gss_libs $LIBS" | |
| link_pkgconfig=1 | |
| elif test -f "$KRB5CONFIG"; then | |
| - | dnl krb5-config doesn't have --libs-only-L or similar, put everything |
| + | dnl krb5-config does not have --libs-only-L or similar, put everything |
| dnl into LIBS | |
| gss_libs=`$KRB5CONFIG --libs gssapi` | |
| LIBS="$gss_libs $LIBS" | |
| @@ -2286,8 +2286,8 @@ if test X"$OPT_LIBSSH2" != Xno; then | |
| if test "$USE_LIBSSH2" = "1"; then | |
| if test -n "$DIR_SSH2"; then | |
| - | dnl when the libssh2 shared libs were found in a path that the run-time |
| - | dnl linker doesn't search through, we need to add it to CURL_LIBRARY_PATH |
| + | dnl when the libssh2 shared libs were found in a path that the runtime |
| + | dnl linker does not search through, we need to add it to CURL_LIBRARY_PATH |
| dnl to prevent further configure tests to fail due to this | |
| if test "x$cross_compiling" != "xyes"; then | |
| @@ -2366,8 +2366,8 @@ elif test X"$OPT_LIBSSH" != Xno; then | |
| LIBS="-liphlpapi $LIBS" | |
| fi | |
| if test -n "$DIR_SSH"; then | |
| - | dnl when the libssh shared libs were found in a path that the run-time |
| - | dnl linker doesn't search through, we need to add it to CURL_LIBRARY_PATH |
| + | dnl when the libssh shared libs were found in a path that the runtime |
| + | dnl linker does not search through, we need to add it to CURL_LIBRARY_PATH |
| dnl to prevent further configure tests to fail due to this | |
| if test "x$cross_compiling" != "xyes"; then | |
| @@ -2420,7 +2420,7 @@ case "$OPT_LDAP" in | |
| want_ldap="yes" | |
| ;; | |
| off) | |
| - | dnl no --with-ldap option given, don't change anything |
| + | dnl no --with-ldap option given, do not change anything |
| want_ldap="default" | |
| ;; | |
| *) | |
| @@ -2477,7 +2477,7 @@ if test x$CURL_DISABLE_LDAP != x1 && test "$want_ldap" != "no"; then | |
| if test "$ldap_lib_ok" = "no"; then | |
| if test -n "$ldap_askedfor"; then | |
| - | AC_MSG_ERROR([couldn't detect the LDAP libraries]) |
| + | AC_MSG_ERROR([could not detect the LDAP libraries]) |
| fi | |
| AC_MSG_WARN(["$LDAPLIBNAME" is not an LDAP library: LDAP disabled]) | |
| AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP]) | |
| @@ -2495,7 +2495,7 @@ if test x$CURL_DISABLE_LDAP != x1 && test "$want_ldap" != "no"; then | |
| case X-"$curl_cv_ldap_LIBS" in | |
| X-unknown) | |
| if test -n "$ldap_askedfor"; then | |
| - | AC_MSG_ERROR([couldn't detect the LDAP libraries]) |
| + | AC_MSG_ERROR([could not detect the LDAP libraries]) |
| fi | |
| AC_MSG_WARN([Cannot find libraries for LDAP support: LDAP disabled]) | |
| AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP]) | |
| @@ -2514,8 +2514,8 @@ fi | |
| if test x$CURL_DISABLE_LDAP != x1; then | |
| dnl Add to library path if needed | |
| if test -n "$DIR_LDAP"; then | |
| - | dnl when the ldap shared lib were found in a path that the run-time |
| - | dnl linker doesn't search through, we need to add it to |
| + | dnl when the ldap shared lib were found in a path that the runtime |
| + | dnl linker does not search through, we need to add it to |
| dnl CURL_LIBRARY_PATH to prevent further configure tests to fail due to | |
| dnl this | |
| @@ -2527,8 +2527,8 @@ if test x$CURL_DISABLE_LDAP != x1; then | |
| fi | |
| if test "$LBERLIBNAME"; then | |
| - | dnl If name is "no" then don't define this library at all |
| - | dnl (it's only needed if libldap.so's dependencies are broken). |
| + | dnl If name is "no" then do not define this library at all |
| + | dnl (it is only needed if libldap.so's dependencies are broken). |
| dnl Skip this check if we already determined we need both libraries above | |
| if test "$LBERLIBNAME" != "no" -a "$ldap_lib_ok" != "yes"; then | |
| AC_CHECK_LIB("$LBERLIBNAME", ber_free,, [ | |
| @@ -3789,7 +3789,7 @@ if test X"$want_quiche" != Xno; then | |
| ) | |
| ], | |
| dnl not found, revert back to clean variables | |
| - | AC_MSG_ERROR([couldn't use quiche]) |
| + | AC_MSG_ERROR([could not use quiche]) |
| ) | |
| else | |
| dnl no quiche pkg-config found, deal with it | |
| @@ -3955,7 +3955,7 @@ if test -z "$PERL" -a x"$FISH_FUNCTIONS_DIR" != x; then | |
| fi | |
| AM_CONDITIONAL(USE_FISH_COMPLETION, test x"$FISH_FUNCTIONS_DIR" != x) | |
| - | dnl Now check for the very most basic headers. Then we can use these |
| + | dnl Now check for the most basic headers. Then we can use these |
| dnl ones as default-headers when checking for the rest! | |
| AC_CHECK_HEADERS( | |
| sys/types.h \ | |
| @@ -4053,7 +4053,7 @@ AC_CHECK_TYPE(long long, | |
| ) | |
| if test ${ac_cv_sizeof_curl_off_t} -lt 8; then | |
| - | AC_MSG_ERROR([64 bit curl_off_t is required]) |
| + | AC_MSG_ERROR([64-bit curl_off_t is required]) |
| fi | |
| # check for ssize_t | |
| @@ -4297,7 +4297,7 @@ if test "$want_threaded_resolver" = "yes" && test "$USE_THREADS_WIN32" != "1"; t | |
| ;; | |
| esac | |
| - | dnl if it wasn't found without lib, search for it in pthread lib |
| + | dnl if it was not found without lib, search for it in pthread lib |
| if test "$USE_THREADS_POSIX" != "1"; then | |
| # assign PTHREAD for pkg-config use | |
| PTHREAD=" -pthread" | |
| @@ -4908,7 +4908,7 @@ AS_HELP_STRING([--disable-headers-api],[Disable headers-api support]), | |
| AC_MSG_RESULT(yes) | |
| ) | |
| - | dnl only check for HSTS if there's SSL present |
| + | dnl only check for HSTS if there is SSL present |
| if test -n "$SSL_ENABLED"; then | |
| dnl ************************************************************ | |
| dnl switch on/off hsts | |
| @@ -5029,9 +5029,9 @@ if test "x$CURL_DISABLE_HTTP" != "x1"; then | |
| if test ${ac_cv_sizeof_curl_off_t} -gt 4; then | |
| AC_MSG_RESULT(yes) | |
| else | |
| - | dnl WebSockets requires >32 bit curl_off_t |
| + | dnl WebSockets requires >32-bit curl_off_t |
| AC_MSG_RESULT(no) | |
| - | AC_MSG_WARN([WebSockets disabled due to lack of >32 bit curl_off_t]) |
| + | AC_MSG_WARN([WebSockets disabled due to lack of >32-bit curl_off_t]) |
| AC_DEFINE(CURL_DISABLE_WEBSOCKETS, [1], [disable WebSockets]) | |
| CURL_DISABLE_WEBSOCKETS=1 | |
| fi | |
docs/examples/simplessl.c+1 -1
| @@ -103,7 +103,7 @@ int main(void) | |
| #endif | |
| /* cert is stored PEM coded in file... */ | |
| - | /* since PEM is default, we needn't set it for PEM */ |
| + | /* since PEM is default, we need not set it for PEM */ |
| curl_easy_setopt(curl, CURLOPT_SSLCERTTYPE, "PEM"); | |
| /* set the cert for client authentication */ | |
docs/libcurl/opts/CURLOPT_SSL_OPTIONS.md+1 -1
| @@ -100,7 +100,7 @@ Tell libcurl to try sending application data as TLS1.3 early data. This option | |
| is supported for GnuTLS, wolfSSL, quictls and OpenSSL (but not BoringSSL | |
| or AWS-LC). It works on TCP and QUIC connections using ngtcp2. | |
| This option works on a best effort basis, | |
| - | in cases when it wasn't possible to send early data the request is resent |
| + | in cases when it was not possible to send early data the request is resent |
| normally post-handshake. | |
| This option does not work when using QUIC. | |
| (Added in 8.11.0 for GnuTLS and 8.13.0 for wolfSSL, quictls and OpenSSL) | |
lib/arpa_telnet.h+1 -1
| @@ -79,7 +79,7 @@ static const char * const telnetoptions[]= | |
| #define CURL_WILL 251 /* Our side WILL use this option */ | |
| #define CURL_WONT 252 /* Our side will not use this option */ | |
| #define CURL_DO 253 /* DO use this option! */ | |
| - | #define CURL_DONT 254 /* DON'T use this option! */ |
| + | #define CURL_DONT 254 /* DO NOT use this option! */ |
| #define CURL_IAC 255 /* Interpret As Command */ | |
| #ifndef CURL_DISABLE_VERBOSE_STRINGS | |
lib/asyn-ares.c+1 -1
| @@ -566,7 +566,7 @@ static void async_ares_hostbyname_cb(void *user_data, | |
| So, now that we have a usable answer (some IPv4 addresses, some IPv6 | |
| addresses, or "no such domain"), we start a timeout for the remaining | |
| pending responses. Even though it is typical that this resolved | |
| - | request came back quickly, that needn't be the case. It might be that |
| + | request came back quickly, that need not be the case. It might be that |
| this completing request did not get a result from the first DNS | |
| server or even the first round of the whole DNS server pool. So it | |
| could already be quite some time after we issued the DNS queries in | |
lib/cf-h1-proxy.c+1 -1
| @@ -175,7 +175,7 @@ static void h1_tunnel_go_state(struct Curl_cfilter *cf, | |
| curlx_dyn_reset(&ts->rcvbuf); | |
| curlx_dyn_reset(&ts->request_data); | |
| /* restore the protocol pointer */ | |
| - | data->info.httpcode = 0; /* clear it as it might've been used for the |
| + | data->info.httpcode = 0; /* clear it as it might have been used for the |
| proxy */ | |
| /* If a proxy-authorization header was used for the proxy, then we should | |
| make sure that it is not accidentally used for the document request | |
lib/cookie.c+1 -1
| @@ -1629,7 +1629,7 @@ void Curl_flush_cookies(struct Curl_easy *data, bool cleanup) | |
| Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE); | |
| /* only save the cookie file if a transfer was started (data->state.url is | |
| set), as otherwise the cookies were not completely initialized and there | |
| - | might be cookie files that weren't loaded so saving the file is the wrong |
| + | might be cookie files that were not loaded so saving the file is the wrong |
| thing. */ | |
| if(data->set.str[STRING_COOKIEJAR] && data->state.url) { | |
| /* if we have a destination file for all the cookies to get dumped to */ | |
lib/ftp.c+2 -2
| @@ -1902,7 +1902,7 @@ static CURLcode ftp_state_pasv_resp(struct Curl_easy *data, | |
| #ifndef CURL_DISABLE_PROXY | |
| if(conn->bits.proxy) { | |
| /* This connection uses a proxy and we need to connect to the proxy again | |
| - | * here. We do not want to rely on a former host lookup that might've |
| + | * here. We do not want to rely on a former host lookup that might have |
| * expired now, instead we remake the lookup here and now! */ | |
| struct ip_quadruple ipquad; | |
| bool is_ipv6; | |
| @@ -1964,7 +1964,7 @@ static CURLcode ftp_state_pasv_resp(struct Curl_easy *data, | |
| } | |
| /* | |
| - | * When this is used from the multi interface, this might've returned with |
| + | * When this is used from the multi interface, this might have returned with |
| * the 'connected' set to FALSE and thus we are now awaiting a non-blocking | |
| * connect to connect. | |
| */ | |
lib/vtls/gtls.c+1 -1
| @@ -691,7 +691,7 @@ CURLcode Curl_gtls_cache_session(struct Curl_cfilter *cf, | |
| /* we always unconditionally get the session id here, as even if we | |
| already got it from the cache and asked to use it in the connection, it | |
| - | might've been rejected and then a new one is in use now and we need to |
| + | might have been rejected and then a new one is in use now and we need to |
| detect that. */ | |
| /* get the session ID data size */ | |
m4/curl-compilers.m4+2 -2
| @@ -119,7 +119,7 @@ AC_DEFUN([CURL_CHECK_COMPILER_CLANG], [ | |
| compiler_ver="$clangver" | |
| compiler_num=`(expr $clangvhi "*" 100 + $clangvlo) 2>/dev/null` | |
| if test "$appleclang" = '1' && test "$oldapple" = '0'; then | |
| - | dnl Starting with Xcode 7 / clang 3.7, Apple clang won't tell its upstream version |
| + | dnl Starting with Xcode 7 / clang 3.7, Apple clang does not tell its upstream version |
| if test "$compiler_num" -ge '1700'; then compiler_num='1901' | |
| elif test "$compiler_num" -ge '1600'; then compiler_num='1700' | |
| elif test "$compiler_num" -ge '1500'; then compiler_num='1600' | |
| @@ -555,7 +555,7 @@ AC_DEFUN([CURL_SET_COMPILER_BASIC_OPTS], [ | |
| # | |
| HP_UX_C) | |
| # | |
| - | dnl Disallow run-time dereferencing of null pointers |
| + | dnl Disallow runtime dereferencing of null pointers |
| tmp_CFLAGS="$tmp_CFLAGS -z" | |
| dnl Disable some remarks | |
| dnl #4227: padding struct with n bytes to align member | |
m4/curl-functions.m4+1 -1
| @@ -3915,7 +3915,7 @@ dnl char *strerror_r(int errnum, char *workbuf, size_t bufsize); | |
| dnl | |
| dnl glibc-style strerror_r returns a pointer to the error string, | |
| dnl and might use the provided workbuf as a scratch area if needed. A | |
| - | dnl quick test on a few systems shows that it's usually not used at all. |
| + | dnl quick test on a few systems shows that it is usually not used at all. |
| dnl | |
| dnl POSIX-style strerror_r: | |
| dnl | |
m4/curl-gnutls.m4+4 -4
| @@ -60,7 +60,7 @@ if test "x$OPT_GNUTLS" != xno; then | |
| fi | |
| fi | |
| else | |
| - | dnl this is with a given path, first check if there's a libgnutls-config |
| + | dnl this is with a given path, first check if there is a libgnutls-config |
| dnl there and if not, make an educated guess | |
| cfg=$OPT_GNUTLS/bin/libgnutls-config | |
| check=`$cfg --version 2>/dev/null` | |
| @@ -74,7 +74,7 @@ if test "x$OPT_GNUTLS" != xno; then | |
| addlib=-lgnutls | |
| addld=-L$OPT_GNUTLS/lib$libsuff | |
| addcflags=-I$OPT_GNUTLS/include | |
| - | version="" # we just don't know |
| + | version="" # we just do not know |
| gtlslib=$OPT_GNUTLS/lib$libsuff | |
| fi | |
| fi | |
| @@ -117,8 +117,8 @@ if test "x$OPT_GNUTLS" != xno; then | |
| AC_MSG_NOTICE([detected GnuTLS version $version]) | |
| check_for_ca_bundle=1 | |
| if test -n "$gtlslib"; then | |
| - | dnl when shared libs were found in a path that the run-time |
| - | dnl linker doesn't search through, we need to add it to |
| + | dnl when shared libs were found in a path that the runtime |
| + | dnl linker does not search through, we need to add it to |
| dnl CURL_LIBRARY_PATH to prevent further configure tests to fail | |
| dnl due to this | |
| if test "x$cross_compiling" != "xyes"; then | |
m4/curl-mbedtls.m4+2 -2
| @@ -92,8 +92,8 @@ if test "x$OPT_MBEDTLS" != xno; then | |
| LIBS="-lmbedtls -lmbedx509 -lmbedcrypto $LIBS" | |
| if test -n "$mbedtlslib"; then | |
| - | dnl when shared libs were found in a path that the run-time |
| - | dnl linker doesn't search through, we need to add it to |
| + | dnl when shared libs were found in a path that the runtime |
| + | dnl linker does not search through, we need to add it to |
| dnl CURL_LIBRARY_PATH to prevent further configure tests to fail | |
| dnl due to this | |
| if test "x$cross_compiling" != "xyes"; then | |
m4/curl-openssl.m4+7 -7
| @@ -76,7 +76,7 @@ if test "x$OPT_OPENSSL" != xno; then | |
| PREFIX_OPENSSL=$OPT_OPENSSL | |
| dnl Try pkg-config even when cross-compiling. Since we | |
| - | dnl specify PKG_CONFIG_LIBDIR we're only looking where |
| + | dnl specify PKG_CONFIG_LIBDIR we are only looking where |
| dnl the user told us to look | |
| OPENSSL_PCDIR="$OPT_OPENSSL/lib/pkgconfig" | |
| if test -f "$OPENSSL_PCDIR/openssl.pc"; then | |
| @@ -132,9 +132,9 @@ if test "x$OPT_OPENSSL" != xno; then | |
| dnl use the values pkg-config reported. This is here | |
| dnl instead of below with CPPFLAGS and LDFLAGS because we only | |
| dnl learn about this via pkg-config. If we only have | |
| - | dnl the argument to --with-openssl we don't know what |
| + | dnl the argument to --with-openssl we do not know what |
| dnl additional libs may be necessary. Hope that we | |
| - | dnl don't need any. |
| + | dnl do not need any. |
| LIBS="$SSL_LIBS $LIBS" | |
| fi | |
| fi | |
| @@ -153,7 +153,7 @@ if test "x$OPT_OPENSSL" != xno; then | |
| LDFLAGSPC="$CLEANLDFLAGSPC -L$LIB_OPENSSL" | |
| fi | |
| if test "$PKGCONFIG" = "no" -a -n "$PREFIX_OPENSSL" ; then | |
| - | # only set this if pkg-config wasn't used |
| + | # only set this if pkg-config was not used |
| CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include" | |
| fi | |
| # Linking previously failed, try extra paths from --with-openssl or | |
| @@ -316,8 +316,8 @@ if test "x$OPT_OPENSSL" != xno; then | |
| if test "$OPENSSL_ENABLED" = "1"; then | |
| if test -n "$LIB_OPENSSL"; then | |
| - | dnl when the ssl shared libs were found in a path that the run-time |
| - | dnl linker doesn't search through, we need to add it to CURL_LIBRARY_PATH |
| + | dnl when the ssl shared libs were found in a path that the runtime |
| + | dnl linker does not search through, we need to add it to CURL_LIBRARY_PATH |
| dnl to prevent further configure tests to fail due to this | |
| if test "x$cross_compiling" != "xyes"; then | |
| CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$LIB_OPENSSL" | |
| @@ -391,7 +391,7 @@ AS_HELP_STRING([--enable-openssl-auto-load-config],[Enable automatic loading of | |
| AS_HELP_STRING([--disable-openssl-auto-load-config],[Disable automatic loading of OpenSSL configuration]), | |
| [ if test X"$enableval" = X"no"; then | |
| AC_MSG_NOTICE([automatic loading of OpenSSL configuration disabled]) | |
| - | AC_DEFINE(CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG, 1, [if the OpenSSL configuration won't be loaded automatically]) |
| + | AC_DEFINE(CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG, 1, [if the OpenSSL configuration will not be loaded automatically]) |
| fi | |
| ]) | |
m4/curl-override.m4+1 -1
| @@ -42,7 +42,7 @@ AC_BEFORE([$0],[AC_PROG_LIBTOOL]) | |
| dnl Override Autoconf's AC_LANG_PROGRAM (C) | |
| dnl ------------------------------------------------- | |
| dnl This is done to prevent compiler warning | |
| - | dnl 'function declaration isn't a prototype' |
| + | dnl 'function declaration is not a prototype' |
| dnl in function main. This requires at least | |
| dnl a C89 compiler and does not support K&R. | |
m4/curl-reentrant.m4+2 -2
| @@ -359,7 +359,7 @@ _EOF | |
| dnl CURL_CONFIGURE_REENTRANT | |
| dnl ------------------------------------------------- | |
| dnl This first checks if the preprocessor _REENTRANT | |
| - | dnl symbol is already defined. If it isn't currently |
| + | dnl symbol is already defined. If it is not currently |
| dnl defined a set of checks are performed to verify | |
| dnl if its definition is required to make visible to | |
| dnl the compiler a set of *_r functions. Finally, if | |
| @@ -421,7 +421,7 @@ AC_DEFUN([CURL_CONFIGURE_REENTRANT], [ | |
| dnl CURL_CONFIGURE_THREAD_SAFE | |
| dnl ------------------------------------------------- | |
| dnl This first checks if the preprocessor _THREAD_SAFE | |
| - | dnl symbol is already defined. If it isn't currently |
| + | dnl symbol is already defined. If it is not currently |
| dnl defined a set of checks are performed to verify | |
| dnl if its definition is required. Finally, if | |
| dnl _THREAD_SAFE is already defined or needed it takes | |
m4/curl-rustls.m4+3 -3
| @@ -127,9 +127,9 @@ if test "x$OPT_RUSTLS" != xno; then | |
| dnl use the values pkg-config reported. This is here | |
| dnl instead of below with CPPFLAGS and LDFLAGS because we only | |
| dnl learn about this via pkg-config. If we only have | |
| - | dnl the argument to --with-rustls we don't know what |
| + | dnl the argument to --with-rustls we do not know what |
| dnl additional libs may be necessary. Hope that we | |
| - | dnl don't need any. |
| + | dnl do not need any. |
| LIBS="$SSL_LIBS $LIBS" | |
| link_pkgconfig=1 | |
| ssl_msg="Rustls" | |
| @@ -157,7 +157,7 @@ if test "x$OPT_RUSTLS" != xno; then | |
| check_for_ca_bundle=1 | |
| if test -n "$LIB_RUSTLS"; then | |
| - | dnl when shared libs were found in a path that the run-time |
| + | dnl when shared libs were found in a path that the runtime |
| dnl linker does not search through, we need to add it to | |
| dnl CURL_LIBRARY_PATH so that further configure tests do not | |
| dnl fail due to this | |
m4/curl-wolfssl.m4+4 -4
| @@ -51,7 +51,7 @@ if test "x$OPT_WOLFSSL" != xno; then | |
| dnl try pkg-config magic | |
| CURL_CHECK_PKGCONFIG(wolfssl, [$wolfpkg]) | |
| - | AC_MSG_NOTICE([Check dir $wolfpkg]) |
| + | AC_MSG_NOTICE([Check directory $wolfpkg]) |
| addld="" | |
| addlib="" | |
| @@ -160,8 +160,8 @@ if test "x$OPT_WOLFSSL" != xno; then | |
| fi | |
| if test -n "$wolfssllibpath"; then | |
| - | dnl when shared libs were found in a path that the run-time |
| - | dnl linker doesn't search through, we need to add it to |
| + | dnl when shared libs were found in a path that the runtime |
| + | dnl linker does not search through, we need to add it to |
| dnl CURL_LIBRARY_PATH to prevent further configure tests to fail | |
| dnl due to this | |
| if test "x$cross_compiling" != "xyes"; then | |
| @@ -172,7 +172,7 @@ if test "x$OPT_WOLFSSL" != xno; then | |
| fi | |
| LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE wolfssl" | |
| else | |
| - | AC_MSG_ERROR([--with-wolfssl but wolfSSL was not found or doesn't work]) |
| + | AC_MSG_ERROR([--with-wolfssl but wolfSSL was not found or does not work]) |
| fi | |
| fi dnl wolfSSL not disabled | |
m4/xc-val-flgs.m4+1 -1
| @@ -226,7 +226,7 @@ dnl script might have set. When checks fails, user | |
| dnl is noticed about errors detected in all of them | |
| dnl but script continues execution. | |
| dnl | |
| - | dnl Intended to be used very late in configure script. |
| + | dnl Intended to be used late in configure script. |
| AC_DEFUN([XC_CHECK_BUILD_FLAGS], [ | |
| AC_PREREQ([2.50])dnl | |
m4/zz40-xc-ovr.m4+2 -2
| @@ -448,7 +448,7 @@ dnl ------------------------------------------------- | |
| dnl Public macro. | |
| dnl | |
| dnl This macro emits shell code which does some | |
| - | dnl very basic checks related with the availability |
| + | dnl basic checks related with the availability |
| dnl of some commands and utilities needed to allow | |
| dnl configure script bootstrapping itself when using | |
| dnl these to figure out other settings. Also emits | |
| @@ -602,7 +602,7 @@ dnl overrides the auto-detected one. | |
| dnl | |
| dnl Strictly speaking the check is done in two steps. The | |
| dnl first, which does the actual check, takes place in | |
| - | dnl XC_CONFIGURE_PREAMBLE macro and happens very early in |
| + | dnl XC_CONFIGURE_PREAMBLE macro and happens early in |
| dnl generated configure script. The second one shows and | |
| dnl logs the result of the check into config.log at a later | |
| dnl configure stage. Placement of this second stage in | |
m4/zz50-xc-ovr.m4+1 -1
| @@ -35,7 +35,7 @@ dnl ------------------------------------------------- | |
| dnl This is done to prevent Libtool 1.5.X from doing | |
| dnl unnecessary C++, Fortran and Java tests when only | |
| dnl using C language and reduce resulting configure | |
| - | dnl script by nearly 300 Kb. |
| + | dnl script by nearly 300 KB. |
| m4_ifdef([AC_LIBTOOL_LANG_CXX_CONFIG], | |
| [m4_undefine([AC_LIBTOOL_LANG_CXX_CONFIG])]) | |
packages/OS400/os400sys.c+1 -1
| @@ -702,7 +702,7 @@ Curl_ldap_get_values_len_a(void *ld, LDAPMessage *entry, const char *attr) | |
| result = ldap_get_values_len(ld, entry, cp); | |
| free(cp); | |
| - | /* Result data are binary in nature, so they haven't been |
| + | /* Result data are binary in nature, so they have not been |
| converted to EBCDIC. Therefore do not convert. */ | |
| return result; | |
packages/vms/build_vms.com+4 -4
| @@ -1,6 +1,6 @@ | |
| $! BUILD_VMS.COM | |
| $! | |
| - | $! I've taken the original build_vms.com, supplied by Nico Baggus, if |
| + | $! I have taken the original build_vms.com, supplied by Nico Baggus, if |
| $! memory serves me correctly, and made some modifications. | |
| $! | |
| $! SSL support is controlled by logical names. If SSL$INCLUDE is | |
| @@ -45,14 +45,14 @@ $! LIST Create C compiler listings and linker maps. | |
| $! /list/show=(expan,includ)/machine | |
| $! FULLLIST Full detailed listing. | |
| $! /list/show=(all, nomessages)/machine | |
| - | $! NOHPSSL Don't use HP SSL, even if available. |
| + | $! NOHPSSL Do not use HP SSL, even if available. |
| $! Note, you must match the pointer size that the OpenSSL | |
| $! shared image expects. This procedure will select the | |
| $! correct HP OpenSSL image. | |
| - | $! NOSSL Don't use any SSL, even if available. |
| + | $! NOSSL Do not use any SSL, even if available. |
| $! OSSLOLB Use OpenSSL object libraries (.OLB), even if shared | |
| $! images (.EXE) are available. | |
| - | $! NOZLIB Don't use GNV$ZLIB shared image even if available. |
| + | $! NOZLIB Do not use GNV$ZLIB shared image even if available. |
| $! REALCLEAN Delete product files for all host architectures. (No | |
| $! build done.) Alias for CLEAN_ALL | |
| $! | |
packages/vms/curl_crtl_init.c+1 -1
| @@ -236,7 +236,7 @@ static void set_features(void) | |
| set_feature_default("DECC$EXEC_FILEATTR_INHERITANCE", 2); | |
| #endif | |
| - | /* Don't display trailing dot after files without type */ |
| + | /* Do not display trailing dot after files without type */ |
| set_feature_default("DECC$READDIR_DROPDOTNOTYPE", ENABLE); | |
| /* For standard output channels buffer output until terminator */ | |
scripts/mk-ca-bundle.pl+1 -1
| @@ -91,7 +91,7 @@ my @valid_mozilla_trust_purposes = ( | |
| my @valid_mozilla_trust_levels = ( | |
| "TRUSTED_DELEGATOR", # CAs | |
| - | "NOT_TRUSTED", # Don't trust these certs. |
| + | "NOT_TRUSTED", # Do not trust these certs. |
| "MUST_VERIFY_TRUST", # This explicitly tells us that it IS NOT a CA but is | |
| # otherwise ok. In other words, this should tell the | |
| # app to ignore any other sources that claim this is | |
src/tool_parsecfg.c+1 -1
| @@ -54,7 +54,7 @@ static int unslashquote(const char *line, struct dynbuf *param) | |
| /* default is to output the letter after the backslash */ | |
| switch(out = *line) { | |
| case '\0': | |
| - | continue; /* this'll break out of the loop */ |
| + | continue; /* this breaks out of the loop */ |
| case 't': | |
| out = '\t'; | |
| break; | |
tests/data/test1425+1 -1
| @@ -69,7 +69,7 @@ Content-Type: text/html | |
| Funny-head: yesyes | |
| </stdout> | |
| - | # 23 == CURLE_WRITE_ERROR, curl wouldn't accept the binary output |
| + | # 23 == CURLE_WRITE_ERROR, curl would not accept the binary output |
| <errorcode> | |
| 23 | |
| </errorcode> | |
tests/data/test1516+1 -1
| @@ -11,7 +11,7 @@ resolve | |
| <reply> | |
| # Close the connection after the first request but do not tell the client to do | |
| - | # so! When starting the second request it'll detect a dead connection and must |
| + | # so! When starting the second request it detects a dead connection and must |
| # not clean the DNS entries added manually. | |
| <data1> | |
| HTTP/1.1 200 OK | |
tests/data/test1566+1 -1
| @@ -29,7 +29,7 @@ Content-Type: text/html | |
| http | |
| </server> | |
| <name> | |
| - | --etag-compare that gets a 304 back shouldn't overwrite the file |
| + | --etag-compare that gets a 304 back should not overwrite the file |
| </name> | |
| <command option="no-output,no-include"> | |
| http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/output%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER | |
tests/data/test555+1 -1
| @@ -1,6 +1,6 @@ | |
| <testcase> | |
| # NOTE: this test case is a duplicate of 547 but the tool is built to use the | |
| - | # multi interface instead of easy, but that shouldn't be noticeable at all in |
| + | # multi interface instead of easy, but that should not be noticeable at all in |
| # this file! | |
| <info> | |
| <keywords> | |
tests/dictserver.py+1 -1
| @@ -140,7 +140,7 @@ def setup_logging(options): | |
| handler.setLevel(logging.DEBUG) | |
| root_logger.addHandler(handler) | |
| else: | |
| - | # The logfile wasn't specified. Add a stdout logger. |
| + | # The logfile was not specified. Add a stdout logger. |
| add_stdout = True | |
| if options.verbose: | |
tests/ftpserver.pl+6 -6
| @@ -34,8 +34,8 @@ | |
| # It is meant to exercise curl, it is not meant to be a fully working | |
| # or even overly standard compliant server. | |
| # | |
| - | # You may optionally specify port on the command line, otherwise it'll |
| - | # default to port 8921. |
| + | # You may optionally specify port on the command line, otherwise it |
| + | # defaults to port 8921. |
| # | |
| # All socket/network/TCP related stuff is done by the 'sockfilt' program. | |
| # | |
| @@ -989,7 +989,7 @@ sub DATA_smtp { | |
| } | |
| if($nosave) { | |
| - | print $file "$ulsize bytes would've been stored here\n"; |
| + | print $file "$ulsize bytes would have been stored here\n"; |
| } | |
| close($file); | |
| @@ -1336,7 +1336,7 @@ sub APPEND_imap { | |
| } | |
| if($nosave) { | |
| - | print $file "$size bytes would've been stored here\n"; |
| + | print $file "$size bytes would have been stored here\n"; |
| } | |
| close($file); | |
| @@ -2439,7 +2439,7 @@ sub STOR_ftp { | |
| } | |
| } | |
| if($nosave) { | |
| - | print $file "$ulsize bytes would've been stored here\n"; |
| + | print $file "$ulsize bytes would have been stored here\n"; |
| } | |
| close($file); | |
| close_dataconn($disc); | |
| @@ -3342,7 +3342,7 @@ while(1) { | |
| } | |
| if($check) { | |
| - | logmsg "$FTPCMD wasn't handled!\n"; |
| + | logmsg "$FTPCMD was not handled!\n"; |
| if($proto eq 'pop3') { | |
| sendcontrol "-ERR $FTPCMD is not dealt with!\r\n"; | |
| } | |
tests/getpart.pm+3 -3
| @@ -115,7 +115,7 @@ sub getpartattr { | |
| } | |
| last; | |
| } | |
| - | # detect end of section when part wasn't found |
| + | # detect end of section when part was not found |
| elsif((1 ==$inside) && ($_ =~ /^ *\<\/$section\>/)) { | |
| last; | |
| } | |
| @@ -242,7 +242,7 @@ sub loadtest { | |
| else { | |
| # failure | |
| if($warning) { | |
| - | print STDERR "file $file wouldn't open!\n"; |
| + | print STDERR "file $file would not open!\n"; |
| } | |
| return 1; | |
| } | |
| @@ -310,7 +310,7 @@ sub savetest { | |
| else { | |
| # failure | |
| if($warning) { | |
| - | print STDERR "file $file wouldn't open!\n"; |
| + | print STDERR "file $file would not open!\n"; |
| } | |
| return 1; | |
| } | |
tests/libtest/lib1308.c+1 -1
| @@ -58,7 +58,7 @@ static CURLcode test_lib1308(const char *URL) | |
| /* after the first curl_formadd when there is a single entry, both pointers | |
| should point to the same struct */ | |
| - | t1308_fail_unless(post == last, "post and last weren't the same"); |
| + | t1308_fail_unless(post == last, "post and last were not the same"); |
| rc = curl_formadd(&post, &last, CURLFORM_COPYNAME, "htmlcode", | |
| CURLFORM_COPYCONTENTS, "<HTML></HTML>", | |
tests/libtest/lib557.c+2 -2
| @@ -1108,7 +1108,7 @@ static int test_curl_off_t_formatting(void) | |
| static int string_check_low(int linenumber, char *buf, const char *buf2) | |
| { | |
| if(strcmp(buf, buf2)) { | |
| - | /* they shouldn't differ */ |
| + | /* they should not differ */ |
| curl_mprintf("sprintf line %d failed:\nwe '%s'\nsystem: '%s'\n", | |
| linenumber, buf, buf2); | |
| return 1; | |
| @@ -1121,7 +1121,7 @@ static int strlen_check_low(int linenumber, char *buf, size_t len) | |
| { | |
| size_t buflen = strlen(buf); | |
| if(len != buflen) { | |
| - | /* they shouldn't differ */ |
| + | /* they should not differ */ |
| curl_mprintf("sprintf strlen:%d failed:\nwe '%zu'\nsystem: '%zu'\n", | |
| linenumber, buflen, len); | |
| return 1; | |
tests/libtest/lib560.c+1 -1
| @@ -30,7 +30,7 @@ | |
| * | |
| * This test was added after the HTTPS-using-multi-interface with OpenSSL | |
| * regression of 7.19.1 to hopefully prevent this embarrassing mistake from | |
| - | * appearing again... Unfortunately the bug wasn't triggered by this test, |
| + | * appearing again... Unfortunately the bug was not triggered by this test, |
| * which presumably is because the connect to a local server is too | |
| * fast/different compared to the real/distant servers we saw the bug happen | |
| * with. | |
tests/negtelnetserver.py+1 -1
| @@ -323,7 +323,7 @@ def setup_logging(options): | |
| handler.setLevel(logging.DEBUG) | |
| root_logger.addHandler(handler) | |
| else: | |
| - | # The logfile wasn't specified. Add a stdout logger. |
| + | # The logfile was not specified. Add a stdout logger. |
| add_stdout = True | |
| if options.verbose: | |
tests/processhelp.pm+1 -1
| @@ -317,7 +317,7 @@ sub processexists { | |
| ####################################################################### | |
| # killpid attempts to gracefully stop processes in the given pid list | |
| - | # with a SIGTERM signal and SIGKILLs those which haven't died on time. |
| + | # with a SIGTERM signal and SIGKILLs those which have not died on time. |
| # | |
| sub killpid { | |
| my ($verbose, $pidlist) = @_; | |
tests/runtests.pl+1 -1
| @@ -242,7 +242,7 @@ sub singletest_unbufferlogs { | |
| # Clear the buffered log messages & stop buffering after returning them | |
| sub singletest_dumplogs { | |
| if(!defined $singletest_bufferedrunner) { | |
| - | # probably not multiprocess mode and logs weren't buffered |
| + | # probably not multiprocess mode and logs were not buffered |
| return undef; | |
| } | |
| my $logsref = $singletest_logs{$singletest_bufferedrunner}; | |
tests/server/sockfilt.c+1 -1
| @@ -44,7 +44,7 @@ | |
| * | |
| * o We want FTP-SSL support, which means that a connection that starts with | |
| * plain sockets needs to be able to "go SSL" in the midst. This would also | |
| - | * require some nasty perl stuff I'd rather avoid. |
| + | * require some nasty perl stuff I would rather avoid. |
| * | |
| * (Source originally based on sws.c) | |
| */ | |
tests/server/tftpd.c+2 -2
| @@ -148,7 +148,7 @@ struct bf { | |
| tftphdr_storage_t buf; /* room for data packet */ | |
| }; | |
| - | #define BF_ALLOC -3 /* alloc'd but not yet filled */ |
| + | #define BF_ALLOC -3 /* allocated but not yet filled */ |
| #define BF_FREE -2 /* free */ | |
| #define opcode_RRQ 1 | |
| @@ -417,7 +417,7 @@ static int writeit(struct testcase *test, struct tftphdr * volatile *dpp, | |
| current = !current; /* switch to other buffer */ | |
| if(bfs[current].counter != BF_FREE) /* if not free */ | |
| write_behind(test, convert); /* flush it */ | |
| - | bfs[current].counter = BF_ALLOC; /* mark as alloc'd */ |
| + | bfs[current].counter = BF_ALLOC; /* mark as allocated */ |
| *dpp = &bfs[current].buf.hdr; | |
| return ct; /* this is a lie of course */ | |
| } | |
tests/smbserver.py+2 -2
| @@ -76,7 +76,7 @@ class ShutdownHandler(threading.Thread): | |
| signal.signal(signal.SIGTERM, self._sighandler) | |
| def __exit__(self, *_): | |
| - | # Call for shutdown just in case it wasn't done already |
| + | # Call for shutdown just in case it was not done already |
| self.shutdown_event.set() | |
| # Wait for thread, and therefore also the server, to finish | |
| self.join() | |
| @@ -408,7 +408,7 @@ def setup_logging(options): | |
| handler.setLevel(logging.DEBUG) | |
| root_logger.addHandler(handler) | |
| else: | |
| - | # The logfile wasn't specified. Add a stdout logger. |
| + | # The logfile was not specified. Add a stdout logger. |
| add_stdout = True | |
| if options.verbose: | |
tests/test1173.pl+1 -1
| @@ -254,7 +254,7 @@ sub scanmanpage { | |
| if($_ =~ /(.*)\\f([^BIP])/) { | |
| my ($pre, $format) = ($1, $2); | |
| if($pre !~ /\\\z/) { | |
| - | # only if there wasn't another backslash before the \f |
| + | # only if there was not another backslash before the \f |
| print STDERR "$file:$line suspicious \\f format!\n"; | |
| $errors++; | |
| } | |