From 24374bb256d8b7a0dccb3dca43986a24ebe9f32e Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Tue, 27 Feb 2024 23:33:29 +0000 Subject: [PATCH] ext/spl: mark all zend_object_handlers as static --- ext/spl/spl_array.c | 4 ++-- ext/spl/spl_dllist.c | 2 +- ext/spl/spl_fixedarray.c | 2 +- ext/spl/spl_heap.c | 4 ++-- ext/spl/spl_observer.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index 6a31a02da0b9..4f5e680a0a61 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -34,12 +34,12 @@ #include "spl_exceptions.h" /* Defined later in the file */ -zend_object_handlers spl_handler_ArrayIterator; +static zend_object_handlers spl_handler_ArrayIterator; PHPAPI zend_class_entry *spl_ce_ArrayIterator; PHPAPI zend_class_entry *spl_ce_RecursiveArrayIterator; /* ArrayObject class */ -zend_object_handlers spl_handler_ArrayObject; +static zend_object_handlers spl_handler_ArrayObject; PHPAPI zend_class_entry *spl_ce_ArrayObject; typedef struct _spl_array_object { diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c index d9c546f154a7..d45df4b4da44 100644 --- a/ext/spl/spl_dllist.c +++ b/ext/spl/spl_dllist.c @@ -33,7 +33,7 @@ #include "spl_dllist_arginfo.h" #include "spl_exceptions.h" -zend_object_handlers spl_handler_SplDoublyLinkedList; +static zend_object_handlers spl_handler_SplDoublyLinkedList; PHPAPI zend_class_entry *spl_ce_SplDoublyLinkedList; PHPAPI zend_class_entry *spl_ce_SplQueue; PHPAPI zend_class_entry *spl_ce_SplStack; diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index 154b38e52011..1d0381380898 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -33,7 +33,7 @@ #include "spl_iterators.h" #include "ext/json/php_json.h" -zend_object_handlers spl_handler_SplFixedArray; +static zend_object_handlers spl_handler_SplFixedArray; PHPAPI zend_class_entry *spl_ce_SplFixedArray; #ifdef COMPILE_DL_SPL_FIXEDARRAY diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c index 83bca9e72384..2c7f4eda7739 100644 --- a/ext/spl/spl_heap.c +++ b/ext/spl/spl_heap.c @@ -33,8 +33,8 @@ #define SPL_HEAP_CORRUPTED 0x00000001 -zend_object_handlers spl_handler_SplHeap; -zend_object_handlers spl_handler_SplPriorityQueue; +static zend_object_handlers spl_handler_SplHeap; +static zend_object_handlers spl_handler_SplPriorityQueue; PHPAPI zend_class_entry *spl_ce_SplHeap; PHPAPI zend_class_entry *spl_ce_SplMaxHeap; diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c index b996764c1aca..0d72df557cf7 100644 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c @@ -42,7 +42,7 @@ PHPAPI zend_class_entry *spl_ce_SplSubject; PHPAPI zend_class_entry *spl_ce_SplObjectStorage; PHPAPI zend_class_entry *spl_ce_MultipleIterator; -PHPAPI zend_object_handlers spl_handler_SplObjectStorage; +static zend_object_handlers spl_handler_SplObjectStorage; /* Bit flags for marking internal functionality overridden by SplObjectStorage subclasses. */ #define SOS_OVERRIDDEN_READ_DIMENSION 1