diff options
Diffstat (limited to 'ext/spl/spl_directory.h')
| -rw-r--r-- | ext/spl/spl_directory.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ext/spl/spl_directory.h b/ext/spl/spl_directory.h index dca463d6f0..2f7a323ea6 100644 --- a/ext/spl/spl_directory.h +++ b/ext/spl/spl_directory.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -101,7 +101,6 @@ struct _spl_filesystem_object { char escape; } file; } u; - spl_filesystem_iterator *it; zend_object std; }; @@ -114,10 +113,12 @@ static inline spl_filesystem_object *spl_filesystem_from_obj(zend_object *obj) / static inline spl_filesystem_iterator* spl_filesystem_object_to_iterator(spl_filesystem_object *obj) { - obj->it = ecalloc(1, sizeof(spl_filesystem_iterator)); - obj->it->object = (void *)obj; - zend_iterator_init(&obj->it->intern); - return obj->it; + spl_filesystem_iterator *it; + + it = ecalloc(1, sizeof(spl_filesystem_iterator)); + it->object = (void *)obj; + zend_iterator_init(&it->intern); + return it; } static inline spl_filesystem_object* spl_filesystem_iterator_to_object(spl_filesystem_iterator *it) |