mirror of
https://github.com/php/php-src.git
synced 2025-08-15 13:38:49 +02:00
Fix Clang style nits (GH-17685)
This addresses all `-Wlogical-op-parentheses` and `-Wmissing-braces` warnings across the whole code base (all Windows specific code).
This commit is contained in:
parent
dc7161cffe
commit
107bd080a5
10 changed files with 12 additions and 13 deletions
|
@ -83,7 +83,7 @@ void zend_startup_hrtime(void);
|
||||||
static zend_always_inline zend_hrtime_t zend_hrtime(void)
|
static zend_always_inline zend_hrtime_t zend_hrtime(void)
|
||||||
{
|
{
|
||||||
#if ZEND_HRTIME_PLATFORM_WINDOWS
|
#if ZEND_HRTIME_PLATFORM_WINDOWS
|
||||||
LARGE_INTEGER lt = {0};
|
LARGE_INTEGER lt = {{0}};
|
||||||
QueryPerformanceCounter(<);
|
QueryPerformanceCounter(<);
|
||||||
return (zend_hrtime_t)((zend_hrtime_t)lt.QuadPart * zend_hrtime_timer_scale);
|
return (zend_hrtime_t)((zend_hrtime_t)lt.QuadPart * zend_hrtime_timer_scale);
|
||||||
#elif ZEND_HRTIME_PLATFORM_APPLE_GETTIME_NSEC
|
#elif ZEND_HRTIME_PLATFORM_APPLE_GETTIME_NSEC
|
||||||
|
|
|
@ -75,7 +75,7 @@
|
||||||
# define LOCK_UN 2
|
# define LOCK_UN 2
|
||||||
static int zend_file_cache_flock(int fd, int op)
|
static int zend_file_cache_flock(int fd, int op)
|
||||||
{
|
{
|
||||||
OVERLAPPED offset = {0,0,0,0,NULL};
|
OVERLAPPED offset = {0, 0, {{0}}, NULL};
|
||||||
if (op == LOCK_EX) {
|
if (op == LOCK_EX) {
|
||||||
if (LockFileEx((HANDLE)_get_osfhandle(fd),
|
if (LockFileEx((HANDLE)_get_osfhandle(fd),
|
||||||
LOCKFILE_EXCLUSIVE_LOCK, 0, 1, 0, &offset) == TRUE) {
|
LOCKFILE_EXCLUSIVE_LOCK, 0, 1, 0, &offset) == TRUE) {
|
||||||
|
|
|
@ -758,7 +758,7 @@ static int php_openssl_win_cert_verify_callback(X509_STORE_CTX *x509_store_ctx,
|
||||||
}
|
}
|
||||||
|
|
||||||
{ /* Then verify it against a policy */
|
{ /* Then verify it against a policy */
|
||||||
SSL_EXTRA_CERT_CHAIN_POLICY_PARA ssl_policy_params = {sizeof(SSL_EXTRA_CERT_CHAIN_POLICY_PARA)};
|
SSL_EXTRA_CERT_CHAIN_POLICY_PARA ssl_policy_params = {{sizeof(SSL_EXTRA_CERT_CHAIN_POLICY_PARA)}};
|
||||||
CERT_CHAIN_POLICY_PARA chain_policy_params = {sizeof(CERT_CHAIN_POLICY_PARA)};
|
CERT_CHAIN_POLICY_PARA chain_policy_params = {sizeof(CERT_CHAIN_POLICY_PARA)};
|
||||||
CERT_CHAIN_POLICY_STATUS chain_policy_status = {sizeof(CERT_CHAIN_POLICY_STATUS)};
|
CERT_CHAIN_POLICY_STATUS chain_policy_status = {sizeof(CERT_CHAIN_POLICY_STATUS)};
|
||||||
BOOL verify_result;
|
BOOL verify_result;
|
||||||
|
|
|
@ -807,7 +807,7 @@ PHP_FUNCTION(putenv)
|
||||||
valw = php_win32_cp_any_to_w(value);
|
valw = php_win32_cp_any_to_w(value);
|
||||||
}
|
}
|
||||||
/* valw may be NULL, but the failed conversion still needs to be checked. */
|
/* valw may be NULL, but the failed conversion still needs to be checked. */
|
||||||
if (!keyw || !valw && value) {
|
if (!keyw || (!valw && value)) {
|
||||||
tsrm_env_unlock();
|
tsrm_env_unlock();
|
||||||
free(pe.putenv_string);
|
free(pe.putenv_string);
|
||||||
zend_string_release(pe.key);
|
zend_string_release(pe.key);
|
||||||
|
|
|
@ -104,8 +104,7 @@ PHPAPI int php_flock(int fd, int operation)
|
||||||
{
|
{
|
||||||
HANDLE hdl = (HANDLE) _get_osfhandle(fd);
|
HANDLE hdl = (HANDLE) _get_osfhandle(fd);
|
||||||
DWORD low = 0xFFFFFFFF, high = 0xFFFFFFFF;
|
DWORD low = 0xFFFFFFFF, high = 0xFFFFFFFF;
|
||||||
OVERLAPPED offset =
|
OVERLAPPED offset = {0, 0, {{0}}, NULL};
|
||||||
{0, 0, 0, 0, NULL};
|
|
||||||
DWORD err;
|
DWORD err;
|
||||||
|
|
||||||
if (INVALID_HANDLE_VALUE == hdl) {
|
if (INVALID_HANDLE_VALUE == hdl) {
|
||||||
|
|
|
@ -531,7 +531,7 @@ PHPAPI zend_string *php_resolve_path(const char *filename, size_t filename_lengt
|
||||||
IS_ABSOLUTE_PATH doesn't care about this path form till now. It
|
IS_ABSOLUTE_PATH doesn't care about this path form till now. It
|
||||||
might be a big thing to extend, thus just a local handling for
|
might be a big thing to extend, thus just a local handling for
|
||||||
now. */
|
now. */
|
||||||
filename_length >=2 && IS_SLASH(filename[0]) && !IS_SLASH(filename[1]) ||
|
(filename_length >=2 && IS_SLASH(filename[0]) && !IS_SLASH(filename[1])) ||
|
||||||
#endif
|
#endif
|
||||||
!path ||
|
!path ||
|
||||||
!*path) {
|
!*path) {
|
||||||
|
|
|
@ -840,9 +840,9 @@ static int do_cli(int argc, char **argv) /* {{{ */
|
||||||
is essential to mitigate buggy console info. */
|
is essential to mitigate buggy console info. */
|
||||||
interactive = php_win32_console_is_own() &&
|
interactive = php_win32_console_is_own() &&
|
||||||
!(script_file ||
|
!(script_file ||
|
||||||
argc > php_optind && context.mode != PHP_CLI_MODE_CLI_DIRECT &&
|
(argc > php_optind && context.mode != PHP_CLI_MODE_CLI_DIRECT &&
|
||||||
context.mode != PHP_CLI_MODE_PROCESS_STDIN &&
|
context.mode != PHP_CLI_MODE_PROCESS_STDIN &&
|
||||||
strcmp(argv[php_optind-1],"--")
|
strcmp(argv[php_optind-1],"--"))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -137,8 +137,8 @@ PHPAPI int fnmatch(const char *pattern, const char *string, int flags)
|
||||||
tolower((unsigned char)*string)))
|
tolower((unsigned char)*string)))
|
||||||
;
|
;
|
||||||
else if ((flags & FNM_PREFIX_DIRS) && *string == EOS &&
|
else if ((flags & FNM_PREFIX_DIRS) && *string == EOS &&
|
||||||
(c == '/' && string != stringstart ||
|
((c == '/' && string != stringstart) ||
|
||||||
string == stringstart+1 && *stringstart == '/') )
|
(string == stringstart+1 && *stringstart == '/')))
|
||||||
return (0);
|
return (0);
|
||||||
else
|
else
|
||||||
return (FNM_NOMATCH);
|
return (FNM_NOMATCH);
|
||||||
|
|
|
@ -59,7 +59,7 @@ DIR *opendir(const char *dir)
|
||||||
wcscpy(filespecw, resolvedw);
|
wcscpy(filespecw, resolvedw);
|
||||||
index = resolvedw_len - 1;
|
index = resolvedw_len - 1;
|
||||||
}
|
}
|
||||||
if (index >= 0 && filespecw[index] == L'/' || index == 0 && filespecw[index] == L'\\')
|
if ((index >= 0 && filespecw[index] == L'/') || (index == 0 && filespecw[index] == L'\\'))
|
||||||
filespecw[index] = L'\0';
|
filespecw[index] = L'\0';
|
||||||
wcscat(filespecw, L"\\*");
|
wcscat(filespecw, L"\\*");
|
||||||
|
|
||||||
|
|
|
@ -459,7 +459,7 @@ static zend_always_inline BOOL is_compatible(HMODULE handle, BOOL is_smaller, ch
|
||||||
This check is to be extended as new VS versions come out. */
|
This check is to be extended as new VS versions come out. */
|
||||||
DWORD core_minor = (DWORD)(PHP_LINKER_MINOR/10);
|
DWORD core_minor = (DWORD)(PHP_LINKER_MINOR/10);
|
||||||
DWORD comp_minor = (DWORD)(minor/10);
|
DWORD comp_minor = (DWORD)(minor/10);
|
||||||
if (14 == major && (is_smaller ? core_minor < comp_minor : core_minor > comp_minor) || PHP_LINKER_MAJOR != major)
|
if ((14 == major && (is_smaller ? core_minor < comp_minor : core_minor > comp_minor)) || PHP_LINKER_MAJOR != major)
|
||||||
#else
|
#else
|
||||||
if (PHP_LINKER_MAJOR != major)
|
if (PHP_LINKER_MAJOR != major)
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue