Skip to content

Commit e311d43

Browse files
committed
Use zend_string_equals() API instead of strcmp() in Date extension
1 parent 7746815 commit e311d43

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

ext/date/php_date.c

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3733,7 +3733,7 @@ static zval *date_interval_read_property(zend_object *object, zend_string *name,
37333733
}
37343734

37353735
#define GET_VALUE_FROM_STRUCT(n,m) \
3736-
if (strcmp(ZSTR_VAL(name), m) == 0) { \
3736+
if (zend_string_equals_literal(name, m)) { \
37373737
value = obj->diff->n; \
37383738
break; \
37393739
}
@@ -3744,7 +3744,7 @@ static zval *date_interval_read_property(zend_object *object, zend_string *name,
37443744
GET_VALUE_FROM_STRUCT(h, "h");
37453745
GET_VALUE_FROM_STRUCT(i, "i");
37463746
GET_VALUE_FROM_STRUCT(s, "s");
3747-
if (strcmp(ZSTR_VAL(name), "f") == 0) {
3747+
if (zend_string_equals_literal(name, "f")) {
37483748
fvalue = obj->diff->us / 1000000.0;
37493749
break;
37503750
}
@@ -3782,7 +3782,7 @@ static zval *date_interval_write_property(zend_object *object, zend_string *name
37823782
}
37833783

37843784
#define SET_VALUE_FROM_STRUCT(n,m) \
3785-
if (strcmp(ZSTR_VAL(name), m) == 0) { \
3785+
if (zend_string_equals_literal(name, m)) { \
37863786
obj->diff->n = zval_get_long(value); \
37873787
break; \
37883788
}
@@ -3794,7 +3794,7 @@ static zval *date_interval_write_property(zend_object *object, zend_string *name
37943794
SET_VALUE_FROM_STRUCT(h, "h");
37953795
SET_VALUE_FROM_STRUCT(i, "i");
37963796
SET_VALUE_FROM_STRUCT(s, "s");
3797-
if (strcmp(ZSTR_VAL(name), "f") == 0) {
3797+
if (zend_string_equals_literal(name, "f")) {
37983798
obj->diff->us = zval_get_double(value) * 1000000;
37993799
break;
38003800
}
@@ -3812,15 +3812,16 @@ static zval *date_interval_get_property_ptr_ptr(zend_object *object, zend_string
38123812
{
38133813
zval *ret;
38143814

3815-
if(zend_binary_strcmp("y", sizeof("y") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0 ||
3816-
zend_binary_strcmp("m", sizeof("m") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0 ||
3817-
zend_binary_strcmp("d", sizeof("d") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0 ||
3818-
zend_binary_strcmp("h", sizeof("h") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0 ||
3819-
zend_binary_strcmp("i", sizeof("i") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0 ||
3820-
zend_binary_strcmp("s", sizeof("s") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0 ||
3821-
zend_binary_strcmp("f", sizeof("f") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0 ||
3822-
zend_binary_strcmp("days", sizeof("days") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0 ||
3823-
zend_binary_strcmp("invert", sizeof("invert") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0) {
3815+
if (
3816+
zend_string_equals_literal(name, "y") ||
3817+
zend_string_equals_literal(name, "m") ||
3818+
zend_string_equals_literal(name, "d") ||
3819+
zend_string_equals_literal(name, "h") ||
3820+
zend_string_equals_literal(name, "i") ||
3821+
zend_string_equals_literal(name, "s") ||
3822+
zend_string_equals_literal(name, "f") ||
3823+
zend_string_equals_literal(name, "days") ||
3824+
zend_string_equals_literal(name, "invert") ) {
38243825
/* Fallback to read_property. */
38253826
ret = NULL;
38263827
} else {

0 commit comments

Comments
 (0)