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/spl/spl_array.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/spl/spl_array.c')
| -rw-r--r-- | ext/spl/spl_array.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index 58147f3d39..ce8a37bf36 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -290,13 +290,13 @@ fetch_dim_string: if (Z_TYPE_P(retval) == IS_UNDEF) { switch (type) { case BP_VAR_R: - zend_error(E_NOTICE, "Undefined index: %s", offset_key->val); + zend_error(E_NOTICE, "Undefined index: %s", ZSTR_VAL(offset_key)); case BP_VAR_UNSET: case BP_VAR_IS: retval = &EG(uninitialized_zval); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined index: %s", offset_key->val); + zend_error(E_NOTICE,"Undefined index: %s", ZSTR_VAL(offset_key)); case BP_VAR_W: { ZVAL_NULL(retval); } @@ -306,13 +306,13 @@ fetch_dim_string: } else { switch (type) { case BP_VAR_R: - zend_error(E_NOTICE, "Undefined index: %s", offset_key->val); + zend_error(E_NOTICE, "Undefined index: %s", ZSTR_VAL(offset_key)); case BP_VAR_UNSET: case BP_VAR_IS: retval = &EG(uninitialized_zval); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined index: %s", offset_key->val); + zend_error(E_NOTICE,"Undefined index: %s", ZSTR_VAL(offset_key)); case BP_VAR_W: { zval value; ZVAL_NULL(&value); @@ -737,7 +737,7 @@ void spl_array_iterator_append(zval *object, zval *append_value) /* {{{ */ } if (spl_array_is_object(intern)) { - php_error_docref(NULL, E_RECOVERABLE_ERROR, "Cannot append properties to objects, use %s::offsetSet() instead", Z_OBJCE_P(object)->name->val); + php_error_docref(NULL, E_RECOVERABLE_ERROR, "Cannot append properties to objects, use %s::offsetSet() instead", ZSTR_VAL(Z_OBJCE_P(object)->name)); return; } @@ -936,7 +936,7 @@ static int spl_array_skip_protected(spl_array_object *intern, HashTable *aht) /* if (data && Z_TYPE_P(data) == IS_INDIRECT && Z_TYPE_P(data = Z_INDIRECT_P(data)) == IS_UNDEF) { /* skip */ - } else if (!string_key->len || string_key->val[0]) { + } else if (!ZSTR_LEN(string_key) || ZSTR_VAL(string_key)[0]) { return SUCCESS; } } else { |