diff options
Diffstat (limited to 'ext/spl/spl_directory.c')
| -rw-r--r-- | ext/spl/spl_directory.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index b159601ad6..34baf63334 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -359,7 +359,7 @@ static zend_object *spl_filesystem_object_clone(zval *zobject) intern->u.dir.index = index; break; case SPL_FS_FILE: - php_error_docref(NULL, E_ERROR, "An object of class %s cannot be cloned", old_object->ce->name->val); + php_error_docref(NULL, E_ERROR, "An object of class %s cannot be cloned", ZSTR_VAL(old_object->ce->name)); break; } @@ -937,11 +937,11 @@ SPL_METHOD(SplFileInfo, getExtension) ret = php_basename(fname, flen, NULL, 0); - p = zend_memrchr(ret->val, '.', ret->len); + p = zend_memrchr(ZSTR_VAL(ret), '.', ZSTR_LEN(ret)); if (p) { - assert(p > ret->val); - idx = (int)(p - ret->val); - RETVAL_STRINGL(ret->val + idx + 1, ret->len - idx - 1); + assert(p > ZSTR_VAL(ret)); + idx = (int)(p - ZSTR_VAL(ret)); + RETVAL_STRINGL(ZSTR_VAL(ret) + idx + 1, ZSTR_LEN(ret) - idx - 1); zend_string_release(ret); return; } else { @@ -966,10 +966,10 @@ SPL_METHOD(DirectoryIterator, getExtension) fname = php_basename(intern->u.dir.entry.d_name, strlen(intern->u.dir.entry.d_name), NULL, 0); - p = zend_memrchr(fname->val, '.', fname->len); + p = zend_memrchr(ZSTR_VAL(fname), '.', ZSTR_LEN(fname)); if (p) { - idx = (int)(p - fname->val); - RETVAL_STRINGL(fname->val + idx + 1, fname->len - idx - 1); + idx = (int)(p - ZSTR_VAL(fname)); + RETVAL_STRINGL(ZSTR_VAL(fname) + idx + 1, ZSTR_LEN(fname) - idx - 1); zend_string_release(fname); } else { zend_string_release(fname); |