Skip to content

Use zend_string_equals() API instead of strcmp() #6784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Use zend_string_equals() API instead of strcmp() #6784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
48eb42c
Use zend_string_equals() API instead of strcmp() in main.c
Girgias Mar 17, 2021
f5e626a
Use zend_string_equals() API instead of strcmp() in SOAP extension
Girgias Mar 17, 2021
adcf1af
Use zend_string_equals() API instead of strcmp() in PGSQL extension
Girgias Mar 17, 2021
f9bdf55
Use zend_string_equals() API instead of strcmp() in Filter extension
Girgias Mar 17, 2021
f81c4c5
Use zend_string_equals() API instead of strcmp() in Date extension
Girgias Mar 17, 2021
99dc40f
Use zend_string_equals() API instead of strcmp() in COM extension
Girgias Mar 17, 2021
2c90eec
Use zend_string_equals() API instead of strcmp() in various places
Girgias Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Zend/zend_compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7902,7 +7902,7 @@ static bool zend_try_ct_eval_magic_const(zval *zv, zend_ast *ast) /* {{{ */
ZSTR_LEN(dirname) = zend_dirname(ZSTR_VAL(dirname), ZSTR_LEN(dirname));
#endif

if (strcmp(ZSTR_VAL(dirname), ".") == 0) {
if (zend_string_equals_literal(dirname, ".")) {
dirname = zend_string_extend(dirname, MAXPATHLEN, 0);
#if HAVE_GETCWD
ZEND_IGNORE_VALUE(VCWD_GETCWD(ZSTR_VAL(dirname), MAXPATHLEN));
Expand Down
6 changes: 3 additions & 3 deletions ext/com_dotnet/php_com_dotnet_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ typedef struct _php_com_dotnet_object {
static inline int php_com_is_valid_object(zval *zv)
{
zend_class_entry *ce = Z_OBJCE_P(zv);
return strcmp("com", ce->name->val) == 0 ||
strcmp("dotnet", ce->name->val) == 0 ||
strcmp("variant", ce->name->val) == 0;
return zend_string_equals_literal(ce->name, "com") ||
zend_string_equals_literal(ce->name, "dotnet") ||
zend_string_equals_literal(ce->name, "variant");
}

#define CDNO_FETCH(zv) (php_com_dotnet_object*)Z_OBJ_P(zv)
Expand Down
27 changes: 14 additions & 13 deletions ext/date/php_date.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3733,7 +3733,7 @@ static zval *date_interval_read_property(zend_object *object, zend_string *name,
}

#define GET_VALUE_FROM_STRUCT(n,m) \
if (strcmp(ZSTR_VAL(name), m) == 0) { \
if (zend_string_equals_literal(name, m)) { \
value = obj->diff->n; \
break; \
}
Expand All @@ -3744,7 +3744,7 @@ static zval *date_interval_read_property(zend_object *object, zend_string *name,
GET_VALUE_FROM_STRUCT(h, "h");
GET_VALUE_FROM_STRUCT(i, "i");
GET_VALUE_FROM_STRUCT(s, "s");
if (strcmp(ZSTR_VAL(name), "f") == 0) {
if (zend_string_equals_literal(name, "f")) {
fvalue = obj->diff->us / 1000000.0;
break;
}
Expand Down Expand Up @@ -3782,7 +3782,7 @@ static zval *date_interval_write_property(zend_object *object, zend_string *name
}

#define SET_VALUE_FROM_STRUCT(n,m) \
if (strcmp(ZSTR_VAL(name), m) == 0) { \
if (zend_string_equals_literal(name, m)) { \
obj->diff->n = zval_get_long(value); \
break; \
}
Expand All @@ -3794,7 +3794,7 @@ static zval *date_interval_write_property(zend_object *object, zend_string *name
SET_VALUE_FROM_STRUCT(h, "h");
SET_VALUE_FROM_STRUCT(i, "i");
SET_VALUE_FROM_STRUCT(s, "s");
if (strcmp(ZSTR_VAL(name), "f") == 0) {
if (zend_string_equals_literal(name, "f")) {
obj->diff->us = zval_get_double(value) * 1000000;
break;
}
Expand All @@ -3812,15 +3812,16 @@ static zval *date_interval_get_property_ptr_ptr(zend_object *object, zend_string
{
zval *ret;

if(zend_binary_strcmp("y", sizeof("y") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0 ||
zend_binary_strcmp("m", sizeof("m") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0 ||
zend_binary_strcmp("d", sizeof("d") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0 ||
zend_binary_strcmp("h", sizeof("h") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0 ||
zend_binary_strcmp("i", sizeof("i") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0 ||
zend_binary_strcmp("s", sizeof("s") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0 ||
zend_binary_strcmp("f", sizeof("f") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0 ||
zend_binary_strcmp("days", sizeof("days") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0 ||
zend_binary_strcmp("invert", sizeof("invert") - 1, ZSTR_VAL(name), ZSTR_LEN(name)) == 0) {
if (
zend_string_equals_literal(name, "y") ||
zend_string_equals_literal(name, "m") ||
zend_string_equals_literal(name, "d") ||
zend_string_equals_literal(name, "h") ||
zend_string_equals_literal(name, "i") ||
zend_string_equals_literal(name, "s") ||
zend_string_equals_literal(name, "f") ||
zend_string_equals_literal(name, "days") ||
zend_string_equals_literal(name, "invert") ) {
/* Fallback to read_property. */
ret = NULL;
} else {
Expand Down
6 changes: 3 additions & 3 deletions ext/filter/logical_filters.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
if (
url->scheme == NULL ||
/* some schemas allow the host to be empty */
(url->host == NULL && (strcmp(ZSTR_VAL(url->scheme), "mailto") && strcmp(ZSTR_VAL(url->scheme), "news") && strcmp(ZSTR_VAL(url->scheme), "file"))) ||
(url->host == NULL && (!zend_string_equals_literal(url->scheme, "mailto") && !zend_string_equals_literal(url->scheme, "news") && !zend_string_equals_literal(url->scheme, "file"))) ||
((flags & FILTER_FLAG_PATH_REQUIRED) && url->path == NULL) || ((flags & FILTER_FLAG_QUERY_REQUIRED) && url->query == NULL)
) {
bad_url:
Expand Down Expand Up @@ -902,12 +902,12 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
case 1: case 0:
break;
case 2:
if (!strcmp("::", Z_STRVAL_P(value))) {
if (zend_string_equals_literal(Z_STR_P(value), "::")) {
RETURN_VALIDATION_FAILED
}
break;
case 3:
if (!strcmp("::1", Z_STRVAL_P(value)) || !strcmp("5f:", Z_STRVAL_P(value))) {
if (zend_string_equals_literal(Z_STR_P(value), "::1") || zend_string_equals_literal(Z_STR_P(value), "5f:")) {
RETURN_VALIDATION_FAILED
}
break;
Expand Down
2 changes: 1 addition & 1 deletion ext/gd/gd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3182,7 +3182,7 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode)
if (key == NULL) {
continue;
}
if (strcmp("linespacing", ZSTR_VAL(key)) == 0) {
if (zend_string_equals_literal(key, "linespacing")) {
strex.flags |= gdFTEX_LINESPACE;
strex.linespacing = zval_get_double(item);
}
Expand Down
100 changes: 50 additions & 50 deletions ext/pgsql/pgsql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4385,88 +4385,87 @@ PHP_FUNCTION(pg_meta_data)
/* }}} */

/* {{{ php_pgsql_get_data_type */
static php_pgsql_data_type php_pgsql_get_data_type(const char *type_name, size_t len)
static php_pgsql_data_type php_pgsql_get_data_type(const zend_string *type_name)
{
/* This is stupid way to do. I'll fix it when I decied how to support
/* This is stupid way to do. I'll fix it when I decide how to support
user defined types. (Yasuo) */

/* boolean */
if (!strcmp(type_name, "bool")|| !strcmp(type_name, "boolean"))
if (zend_string_equals_literal(type_name, "bool")|| zend_string_equals_literal(type_name, "boolean"))
return PG_BOOL;
/* object id */
if (!strcmp(type_name, "oid"))
if (zend_string_equals_literal(type_name, "oid"))
return PG_OID;
/* integer */
if (!strcmp(type_name, "int2") || !strcmp(type_name, "smallint"))
if (zend_string_equals_literal(type_name, "int2") || zend_string_equals_literal(type_name, "smallint"))
return PG_INT2;
if (!strcmp(type_name, "int4") || !strcmp(type_name, "integer"))
if (zend_string_equals_literal(type_name, "int4") || zend_string_equals_literal(type_name, "integer"))
return PG_INT4;
if (!strcmp(type_name, "int8") || !strcmp(type_name, "bigint"))
if (zend_string_equals_literal(type_name, "int8") || zend_string_equals_literal(type_name, "bigint"))
return PG_INT8;
/* real and other */
if (!strcmp(type_name, "float4") || !strcmp(type_name, "real"))
if (zend_string_equals_literal(type_name, "float4") || zend_string_equals_literal(type_name, "real"))
return PG_FLOAT4;
if (!strcmp(type_name, "float8") || !strcmp(type_name, "double precision"))
if (zend_string_equals_literal(type_name, "float8") || zend_string_equals_literal(type_name, "double precision"))
return PG_FLOAT8;
if (!strcmp(type_name, "numeric"))
if (zend_string_equals_literal(type_name, "numeric"))
return PG_NUMERIC;
if (!strcmp(type_name, "money"))
if (zend_string_equals_literal(type_name, "money"))
return PG_MONEY;
/* character */
if (!strcmp(type_name, "text"))
if (zend_string_equals_literal(type_name, "text"))
return PG_TEXT;
if (!strcmp(type_name, "bpchar") || !strcmp(type_name, "character"))
if (zend_string_equals_literal(type_name, "bpchar") || zend_string_equals_literal(type_name, "character"))
return PG_CHAR;
if (!strcmp(type_name, "varchar") || !strcmp(type_name, "character varying"))
if (zend_string_equals_literal(type_name, "varchar") || zend_string_equals_literal(type_name, "character varying"))
return PG_VARCHAR;
/* time and interval */
if (!strcmp(type_name, "abstime"))
if (zend_string_equals_literal(type_name, "abstime"))
return PG_UNIX_TIME;
if (!strcmp(type_name, "reltime"))
if (zend_string_equals_literal(type_name, "reltime"))
return PG_UNIX_TIME_INTERVAL;
if (!strcmp(type_name, "tinterval"))
if (zend_string_equals_literal(type_name, "tinterval"))
return PG_UNIX_TIME_INTERVAL;
if (!strcmp(type_name, "date"))
if (zend_string_equals_literal(type_name, "date"))
return PG_DATE;
if (!strcmp(type_name, "time"))
if (zend_string_equals_literal(type_name, "time"))
return PG_TIME;
if (!strcmp(type_name, "time with time zone") || !strcmp(type_name, "timetz"))
if (zend_string_equals_literal(type_name, "time with time zone") || zend_string_equals_literal(type_name, "timetz"))
return PG_TIME_WITH_TIMEZONE;
if (!strcmp(type_name, "timestamp without time zone") || !strcmp(type_name, "timestamp"))
if (zend_string_equals_literal(type_name, "timestamp without time zone") || zend_string_equals_literal(type_name, "timestamp"))
return PG_TIMESTAMP;
if (!strcmp(type_name, "timestamp with time zone") || !strcmp(type_name, "timestamptz"))
if (zend_string_equals_literal(type_name, "timestamp with time zone") || zend_string_equals_literal(type_name, "timestamptz"))
return PG_TIMESTAMP_WITH_TIMEZONE;
if (!strcmp(type_name, "interval"))
if (zend_string_equals_literal(type_name, "interval"))
return PG_INTERVAL;
/* binary */
if (!strcmp(type_name, "bytea"))
if (zend_string_equals_literal(type_name, "bytea"))
return PG_BYTEA;
/* network */
if (!strcmp(type_name, "cidr"))
if (zend_string_equals_literal(type_name, "cidr"))
return PG_CIDR;
if (!strcmp(type_name, "inet"))
if (zend_string_equals_literal(type_name, "inet"))
return PG_INET;
if (!strcmp(type_name, "macaddr"))
if (zend_string_equals_literal(type_name, "macaddr"))
return PG_MACADDR;
/* bit */
if (!strcmp(type_name, "bit"))
if (zend_string_equals_literal(type_name, "bit"))
return PG_BIT;
if (!strcmp(type_name, "bit varying"))
if (zend_string_equals_literal(type_name, "bit varying"))
return PG_VARBIT;
/* geometric */
if (!strcmp(type_name, "line"))
if (zend_string_equals_literal(type_name, "line"))
return PG_LINE;
if (!strcmp(type_name, "lseg"))
if (zend_string_equals_literal(type_name, "lseg"))
return PG_LSEG;
if (!strcmp(type_name, "box"))
if (zend_string_equals_literal(type_name, "box"))
return PG_BOX;
if (!strcmp(type_name, "path"))
if (zend_string_equals_literal(type_name, "path"))
return PG_PATH;
if (!strcmp(type_name, "point"))
if (zend_string_equals_literal(type_name, "point"))
return PG_POINT;
if (!strcmp(type_name, "polygon"))
if (zend_string_equals_literal(type_name, "polygon"))
return PG_POLYGON;
if (!strcmp(type_name, "circle"))
if (zend_string_equals_literal(type_name, "circle"))
return PG_CIRCLE;

return PG_UNKNOWN;
Expand Down Expand Up @@ -4554,7 +4553,7 @@ static int php_pgsql_add_quotes(zval *src, bool should_free)

/* Raise E_NOTICE to E_WARNING or Error? */
#define PGSQL_CONV_CHECK_IGNORE() \
if (!err && Z_TYPE(new_val) == IS_STRING && !strcmp(Z_STRVAL(new_val), "NULL")) { \
if (!err && Z_TYPE(new_val) == IS_STRING && zend_string_equals_literal(Z_STR(new_val), "NULL")) { \
/* if new_value is string "NULL" and field has default value, remove element to use default value */ \
if (!(opt & PGSQL_CONV_IGNORE_DEFAULT) && Z_TYPE_P(has_default) == IS_TRUE) { \
zval_ptr_dtor(&new_val); \
Expand Down Expand Up @@ -4636,7 +4635,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
/* enums need to be treated like strings */
data_type = PG_TEXT;
} else {
data_type = php_pgsql_get_data_type(Z_STRVAL_P(type), Z_STRLEN_P(type));
data_type = php_pgsql_get_data_type(Z_STR_P(type));
}

/* TODO: Should E_NOTICE be converted to type error if PHP type cannot be converted to field type? */
Expand All @@ -4649,18 +4648,18 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
ZVAL_STRING(&new_val, "NULL");
}
else {
if (!strcmp(Z_STRVAL_P(val), "t") || !strcmp(Z_STRVAL_P(val), "T") ||
!strcmp(Z_STRVAL_P(val), "y") || !strcmp(Z_STRVAL_P(val), "Y") ||
!strcmp(Z_STRVAL_P(val), "true") || !strcmp(Z_STRVAL_P(val), "True") ||
!strcmp(Z_STRVAL_P(val), "yes") || !strcmp(Z_STRVAL_P(val), "Yes") ||
!strcmp(Z_STRVAL_P(val), "1")) {
if (zend_string_equals_literal(Z_STR_P(val), "t") || zend_string_equals_literal(Z_STR_P(val), "T") ||
zend_string_equals_literal(Z_STR_P(val), "y") || zend_string_equals_literal(Z_STR_P(val), "Y") ||
zend_string_equals_literal(Z_STR_P(val), "true") || zend_string_equals_literal(Z_STR_P(val), "True") ||
zend_string_equals_literal(Z_STR_P(val), "yes") || zend_string_equals_literal(Z_STR_P(val), "Yes") ||
zend_string_equals_literal(Z_STR_P(val), "1")) {
ZVAL_STRINGL(&new_val, "'t'", sizeof("'t'")-1);
}
else if (!strcmp(Z_STRVAL_P(val), "f") || !strcmp(Z_STRVAL_P(val), "F") ||
!strcmp(Z_STRVAL_P(val), "n") || !strcmp(Z_STRVAL_P(val), "N") ||
!strcmp(Z_STRVAL_P(val), "false") || !strcmp(Z_STRVAL_P(val), "False") ||
!strcmp(Z_STRVAL_P(val), "no") || !strcmp(Z_STRVAL_P(val), "No") ||
!strcmp(Z_STRVAL_P(val), "0")) {
else if (zend_string_equals_literal(Z_STR_P(val), "f") || zend_string_equals_literal(Z_STR_P(val), "F") ||
zend_string_equals_literal(Z_STR_P(val), "n") || zend_string_equals_literal(Z_STR_P(val), "N") ||
zend_string_equals_literal(Z_STR_P(val), "false") || zend_string_equals_literal(Z_STR_P(val), "False") ||
zend_string_equals_literal(Z_STR_P(val), "no") || zend_string_equals_literal(Z_STR_P(val), "No") ||
zend_string_equals_literal(Z_STR_P(val), "0")) {
ZVAL_STRINGL(&new_val, "'f'", sizeof("'f'")-1);
}
else {
Expand Down Expand Up @@ -5540,7 +5539,8 @@ static inline int build_assignment_string(PGconn *pg_link, smart_str *querystr,
} else {
smart_str_appendl(querystr, ZSTR_VAL(fld), ZSTR_LEN(fld));
}
if (where_cond && (Z_TYPE_P(val) == IS_TRUE || Z_TYPE_P(val) == IS_FALSE || (Z_TYPE_P(val) == IS_STRING && !strcmp(Z_STRVAL_P(val), "NULL")))) {
if (where_cond && (Z_TYPE_P(val) == IS_TRUE || Z_TYPE_P(val) == IS_FALSE ||
(Z_TYPE_P(val) == IS_STRING && zend_string_equals_literal(Z_STR_P(val), "NULL")))) {
smart_str_appends(querystr, " IS ");
} else {
smart_str_appendc(querystr, '=');
Expand Down
2 changes: 1 addition & 1 deletion ext/soap/php_http.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ int make_http_soap_request(zval *this_ptr,
(((use_ssl && orig->scheme != NULL && zend_string_equals_literal(orig->scheme, "https")) ||
(!use_ssl && orig->scheme == NULL) ||
(!use_ssl && !zend_string_equals_literal(orig->scheme, "https"))) &&
strcmp(ZSTR_VAL(orig->host), ZSTR_VAL(phpurl->host)) == 0 &&
zend_string_equals(orig->host, phpurl->host) &&
orig->port == phpurl->port))) {
} else {
php_stream_close(stream);
Expand Down
6 changes: 3 additions & 3 deletions ext/soap/soap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,9 +1275,9 @@ PHP_METHOD(SoapServer, handle)
(encoding = zend_hash_str_find(Z_ARRVAL_P(server_vars), "HTTP_CONTENT_ENCODING", sizeof("HTTP_CONTENT_ENCODING")-1)) != NULL &&
Z_TYPE_P(encoding) == IS_STRING) {

if (strcmp(Z_STRVAL_P(encoding),"gzip") == 0
|| strcmp(Z_STRVAL_P(encoding),"x-gzip") == 0
|| strcmp(Z_STRVAL_P(encoding),"deflate") == 0
if (zend_string_equals_literal(Z_STR_P(encoding), "gzip")
|| zend_string_equals_literal(Z_STR_P(encoding), "x-gzip")
|| zend_string_equals_literal(Z_STR_P(encoding), "deflate")
) {
zval filter_params;

Expand Down
2 changes: 1 addition & 1 deletion ext/standard/string.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4634,7 +4634,7 @@ PHP_FUNCTION(strip_tags)
static zend_string *try_setlocale_str(zend_long cat, zend_string *loc) {
const char *retval;

if (!strcmp("0", ZSTR_VAL(loc))) {
if (zend_string_equals_literal(loc, "0")) {
loc = NULL;
} else {
if (ZSTR_LEN(loc) >= 255) {
Expand Down
2 changes: 1 addition & 1 deletion ext/xml/xml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len)

ZEND_HASH_REVERSE_FOREACH_VAL(Z_ARRVAL(parser->data), curtag) {
if ((mytype = zend_hash_str_find(Z_ARRVAL_P(curtag),"type", sizeof("type") - 1))) {
if (!strcmp(Z_STRVAL_P(mytype), "cdata")) {
if (zend_string_equals_literal(Z_STR_P(mytype), "cdata")) {
if ((myval = zend_hash_str_find(Z_ARRVAL_P(curtag), "value", sizeof("value") - 1))) {
int newlen = Z_STRLEN_P(myval) + ZSTR_LEN(decoded_value);
Z_STR_P(myval) = zend_string_extend(Z_STR_P(myval), newlen, 0);
Expand Down
Loading