9061302a86
Viktor Szakats
2026-06-15
Subject
tidy-up: prefer spelling 'flavor', where missing
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
CMake/FindGSS.cmake +11 -11CMakeLists.txt +4 -4configure.ac +10 -10include/curl/curl.h +1 -1lib/CMakeLists.txt +1 -1lib/functypes.h +1 -1lib/hostip4.c +1 -1src/Makefile.inc +1 -1
CMake/FindGSS.cmake+11 -11
| @@ -136,7 +136,7 @@ if(NOT _gss_FOUND) # Not found by pkg-config. Let us take more traditional appr | |
| # 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 |
| + | set(_gss_flavor "MIT") # assume a default, should not really matter |
| endif() | |
| else() # Either there is no config script or we are on a platform that does not provide one (Windows?) | |
| @@ -152,7 +152,7 @@ if(NOT _gss_FOUND) # Not found by pkg-config. Let us take more traditional appr | |
| cmake_pop_check_state() | |
| if(_gss_have_mit_headers) | |
| - | set(_gss_flavour "MIT") |
| + | set(_gss_flavor "MIT") |
| if(WIN32) | |
| if(CMAKE_SIZEOF_VOID_P EQUAL 8) | |
| list(APPEND _gss_libdir_suffixes "lib/AMD64") | |
| @@ -170,14 +170,14 @@ if(NOT _gss_FOUND) # Not found by pkg-config. Let us take more traditional appr | |
| find_path(_gss_INCLUDE_DIRS NAMES "gss.h" HINTS ${_gss_root_hints} PATH_SUFFIXES "include") | |
| if(_gss_INCLUDE_DIRS) | |
| - | set(_gss_flavour "GNU") |
| + | set(_gss_flavor "GNU") |
| set(_gss_pc_requires ${_gnu_modname}) | |
| set(_gss_libname "gss") | |
| endif() | |
| endif() | |
| # If we have headers, look up libraries | |
| - | if(_gss_flavour) |
| + | if(_gss_flavor) |
| set(_gss_libdir_hints ${_gss_root_hints}) | |
| if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.20) | |
| cmake_path(GET _gss_INCLUDE_DIRS PARENT_PATH _gss_calculated_potential_root) | |
| @@ -189,28 +189,28 @@ if(NOT _gss_FOUND) # Not found by pkg-config. Let us take more traditional appr | |
| find_library(_gss_LIBRARIES NAMES ${_gss_libname} HINTS ${_gss_libdir_hints} PATH_SUFFIXES ${_gss_libdir_suffixes}) | |
| endif() | |
| endif() | |
| - | if(NOT _gss_flavour) |
| + | if(NOT _gss_flavor) |
| message(FATAL_ERROR "GNU or MIT GSS is required") | |
| endif() | |
| else() | |
| # _gss_MODULE_NAME set since CMake 3.16. | |
| # _pkg_check_modules_pkg_name is undocumented and used as a fallback for CMake <3.16 versions. | |
| if(_gss_MODULE_NAME STREQUAL _gnu_modname OR _pkg_check_modules_pkg_name STREQUAL _gnu_modname) | |
| - | set(_gss_flavour "GNU") |
| + | set(_gss_flavor "GNU") |
| set(_gss_pc_requires ${_gnu_modname}) | |
| elseif(_gss_MODULE_NAME STREQUAL _mit_modname OR _pkg_check_modules_pkg_name STREQUAL _mit_modname) | |
| - | set(_gss_flavour "MIT") |
| + | set(_gss_flavor "MIT") |
| set(_gss_pc_requires ${_mit_modname}) | |
| else() | |
| message(FATAL_ERROR "GNU or MIT GSS is required") | |
| endif() | |
| - | message(STATUS "Found GSS/${_gss_flavour} (via pkg-config): ${_gss_INCLUDE_DIRS} (found version \"${_gss_version}\")") |
| + | message(STATUS "Found GSS/${_gss_flavor} (via pkg-config): ${_gss_INCLUDE_DIRS} (found version \"${_gss_version}\")") |
| endif() | |
| set(GSS_VERSION ${_gss_version}) | |
| if(NOT GSS_VERSION) | |
| - | if(_gss_flavour STREQUAL "MIT") |
| + | if(_gss_flavor STREQUAL "MIT") |
| if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.24) | |
| cmake_host_system_information(RESULT _mit_version QUERY WINDOWS_REGISTRY | |
| "HKLM/SOFTWARE/MIT/Kerberos/SDK/CurrentVersion" VALUE "VersionString") | |
| @@ -238,7 +238,7 @@ endif() | |
| include(FindPackageHandleStandardArgs) | |
| find_package_handle_standard_args(GSS | |
| REQUIRED_VARS | |
| - | _gss_flavour |
| + | _gss_flavor |
| _gss_LIBRARIES | |
| VERSION_VAR | |
| GSS_VERSION | |
| @@ -261,7 +261,7 @@ if(GSS_FOUND) | |
| if(NOT TARGET CURL::gss) | |
| add_library(CURL::gss INTERFACE IMPORTED) | |
| set_target_properties(CURL::gss PROPERTIES | |
| - | INTERFACE_CURL_GSS_FLAVOR "${_gss_flavour}" |
| + | INTERFACE_CURL_GSS_FLAVOR "${_gss_flavor}" |
| INTERFACE_LIBCURL_PC_MODULES "${_gss_pc_requires}" | |
| INTERFACE_COMPILE_OPTIONS "${_gss_CFLAGS}" | |
| INTERFACE_INCLUDE_DIRECTORIES "${_gss_INCLUDE_DIRS}" | |
CMakeLists.txt+4 -4
| @@ -358,14 +358,14 @@ elseif(BUILD_STATIC_CURL AND NOT BUILD_STATIC_LIBS) | |
| set(BUILD_STATIC_CURL OFF) | |
| endif() | |
| - | # Lib flavour selected for curl tool |
| + | # Lib flavor selected for curl tool |
| if(BUILD_STATIC_CURL) | |
| set(LIB_SELECTED_FOR_EXE ${LIB_STATIC}) | |
| else() | |
| set(LIB_SELECTED_FOR_EXE ${LIB_SHARED}) | |
| endif() | |
| - | # Lib flavour selected for example and test programs. |
| + | # Lib flavor selected for example and test programs. |
| if(BUILD_SHARED_LIBS) | |
| set(LIB_SELECTED ${LIB_SHARED}) | |
| else() | |
| @@ -1350,8 +1350,8 @@ if(CURL_USE_GSSAPI) | |
| if(GSS_FOUND) | |
| list(APPEND CURL_LIBS CURL::gss) | |
| - | get_target_property(_gss_flavour CURL::gss INTERFACE_CURL_GSS_FLAVOR) |
| - | if(_gss_flavour STREQUAL "GNU") |
| + | get_target_property(_gss_flavor CURL::gss INTERFACE_CURL_GSS_FLAVOR) |
| + | if(_gss_flavor STREQUAL "GNU") |
| set(HAVE_GSSGNU 1) | |
| elseif(GSS_VERSION) # MIT | |
| set(CURL_KRB5_VERSION "\"${GSS_VERSION}\"") | |
configure.ac+10 -10
| @@ -2762,7 +2762,7 @@ dnl ********************************************************************** | |
| dnl Check for linker switch for versioned symbols | |
| dnl ********************************************************************** | |
| - | versioned_symbols_flavour= |
| + | versioned_symbols_flavor= |
| AC_MSG_CHECKING([whether versioned symbols are wanted]) | |
| AC_ARG_ENABLE(versioned-symbols, | |
| AS_HELP_STRING([--enable-versioned-symbols], [Enable versioned symbols in shared library]) | |
| @@ -2781,21 +2781,21 @@ AS_HELP_STRING([--disable-versioned-symbols], [Disable versioned symbols in shar | |
| else | |
| AC_MSG_RESULT(yes) | |
| if test "x$enableval" != "xyes"; then | |
| - | versioned_symbols_flavour="$enableval" |
| + | versioned_symbols_flavor="$enableval" |
| elif test "$CURL_WITH_MULTI_SSL" = "1"; then | |
| - | versioned_symbols_flavour="MULTISSL_" |
| + | versioned_symbols_flavor="MULTISSL_" |
| elif test "$OPENSSL_ENABLED" = "1"; then | |
| - | versioned_symbols_flavour="OPENSSL_" |
| + | versioned_symbols_flavor="OPENSSL_" |
| elif test "$MBEDTLS_ENABLED" = "1"; then | |
| - | versioned_symbols_flavour="MBEDTLS_" |
| + | versioned_symbols_flavor="MBEDTLS_" |
| elif test "$WOLFSSL_ENABLED" = "1"; then | |
| - | versioned_symbols_flavour="WOLFSSL_" |
| + | versioned_symbols_flavor="WOLFSSL_" |
| elif test "$GNUTLS_ENABLED" = "1"; then | |
| - | versioned_symbols_flavour="GNUTLS_" |
| + | versioned_symbols_flavor="GNUTLS_" |
| elif test "$RUSTLS_ENABLED" = "1"; then | |
| - | versioned_symbols_flavour="RUSTLS_" |
| + | versioned_symbols_flavor="RUSTLS_" |
| else | |
| - | versioned_symbols_flavour="" |
| + | versioned_symbols_flavor="" |
| fi | |
| versioned_symbols="yes" | |
| fi | |
| @@ -2807,7 +2807,7 @@ AS_HELP_STRING([--disable-versioned-symbols], [Disable versioned symbols in shar | |
| ] | |
| ) | |
| - | AC_SUBST([CURL_LIBCURL_VERSIONED_SYMBOLS_PREFIX], ["$versioned_symbols_flavour"]) |
| + | AC_SUBST([CURL_LIBCURL_VERSIONED_SYMBOLS_PREFIX], ["$versioned_symbols_flavor"]) |
| AC_SUBST([CURL_LIBCURL_VERSIONED_SYMBOLS_SONAME], ["4"]) dnl Keep in sync with VERSIONCHANGE - VERSIONDEL in lib/Makefile.soname | |
| AM_CONDITIONAL([CURL_LT_SHLIB_USE_VERSIONED_SYMBOLS], | |
| [test "$versioned_symbols" = "yes"]) | |
include/curl/curl.h+1 -1
| @@ -818,7 +818,7 @@ typedef enum { | |
| * CURLAUTH_NEGOTIATE - HTTP Negotiate (SPNEGO) authentication | |
| * CURLAUTH_GSSNEGOTIATE - Alias for CURLAUTH_NEGOTIATE (deprecated) | |
| * CURLAUTH_NTLM - HTTP NTLM authentication | |
| - | * CURLAUTH_DIGEST_IE - HTTP Digest authentication with IE flavour |
| + | * CURLAUTH_DIGEST_IE - HTTP Digest authentication with IE flavor |
| * CURLAUTH_NTLM_WB - HTTP NTLM authentication delegated to winbind helper | |
| * CURLAUTH_BEARER - HTTP Bearer token authentication | |
| * CURLAUTH_ONLY - Use together with a single other type to force no | |
lib/CMakeLists.txt+1 -1
| @@ -252,7 +252,7 @@ if(BUILD_SHARED_LIBS) | |
| CMAKE_SYSTEM_NAME STREQUAL "Haiku" OR | |
| CMAKE_SYSTEM_NAME STREQUAL "OHOS" OR # OpenHarmony | |
| CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD" OR | |
| - | # FreeBSD comes with the a.out and ELF flavours but a.out was supported |
| + | # FreeBSD comes with the a.out and ELF flavors but a.out was supported |
| # up to v3.x and ELF from v3.x. I cannot imagine someone running CMake | |
| # on those ancient systems. | |
| CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") | |
lib/functypes.h+1 -1
| @@ -48,7 +48,7 @@ | |
| #define SEND_TYPE_ARG3 int | |
| #define SEND_TYPE_RETV int | |
| - | #elif defined(__AMIGA__) /* Any AmigaOS flavour */ |
| + | #elif defined(__AMIGA__) /* Any AmigaOS flavor */ |
| /* long recv(long, char *, long, long); */ | |
| #define RECV_TYPE_ARG1 long | |
lib/hostip4.c+1 -1
| @@ -64,7 +64,7 @@ | |
| * the HAVE_GETHOSTBYNAME_R_3, HAVE_GETHOSTBYNAME_R_5 or | |
| * HAVE_GETHOSTBYNAME_R_6 defines accordingly. Note that HAVE_GETADDRBYNAME | |
| * has the corresponding rules. This is primarily on *nix. Note that some Unix | |
| - | * flavours have thread-safe versions of the plain gethostbyname() etc. |
| + | * flavors have thread-safe versions of the plain gethostbyname() etc. |
| * | |
| */ | |
| struct Curl_addrinfo *Curl_sync_getaddrinfo(struct Curl_easy *data, | |
src/Makefile.inc+1 -1
| @@ -24,7 +24,7 @@ | |
| # Shared between CMakeLists.txt and Makefile.am | |
| # Using the backslash as line continuation character might be problematic with | |
| - | # some make flavours. If we ever want to change this in a portable manner then |
| + | # some make flavors. If we ever want to change this in a portable manner then |
| # we should consider this idea : | |
| # CSRC1 = file1.c file2.c file3.c | |
| # CSRC2 = file4.c file5.c file6.c | |