5f2a70abe3
Viktor Szakats
2026-07-15
Subject
tidy-up: `TEXT()` vs `_TEXT()` vs `_T()` use (Windows)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/curl_sspi.c+4 -4
| @@ -101,7 +101,7 @@ CURLcode Curl_create_sspi_identity(const char *userp, const char *passwdp, | |
| xcharp_u passwd, dup_passwd; | |
| size_t domlen = 0; | |
| - | domain.const_tchar_ptr = TEXT(""); |
| + | domain.const_tchar_ptr = _TEXT(""); |
| /* Initialize the identity */ | |
| memset(identity, 0, sizeof(*identity)); | |
| @@ -110,9 +110,9 @@ CURLcode Curl_create_sspi_identity(const char *userp, const char *passwdp, | |
| if(!useranddomain.tchar_ptr) | |
| return CURLE_OUT_OF_MEMORY; | |
| - | user.const_tchar_ptr = _tcschr(useranddomain.const_tchar_ptr, TEXT('\\')); |
| + | user.const_tchar_ptr = _tcschr(useranddomain.const_tchar_ptr, _TEXT('\\')); |
| if(!user.const_tchar_ptr) | |
| - | user.const_tchar_ptr = _tcschr(useranddomain.const_tchar_ptr, TEXT('/')); |
| + | user.const_tchar_ptr = _tcschr(useranddomain.const_tchar_ptr, _TEXT('/')); |
| if(user.tchar_ptr) { | |
| domain.tchar_ptr = useranddomain.tchar_ptr; | |
| @@ -121,7 +121,7 @@ CURLcode Curl_create_sspi_identity(const char *userp, const char *passwdp, | |
| } | |
| else { | |
| user.tchar_ptr = useranddomain.tchar_ptr; | |
| - | domain.const_tchar_ptr = TEXT(""); |
| + | domain.const_tchar_ptr = _TEXT(""); |
| domlen = 0; | |
| } | |
lib/curlx/fopen.c+1 -1
| @@ -121,7 +121,7 @@ static bool fix_excessive_path(const TCHAR *in, TCHAR **out) | |
| *out = NULL; | |
| /* skip paths already normalized */ | |
| - | if(!_tcsncmp(in, _T("\\\\?\\"), 4)) |
| + | if(!_tcsncmp(in, _TEXT("\\\\?\\"), 4)) |
| goto cleanup; | |
| #ifndef _UNICODE | |
lib/vtls/schannel.c+13 -12
| @@ -316,34 +316,35 @@ static CURLcode get_cert_location(TCHAR *path, DWORD *store_name, | |
| TCHAR *store_path_start; | |
| size_t store_name_len; | |
| - | sep = _tcschr(path, TEXT('\\')); |
| + | sep = _tcschr(path, _TEXT('\\')); |
| if(!sep) | |
| return CURLE_SSL_CERTPROBLEM; | |
| store_name_len = sep - path; | |
| - | if(_tcsncmp(path, TEXT("CurrentUser"), store_name_len) == 0) |
| + | if(_tcsncmp(path, _TEXT("CurrentUser"), store_name_len) == 0) |
| *store_name = CERT_SYSTEM_STORE_CURRENT_USER; | |
| - | else if(_tcsncmp(path, TEXT("LocalMachine"), store_name_len) == 0) |
| + | else if(_tcsncmp(path, _TEXT("LocalMachine"), store_name_len) == 0) |
| *store_name = CERT_SYSTEM_STORE_LOCAL_MACHINE; | |
| - | else if(_tcsncmp(path, TEXT("CurrentService"), store_name_len) == 0) |
| + | else if(_tcsncmp(path, _TEXT("CurrentService"), store_name_len) == 0) |
| *store_name = CERT_SYSTEM_STORE_CURRENT_SERVICE; | |
| - | else if(_tcsncmp(path, TEXT("Services"), store_name_len) == 0) |
| + | else if(_tcsncmp(path, _TEXT("Services"), store_name_len) == 0) |
| *store_name = CERT_SYSTEM_STORE_SERVICES; | |
| - | else if(_tcsncmp(path, TEXT("Users"), store_name_len) == 0) |
| + | else if(_tcsncmp(path, _TEXT("Users"), store_name_len) == 0) |
| *store_name = CERT_SYSTEM_STORE_USERS; | |
| - | else if(_tcsncmp(path, TEXT("CurrentUserGroupPolicy"), store_name_len) == 0) |
| + | else if(_tcsncmp(path, _TEXT("CurrentUserGroupPolicy"), store_name_len) == 0) |
| *store_name = CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY; | |
| - | else if(_tcsncmp(path, TEXT("LocalMachineGroupPolicy"), store_name_len) == 0) |
| + | else if(_tcsncmp(path, _TEXT("LocalMachineGroupPolicy"), store_name_len) == |
| + | 0) |
| *store_name = CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY; | |
| - | else if(_tcsncmp(path, TEXT("LocalMachineEnterprise"), store_name_len) == 0) |
| + | else if(_tcsncmp(path, _TEXT("LocalMachineEnterprise"), store_name_len) == 0) |
| *store_name = CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE; | |
| else | |
| return CURLE_SSL_CERTPROBLEM; | |
| store_path_start = sep + 1; | |
| - | sep = _tcschr(store_path_start, TEXT('\\')); |
| + | sep = _tcschr(store_path_start, _TEXT('\\')); |
| if(!sep) | |
| return CURLE_SSL_CERTPROBLEM; | |
| @@ -351,9 +352,9 @@ static CURLcode get_cert_location(TCHAR *path, DWORD *store_name, | |
| if(_tcslen(*thumbprint) != CERT_THUMBPRINT_STR_LEN) | |
| return CURLE_SSL_CERTPROBLEM; | |
| - | *sep = TEXT('\0'); |
| + | *sep = _TEXT('\0'); |
| *store_path = curlx_tcsdup(store_path_start); | |
| - | *sep = TEXT('\\'); |
| + | *sep = _TEXT('\\'); |
| if(!*store_path) | |
| return CURLE_OUT_OF_MEMORY; | |
src/tool_main.c+1 -1
| @@ -150,7 +150,7 @@ int main(int argc, char *argv[]) | |
| #ifdef _WIN32 | |
| /* Undocumented diagnostic option to list the full paths of all loaded | |
| modules. This is purposely pre-init. */ | |
| - | if(argc == 2 && !_tcscmp(argv[1], _T("--dump-module-paths"))) { |
| + | if(argc == 2 && !_tcscmp(argv[1], _TEXT("--dump-module-paths"))) { |
| struct curl_slist *item, *head = GetLoadedModulePaths(); | |
| for(item = head; item; item = item->next) | |
| curl_mprintf("%s\n", item->data); | |