diff options
author | Dmitry Stogov <dmitry@zend.com> | 2017-12-14 14:21:22 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2017-12-14 14:21:22 +0300 |
commit | 1db8402208055ac4fc00ef16dc1a7c2ec097849c (patch) | |
tree | 75c6765815ebfe54ba59bb5c2f323dce4650b7ba /ext/spl | |
parent | 175e461369efefc087f23fcba789c1c6cb1ee46a (diff) | |
download | php-git-1db8402208055ac4fc00ef16dc1a7c2ec097849c.tar.gz |
Move zend_object_iterator_funcs structures into read-only data segment
Diffstat (limited to 'ext/spl')
-rw-r--r-- | ext/spl/spl_array.c | 2 | ||||
-rw-r--r-- | ext/spl/spl_directory.c | 4 | ||||
-rw-r--r-- | ext/spl/spl_dllist.c | 2 | ||||
-rw-r--r-- | ext/spl/spl_fixedarray.c | 2 | ||||
-rw-r--r-- | ext/spl/spl_heap.c | 4 | ||||
-rw-r--r-- | ext/spl/spl_iterators.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index 4e7faa404a..5da552ce0e 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -1155,7 +1155,7 @@ static void spl_array_set_array(zval *object, spl_array_object *intern, zval *ar /* }}} */ /* iterator handler table */ -zend_object_iterator_funcs spl_array_it_funcs = { +static const zend_object_iterator_funcs spl_array_it_funcs = { spl_array_it_dtor, spl_array_it_valid, spl_array_it_get_current_data, diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index c320e9c110..a58d5b3cdf 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -1621,7 +1621,7 @@ static void spl_filesystem_dir_it_move_forward(zend_object_iterator *iter); static void spl_filesystem_dir_it_rewind(zend_object_iterator *iter); /* iterator handler table */ -zend_object_iterator_funcs spl_filesystem_dir_it_funcs = { +static const zend_object_iterator_funcs spl_filesystem_dir_it_funcs = { spl_filesystem_dir_it_dtor, spl_filesystem_dir_it_valid, spl_filesystem_dir_it_current_data, @@ -1820,7 +1820,7 @@ static void spl_filesystem_tree_it_rewind(zend_object_iterator *iter) /* }}} */ /* {{{ iterator handler table */ -zend_object_iterator_funcs spl_filesystem_tree_it_funcs = { +static const zend_object_iterator_funcs spl_filesystem_tree_it_funcs = { spl_filesystem_tree_it_dtor, spl_filesystem_dir_it_valid, spl_filesystem_tree_it_current_data, diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c index 7b2f677d81..c2ae660bb6 100644 --- a/ext/spl/spl_dllist.c +++ b/ext/spl/spl_dllist.c @@ -1282,7 +1282,7 @@ SPL_METHOD(SplDoublyLinkedList, add) } /* }}} */ /* {{{ iterator handler table */ -zend_object_iterator_funcs spl_dllist_it_funcs = { +static const zend_object_iterator_funcs spl_dllist_it_funcs = { spl_dllist_it_dtor, spl_dllist_it_valid, spl_dllist_it_get_current_data, diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index cd2f2ac123..73e4cade91 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -995,7 +995,7 @@ SPL_METHOD(SplFixedArray, current) /* }}} */ /* iterator handler table */ -zend_object_iterator_funcs spl_fixedarray_it_funcs = { +static const zend_object_iterator_funcs spl_fixedarray_it_funcs = { spl_fixedarray_it_dtor, spl_fixedarray_it_valid, spl_fixedarray_it_get_current_data, diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c index 38ce4c6241..6c27ef5ef3 100644 --- a/ext/spl/spl_heap.c +++ b/ext/spl/spl_heap.c @@ -1060,7 +1060,7 @@ SPL_METHOD(SplPriorityQueue, current) /* }}} */ /* iterator handler table */ -zend_object_iterator_funcs spl_heap_it_funcs = { +static const zend_object_iterator_funcs spl_heap_it_funcs = { spl_heap_it_dtor, spl_heap_it_valid, spl_heap_it_get_current_data, @@ -1070,7 +1070,7 @@ zend_object_iterator_funcs spl_heap_it_funcs = { NULL }; -zend_object_iterator_funcs spl_pqueue_it_funcs = { +static const zend_object_iterator_funcs spl_pqueue_it_funcs = { spl_heap_it_dtor, spl_heap_it_valid, spl_pqueue_it_get_current_data, diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 7d33aac322..be36565c45 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -465,7 +465,7 @@ static zend_object_iterator *spl_recursive_it_get_iterator(zend_class_entry *ce, return (zend_object_iterator*)iterator; } -zend_object_iterator_funcs spl_recursive_it_iterator_funcs = { +static const zend_object_iterator_funcs spl_recursive_it_iterator_funcs = { spl_recursive_it_dtor, spl_recursive_it_valid, spl_recursive_it_get_current_data, |