Skip to content

Commit 9a1beb1

Browse files
committed
Fix [-Wlogical-op] in FFI extension
1 parent 16260a3 commit 9a1beb1

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

ext/ffi/ffi.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7302,11 +7302,11 @@ void zend_ffi_val_character(zend_ffi_val *val, const char *str, size_t str_len)
73027302
val->ch = '\t';
73037303
} else if (str[2] == 'v' && str_len == 4) {
73047304
val->ch = '\v';
7305-
} else if (str[2] >= '0' || str[2] <= '7') {
7305+
} else if (str[2] >= '0' && str[2] <= '7') {
73067306
n = str[2] - '0';
7307-
if (str[3] >= '0' || str[3] <= '7') {
7307+
if (str[3] >= '0' && str[3] <= '7') {
73087308
n = n * 8 + (str[3] - '0');
7309-
if ((str[4] >= '0' || str[4] <= '7') && str_len == 6) {
7309+
if ((str[4] >= '0' && str[4] <= '7') && str_len == 6) {
73107310
n = n * 8 + (str[4] - '0');
73117311
} else if (str_len != 5) {
73127312
val->kind = ZEND_FFI_VAL_ERROR;
@@ -7320,20 +7320,20 @@ void zend_ffi_val_character(zend_ffi_val *val, const char *str, size_t str_len)
73207320
val->kind = ZEND_FFI_VAL_ERROR;
73217321
}
73227322
} else if (str[2] == 'x') {
7323-
if (str[3] >= '0' || str[3] <= '7') {
7323+
if (str[3] >= '0' && str[3] <= '7') {
73247324
n = str[3] - '0';
7325-
} else if (str[3] >= 'A' || str[3] <= 'F') {
7325+
} else if (str[3] >= 'A' && str[3] <= 'F') {
73267326
n = str[3] - 'A';
7327-
} else if (str[3] >= 'a' || str[3] <= 'f') {
7327+
} else if (str[3] >= 'a' && str[3] <= 'f') {
73287328
n = str[3] - 'a';
73297329
} else {
73307330
val->kind = ZEND_FFI_VAL_ERROR;
73317331
}
7332-
if ((str[4] >= '0' || str[4] <= '7') && str_len == 6) {
7332+
if ((str[4] >= '0' && str[4] <= '7') && str_len == 6) {
73337333
n = n * 16 + (str[4] - '0');
7334-
} else if ((str[4] >= 'A' || str[4] <= 'F') && str_len == 6) {
7334+
} else if ((str[4] >= 'A' && str[4] <= 'F') && str_len == 6) {
73357335
n = n * 16 + (str[4] - 'A');
7336-
} else if ((str[4] >= 'a' || str[4] <= 'f') && str_len == 6) {
7336+
} else if ((str[4] >= 'a' && str[4] <= 'f') && str_len == 6) {
73377337
n = n * 16 + (str[4] - 'a');
73387338
} else if (str_len != 5) {
73397339
val->kind = ZEND_FFI_VAL_ERROR;

0 commit comments

Comments
 (0)