diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 04:05:24 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 04:05:24 +0300 |
| commit | 4a2e40bb861bc3cf5fb6863e57486ed60316e97c (patch) | |
| tree | 6579660b282fdd1bc50095e48d702913a0b6aa97 /ext/standard/user_filters.c | |
| parent | 8cce5b2641fb91c3073018b59f6f044b843041a8 (diff) | |
| download | php-git-4a2e40bb861bc3cf5fb6863e57486ed60316e97c.tar.gz | |
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
Diffstat (limited to 'ext/standard/user_filters.c')
| -rw-r--r-- | ext/standard/user_filters.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c index 3e66449db5..fc2141f73b 100644 --- a/ext/standard/user_filters.c +++ b/ext/standard/user_filters.c @@ -318,7 +318,7 @@ static php_stream_filter *user_filter_factory_create(const char *filtername, if (NULL == (fdat->ce = zend_lookup_class(fdat->classname))) { php_error_docref(NULL, E_WARNING, "user-filter \"%s\" requires class \"%s\", but that class is not defined", - filtername, fdat->classname->val); + filtername, ZSTR_VAL(fdat->classname)); return NULL; } } @@ -567,12 +567,12 @@ PHP_FUNCTION(stream_filter_register) RETVAL_FALSE; - if (!filtername->len) { + if (!ZSTR_LEN(filtername)) { php_error_docref(NULL, E_WARNING, "Filter name cannot be empty"); return; } - if (!classname->len) { + if (!ZSTR_LEN(classname)) { php_error_docref(NULL, E_WARNING, "Class name cannot be empty"); return; } @@ -586,7 +586,7 @@ PHP_FUNCTION(stream_filter_register) fdat->classname = zend_string_copy(classname); if (zend_hash_add_ptr(BG(user_filter_map), filtername, fdat) != NULL && - php_stream_filter_register_factory_volatile(filtername->val, &user_filter_factory) == SUCCESS) { + php_stream_filter_register_factory_volatile(ZSTR_VAL(filtername), &user_filter_factory) == SUCCESS) { RETVAL_TRUE; } else { zend_string_release(classname); |